diff --git a/src/frontend/com_measure2.h b/src/frontend/com_measure2.h
index 954ae5326..e8be0fff0 100644
--- a/src/frontend/com_measure2.h
+++ b/src/frontend/com_measure2.h
@@ -1,5 +1,5 @@
-#ifndef _COM_MEASURE_H
-#define _COM_MEASURE_H
+#ifndef _COM_MEASURE2_H
+#define _COM_MEASURE2_H
 
 
 extern int measure_get_precision(void);
diff --git a/src/include/ngspice/complex.h b/src/include/ngspice/complex.h
index 21683a290..2d5864bed 100644
--- a/src/include/ngspice/complex.h
+++ b/src/include/ngspice/complex.h
@@ -546,4 +546,4 @@ typedef struct {
 
 #endif /* _SPDEF_H */
 
-#endif /*_COMPLEX_H */
+#endif
diff --git a/src/include/ngspice/cpstd.h b/src/include/ngspice/cpstd.h
index 1ca3095d8..a8e11030e 100644
--- a/src/include/ngspice/cpstd.h
+++ b/src/include/ngspice/cpstd.h
@@ -8,8 +8,8 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
  * wlist.c
  */
 
-#ifndef _STD_H_
-#define _STD_H_
+#ifndef _CPSTD_H_
+#define _CPSTD_H_
 
 
 #ifndef FILE
@@ -34,4 +34,4 @@ extern int cp_numdgt;
 
 extern void cp_printword(char *string, FILE *fp);
 
-#endif /* _STD_H_*/
+#endif
diff --git a/src/include/ngspice/defines.h b/src/include/ngspice/defines.h
index f4dd43b0e..0de36d221 100644
--- a/src/include/ngspice/defines.h
+++ b/src/include/ngspice/defines.h
@@ -150,5 +150,5 @@
 
 
 
-#endif /* _DEFINES_H_ */
+#endif
 
diff --git a/src/include/ngspice/fteinput.h b/src/include/ngspice/fteinput.h
index 688c0015e..d008702b7 100644
--- a/src/include/ngspice/fteinput.h
+++ b/src/include/ngspice/fteinput.h
@@ -15,8 +15,8 @@ Author: 1988 Jeffrey M. Hsu
     checkup_option is for handling and pending asynchonous events
 */
 
-#ifndef _INPUT_H_
-#define _INPUT_H_
+#ifndef _FTEINPUT_H_
+#define _FTEINPUT_H_
 
 
 #include <stdio.h>
@@ -44,4 +44,4 @@ typedef struct response {
     } reply;
 } RESPONSE;
 
-#endif  /* notdef _INPUT_H_ */
+#endif
diff --git a/src/include/ngspice/macros.h b/src/include/ngspice/macros.h
index 7780cd5c3..645782ad5 100644
--- a/src/include/ngspice/macros.h
+++ b/src/include/ngspice/macros.h
@@ -103,4 +103,4 @@
 #endif
 
 
-#endif /* _MACROS_H_ */
+#endif