diff --git a/utils/create-module.py b/utils/create-module.py
index d51850d48..4afdcf59d 100755
--- a/utils/create-module.py
+++ b/utils/create-module.py
@@ -34,8 +34,7 @@ build_lib(
 '''
 
 
-MODEL_CC_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-
+MODEL_CC_TEMPLATE = '''\
 #include "{MODULE}.h"
 
 namespace ns3
@@ -47,8 +46,7 @@ namespace ns3
 '''
 
 
-
-MODEL_H_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+MODEL_H_TEMPLATE = '''\
 #ifndef {INCLUDE_GUARD}
 #define {INCLUDE_GUARD}
 
@@ -63,9 +61,7 @@ namespace ns3
 '''
 
 
-
-HELPER_CC_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-
+HELPER_CC_TEMPLATE = '''\
 #include "{MODULE}-helper.h"
 
 namespace ns3
@@ -77,8 +73,7 @@ namespace ns3
 '''
 
 
-
-HELPER_H_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+HELPER_H_TEMPLATE = '''\
 #ifndef {INCLUDE_GUARD}
 #define {INCLUDE_GUARD}
 
@@ -104,8 +99,7 @@ build_lib_example(
 
 '''
 
-EXAMPLE_CC_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-
+EXAMPLE_CC_TEMPLATE = '''\
 #include "ns3/core-module.h"
 #include "ns3/{MODULE}-helper.h"
 
@@ -130,7 +124,7 @@ main(int argc, char* argv[])
 '''
 
 
-TEST_CC_TEMPLATE = '''/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+TEST_CC_TEMPLATE = '''\
 
 // Include a header file from your module to test.
 #include "ns3/{MODULE}.h"
diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc
index 5869fa517..23317f3bd 100644
--- a/utils/print-introspected-doxygen.cc
+++ b/utils/print-introspected-doxygen.cc
@@ -1506,14 +1506,6 @@ main(int argc, char* argv[])
     NodeContainer c;
     c.Create(1);
 
-    // mode-line:  helpful when debugging introspected-doxygen.h
-    if (!outputText)
-    {
-        std::cout << "/* -*- Mode:C++; c-file-style:\"gnu\"; "
-                     "indent-tabs-mode:nil; -*- */\n"
-                  << std::endl;
-    }
-
     std::cout << std::endl;
     std::cout << commentStart << file << "\n"
               << sectionStart << "utils\n"