diff -up expect-5.43/expect_cf.h.in.h-comments expect-5.43/expect_cf.h.in
--- expect-5.43/expect_cf.h.in.h-comments	2004-05-07 19:48:02.000000000 +0200
+++ expect-5.43/expect_cf.h.in	2008-09-25 12:22:37.000000000 +0200
@@ -4,7 +4,8 @@
 #ifndef __EXPECT_CF_H__
 #define __EXPECT_CF_H__
 
-#undef NO_STDLIB_H		/* Tcl requires this name */
+/* Tcl requires this name */
+#undef NO_STDLIB_H
 #undef NO_UNION_WAIT
 #undef HAVE_STDARG_H
 #undef HAVE_VARARGS_H
@@ -12,12 +13,18 @@
 #undef HAVE_SYSCONF_H
 #undef HAVE_SYS_FCNTL_H
 #undef HAVE_SYS_WAIT_H
-#undef HAVE_SYS_BSDTYPES_H	/* nice ISC special */
-#undef HAVE_SYS_SELECT_H	/* nice ISC special */
-#undef HAVE_SYS_TIME_H		/* nice ISC special */
-#undef HAVE_SYS_PTEM_H		/* SCO needs this for window size */
-#undef HAVE_STRREDIR_H		/* Solaris needs this for console redir */
-#undef HAVE_STRPTY_H		/* old-style Dynix ptys need this */
+/* nice ISC special */
+#undef HAVE_SYS_BSDTYPES_H
+/* nice ISC special */
+#undef HAVE_SYS_SELECT_H
+/* nice ISC special */
+#undef HAVE_SYS_TIME_H
+/* SCO needs this for window size */
+#undef HAVE_SYS_PTEM_H
+/* Solaris needs this for console redir */
+#undef HAVE_STRREDIR_H
+/* old-style Dynix ptys need this */
+#undef HAVE_STRPTY_H
 #undef HAVE_UNISTD_H
 #undef HAVE_SYSMACROS_H
 #undef HAVE_INTTYPES_H
@@ -26,8 +33,10 @@
 
 #undef pid_t
 #undef RETSIGTYPE
-#undef TIME_WITH_SYS_TIME	/* ok to include both time.h and sys/time.h */
-#undef SETPGRP_VOID		/* if setpgrp takes 0 args */
+/* ok to include both time.h and sys/time.h */
+#undef TIME_WITH_SYS_TIME
+/* if setpgrp takes 0 args */
+#undef SETPGRP_VOID
 
 /*
  * This section is for compile macros needed by
@@ -42,7 +51,8 @@
 #undef SIMPLE_EVENT
 #undef HAVE_STRFTIME
 #undef HAVE_MEMMOVE
-#undef HAVE_TIMEZONE		/* timezone() a la Pyramid */
+/* timezone() a la Pyramid */
+#undef HAVE_TIMEZONE
 #undef HAVE_SIGLONGJMP
 #undef HAVE_STRCHR
 
diff -up expect-5.43/tcldbgcf.h.in.h-comments expect-5.43/tcldbgcf.h.in
--- expect-5.43/tcldbgcf.h.in.h-comments	2002-02-12 03:00:56.000000000 +0100
+++ expect-5.43/tcldbgcf.h.in	2008-09-25 12:22:37.000000000 +0200
@@ -7,7 +7,8 @@
 #ifndef __NIST_DBG_CF_H__
 #define __NIST_DBG_CF_H__
 
-#undef NO_STDLIB_H		/* Tcl requires this name */
+/* Tcl requires this name */
+#undef NO_STDLIB_H
 
 /*
  * Check for functions