diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 27bd6f2e648..f380e3a91bb 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -156,12 +156,12 @@ MOVE_LIBS=
 #endif
 #endif
 
-/* Some s/*.h files define this to request special libraries.  */
+/* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
 
-/* Some m/*.h files define this to request special libraries.  */
+/* Some m/MACHINE.h files define this to request special libraries.  */
 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif
diff --git a/src/Makefile.in b/src/Makefile.in
index dfbac65c5ef..8e3924ad50e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -112,12 +112,12 @@ CC = C_COMPILER
 #define LIBS_DEBUG -lg
 #endif
 
-/* Some s/*.h files define this to request special libraries.  */
+/* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
 
-/* Some m/*.h files define this to request special libraries.  */
+/* Some m/MACHINE.h files define this to request special libraries.  */
 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif
@@ -130,7 +130,7 @@ CC = C_COMPILER
 # endif /* ! defined (LISP_FLOAT_TYPE) */
 #endif /* LIB_MATH */
 
-/* Some s/*.h files define this to request special switches in ld.  */
+/* Some s/SYSTEM.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_SYSTEM
 #if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)))
 #define LD_SWITCH_SYSTEM -X
@@ -139,17 +139,17 @@ CC = C_COMPILER
 #endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
 #endif /* LD_SWITCH_SYSTEM */
 
-/* Some m/*.h files define this to request special switches in ld.  */
+/* Some m/MACHINE.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif
 
-/* Some m/*.h files define this to request special switches in cc.  */
+/* Some m/MACHINE.h files define this to request special switches in cc.  */
 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
 
-/* Some s/*.h files define this to request special switches in cc.  */
+/* Some s/SYSTEM.h files define this to request special switches in cc.  */
 #ifndef C_SWITCH_SYSTEM
 #define C_SWITCH_SYSTEM
 #endif
@@ -513,7 +513,7 @@ SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o intervals.o textprop.o \
 
 #ifdef TERMINFO
 /* Used to be -ltermcap here.  If your machine needs that,
-   define LIBS_TERMCAP in the m/*.h file.  */
+   define LIBS_TERMCAP in the m/MACHINE.h file.  */
 #ifndef LIBS_TERMCAP
 #define LIBS_TERMCAP -lcurses
 #endif /* LIBS_TERMCAP */
diff --git a/src/config.in b/src/config.in
index 54b27d2a7a8..595ac54e4fb 100644
--- a/src/config.in
+++ b/src/config.in
@@ -323,7 +323,7 @@ extern char *getenv ();
 #endif /* EMACS_CONFIG_H */
 
 /* These default definitions are good for almost all machines.
-   The exceptions override them in m/*.h.  */
+   The exceptions override them in m/MACHINE.h.  */
 
 #ifndef BITS_PER_CHAR
 #define BITS_PER_CHAR 8