diff --git a/lib/config-mac.h b/lib/config-mac.h
index e6d2130a555a157304b9133af23f6a9a33f5e45f..0cb68406499ff33dff676fae903e4d70a4016029 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -1,3 +1,12 @@
+#ifndef __LIB_CONFIG_MAC_H
+#define __LIB_CONFIG_MAC_H
+
+/* ================================================================ */
+/*    lib/config-mac.h - Hand crafted config file for Mac OS 9      */
+/* ================================================================ */
+/*   On Mac OS X you must run configure to generate config.h file   */
+/* ================================================================ */
+
 #define OS "mac"
 
 #define HAVE_NETINET_IN_H       1
@@ -83,3 +92,5 @@
 
 #define HAVE_EXTRA_STRICMP_H 1
 #define HAVE_EXTRA_STRDUP_H  1
+
+#endif /* __LIB_CONFIG_MAC_H */
diff --git a/lib/setup.h b/lib/setup.h
index 864896118cf5bc474b59bc263b61cc8578a276da..59da0e0d341dc11ea6178771fb6d532e86cc8938 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -48,8 +48,8 @@
 #endif
 #endif
 
-#ifdef macintosh
-#include "config-mac.h"
+#if defined(macintosh) && defined(__MRC__)
+#  include "config-mac.h"
 #endif
 
 #ifdef __AMIGA__
diff --git a/src/config-mac.h b/src/config-mac.h
index 2697afe0e280cb030d51970d5edc308076eb3d32..a3a57c2623cd81eda229eab605a668204f741f76 100644
--- a/src/config-mac.h
+++ b/src/config-mac.h
@@ -1,3 +1,12 @@
+#ifndef __SRC_CONFIG_MAC_H
+#define __SRC_CONFIG_MAC_H
+
+/* ================================================================ */
+/*    src/config-mac.h - Hand crafted config file for Mac OS 9      */
+/* ================================================================ */
+/*   On Mac OS X you must run configure to generate config.h file   */
+/* ================================================================ */
+
 /* Define to 1 if you want the built-in manual */
 #define USE_MANUAL 1
 
@@ -19,3 +28,5 @@
 
 /* we provide our own strdup prototype */
 char *strdup(char *s1);
+
+#endif /* __SRC_CONFIG_MAC_H */
diff --git a/src/setup.h b/src/setup.h
index 4f0835e3c8e7cb2899bcddb55092b85b12ba52d9..b56407c644dc2de01f6ac118acec6a243991a52e 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -46,8 +46,8 @@
 #include "config-win32.h"
 #endif
 
-#ifdef macintosh
-#include "config-mac.h"
+#if defined(macintosh) && defined(__MRC__)
+#  include "config-mac.h"
 #endif
 
 #ifdef __riscos__