diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in
index f3cd5df81a..e51dfc5b28 100755
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@ -74,7 +74,7 @@ def import_classheader(class_txt, type_txt, type_code, file):
     # for each CLASS_n/TYPE_m.h
     rdata_header = open(file, 'r')
     content = ''
-    guard_macro = '__' + class_txt.upper() + '_' + type_txt.upper()
+    guard_macro = class_txt.upper() + '_' + type_txt.upper()
     guard_macro += '_' + type_code + '_H'
     for line in rdata_header.readlines():
         if re.match('// BEGIN_HEADER_GUARD', line):
diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc
index 990b127cf2..7bff8bde49 100644
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/message.cc
@@ -122,7 +122,7 @@ currentTime() {
 /// \brief Create Header Sentinel
 ///
 /// Given the name of a file, create an \#ifdef sentinel name.  The name is
-/// __<name>_<ext>, where &lt;name&gt; is the name of the file, and &lt;ext&gt;
+/// <name>_<ext>, where &lt;name&gt; is the name of the file, and &lt;ext&gt;
 /// is the extension less the leading period.  The sentinel will be upper-case.
 ///
 /// \param file Filename object representing the file.