diff --git a/config.h.in b/config.h.in
index fecc38f..f40abe0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,3 +1,5 @@
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
 #cmakedefine ENABLE_COLOR 1
 #cmakedefine HAVE_GETOPT 1
 #cmakedefine HAVE_MEMCPY 1
@@ -20,3 +22,4 @@
 #cmakedefine TIME_WITH_SYS_TIME 1
 #cmakedefine RETSIGTYPE @RETSIGTYPE@
 #cmakedefine time_t @time_t@
+#endif /* _CONFIG_H_ */
diff --git a/display.h b/display.h
index 923e65b..2237dc2 100644
--- a/display.h
+++ b/display.h
@@ -44,4 +44,4 @@ void		display_pagerstart();
 void		display_pagerend();
 void		display_pager(char *data);
 
-#endif
+#endif /* _DISPLAY_H */
diff --git a/pg_top.h b/pg_top.h
index 672931a..5fa349f 100644
--- a/pg_top.h
+++ b/pg_top.h
@@ -6,8 +6,8 @@
  *	Copyright (c) 2007-2019, Mark Wong
  */
 
-#ifndef _PG_TOPP_H_
-#define _PG_TOPP_H_
+#ifndef _PG_TOP_H_
+#define _PG_TOP_H_
 
 #include "machine.h"
 
@@ -111,4 +111,4 @@ struct pg_top_context
 void		quit(int);
 void		reset_display(struct pg_top_context *);
 
-#endif   /* _PG_TOPP_H_ */
+#endif   /* _PG_TOP_H_ */
diff --git a/port.h b/port.h
index 791178c..9079065 100644
--- a/port.h
+++ b/port.h
@@ -10,8 +10,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef PG_PORT_H
-#define PG_PORT_H
+#ifndef _PORT_H_
+#define _PORT_H_
 
 #include <stdbool.h>
 
@@ -27,4 +27,4 @@
 /* Portable prompt handling */
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
 
-#endif   /* PG_PORT_H */
+#endif   /* _PORT_H_ */
diff --git a/sigconv.awk b/sigconv.awk
index b1741f8..5dd9b0a 100644
--- a/sigconv.awk
+++ b/sigconv.awk
@@ -1,6 +1,8 @@
 BEGIN		{
 		    nsig = 0;
 		    j = 0;
+		    print "#ifndef _SIGDESC_H_"
+		    print "#define _SIGDESC_H_"
 		    print "/* This file was automatically generated */"
 		    print "/* by the awk script \"sigconv.awk\".      */\n"
 		    print "struct sigdesc {"
@@ -53,4 +55,5 @@ END				{
 					    printf("    { %s },\n", siglist[n]);
 
 				    printf("    { NULL,\t 0 }\n};\n");
+				    print "#endif /* _SIGDESC_H_ */"
 				}