diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 0912ecd6..88a05ea5 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -42,6 +42,8 @@ typedef struct {
 #define ClientMessageMask	(1L<<30)
 
 
+#ifndef _DEFINED_GNUSTEP_WINDOW_INFO
+#define	_DEFINED_GNUSTEP_WINDOW_INFO
 /*
  * Window levels are taken from GNUstep (gui/AppKit/NSWindow.h)
  * NSDesktopWindowLevel intended to be the level at which things
@@ -76,6 +78,8 @@ enum {
   WMIconWindowMask = 64,
   WMMiniWindowMask = 128
 };
+#endif
+
 
 /* button types */
 typedef enum {
diff --git a/src/GNUstep.h b/src/GNUstep.h
index 2529fc90..c8e0e63a 100644
--- a/src/GNUstep.h
+++ b/src/GNUstep.h
@@ -53,7 +53,8 @@ enum {
   WMTitleBarMain = 2
 };
 
-#ifndef _WINGS_H_
+#ifndef _DEFINED_GNUSTEP_WINDOW_INFO
+#define	_DEFINED_GNUSTEP_WINDOW_INFO
 /*
  * Window levels are taken from GNUstep (gui/AppKit/NSWindow.h)
  * NSDesktopWindowLevel intended to be the level at which things
@@ -88,7 +89,7 @@ enum {
   WMIconWindowMask = 64,
   WMMiniWindowMask = 128
 };
-#endif /* _WINGS_H_ */
+#endif
 
 /* window manager -> appkit notifications */
 #define GNUSTEP_WM_NOTIFICATION		"GNUSTEP_WM_NOTIFICATION"
diff --git a/wmlib/WMaker.h b/wmlib/WMaker.h
index 8a45e006..891d8de6 100644
--- a/wmlib/WMaker.h
+++ b/wmlib/WMaker.h
@@ -68,7 +68,8 @@ typedef struct {
 #define WMFHideApplication		12
 
 
-#if !defined(_NSWindow_h_) && !defined(_GNUstep_H_GUITypes)
+#ifndef _DEFINED_GNUSTEP_WINDOW_INFO
+#define	_DEFINED_GNUSTEP_WINDOW_INFO
 /*
  * Window levels are taken from GNUstep (gui/AppKit/NSWindow.h)
  * NSDesktopWindowLevel intended to be the level at which things