diff --git a/include/dix-config-apple-verbatim.h b/include/dix-config-apple-verbatim.h
index f429d200e..52106dbec 100644
--- a/include/dix-config-apple-verbatim.h
+++ b/include/dix-config-apple-verbatim.h
@@ -1,8 +1,13 @@
 /* Do not include this file directly.  It is included at the end of <dix-config.h> */
 
+#ifndef XSERVER_CONFIG_APPLE_VERBATIM_H
+#define XSERVER_CONFIG_APPLE_VERBATIM_H
+
 /* Correctly set _XSERVER64 for OSX fat binaries */
 #if defined(__LP64__) && !defined(_XSERVER64)
 #define _XSERVER64 1
 #elif !defined(__LP64__) && defined(_XSERVER64)
 #undef _XSERVER64
 #endif
+
+#endif /* XSERVER_CONFIG_APPLE_VERBATIM_H */
diff --git a/include/xwin-config.h.meson.in b/include/xwin-config.h.meson.in
index bf2a696d6..1066fd525 100644
--- a/include/xwin-config.h.meson.in
+++ b/include/xwin-config.h.meson.in
@@ -4,6 +4,10 @@
  * This file has all defines used in the xwin ddx
  *
  */
+
+#ifndef XSERVER_XWIN_CONFIG_H
+#define XSERVER_XWIN_CONFIG_H
+
 #include <dix-config.h>
 
 /* Winsock networking */
@@ -17,3 +21,5 @@
 
 /* Whether we should re-locate the root to where the executable lives */
 #mesondefine RELOCATE_PROJECTROOT
+
+#endif /* XSERVER_XWIN_CONFIG_H */