diff --git a/src/lib/datasrc/datasrc_config.h.pre.in b/src/lib/datasrc/datasrc_config.h.pre.in
index 9074df6420..221cab0130 100644
--- a/src/lib/datasrc/datasrc_config.h.pre.in
+++ b/src/lib/datasrc/datasrc_config.h.pre.in
@@ -11,8 +11,9 @@
 // LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
-#ifndef __DATASRC_CONFIG_H
-#define __DATASRC_CONFIG_H 1
+
+#ifndef DATASRC_CONFIG_H
+#define DATASRC_CONFIG_H 1
 
 namespace isc {
 namespace datasrc {
@@ -28,4 +29,4 @@ const char* const BACKEND_LIBRARY_PATH = "@@PKGLIBDIR@@/";
 } // end namespace datasrc
 } // end namespace isc
 
-#endif // __DATASRC_CONFIG_H
+#endif // DATASRC_CONFIG_H
diff --git a/src/lib/log/log_formatter.h b/src/lib/log/log_formatter.h
index eebdb1a026..8cb34c7314 100644
--- a/src/lib/log/log_formatter.h
+++ b/src/lib/log/log_formatter.h
@@ -12,8 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef __LOG_FORMATTER_H
-#define __LOG_FORMMATER_H
+#ifndef LOG_FORMATTER_H
+#define LOG_FORMATTER_H
 
 #include <cstddef>
 #include <string>
diff --git a/src/lib/log/tests/tempdir.h.in b/src/lib/log/tests/tempdir.h.in
index 366fea3cf9..96ce8d4a72 100644
--- a/src/lib/log/tests/tempdir.h.in
+++ b/src/lib/log/tests/tempdir.h.in
@@ -12,8 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef __TEMPDIR_H
-#define __TEMPDIR_H
+#ifndef TEMPDIR_H
+#define TEMPDIR_H
 
 /// \brief Define temporary directory
 ///
@@ -26,4 +26,4 @@ namespace {
 std::string TEMP_DIR("@builddir@");
 }
 
-#endif // __TEMPDIR_H
+#endif // TEMPDIR_H