diff --git a/WINGs/dragcommon.c b/WINGs/dragcommon.c
index 4c152c20..61482bc9 100644
--- a/WINGs/dragcommon.c
+++ b/WINGs/dragcommon.c
@@ -1,4 +1,5 @@
-/* #include <X11/Xatom.h> */
+
+
 #include "WINGsP.h"
 
 #define VERSION_INFO(dragInfo) dragInfo->protocolVersion
diff --git a/WINGs/dragdestination.c b/WINGs/dragdestination.c
index 03dcd9bd..34f29c4b 100644
--- a/WINGs/dragdestination.c
+++ b/WINGs/dragdestination.c
@@ -1,5 +1,7 @@
-#include <X11/Xatom.h>
+
+
 #include "WINGsP.h"
+#include <X11/Xatom.h>
 
 #define XDND_SOURCE_RESPONSE_MAX_DELAY 3000
 
diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c
index 7614f463..50ecdf06 100644
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -1,4 +1,7 @@
-#include "../src/config.h"
+
+
+#include "wconfig.h"
+#include "WINGsP.h"
 
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
@@ -6,7 +9,6 @@
 #include <X11/extensions/shape.h>
 #endif
 
-#include "WINGsP.h"
 
 
 #define XDND_DESTINATION_RESPONSE_MAX_DELAY 10000
diff --git a/WINGs/handlers.c b/WINGs/handlers.c
index f6bb26ee..84978f01 100644
--- a/WINGs/handlers.c
+++ b/WINGs/handlers.c
@@ -3,10 +3,9 @@
  * WINGs internal handlers: timer, idle and input handlers
  */
 
+#include "wconfig.h"
 #include "WINGsP.h"
 
-#include "../src/config.h"
-
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/WINGs/memory.c b/WINGs/memory.c
index 2250310c..efd69baf 100644
--- a/WINGs/memory.c
+++ b/WINGs/memory.c
@@ -19,8 +19,7 @@
  */
 
 
-#include "../src/config.h"
-
+#include "wconfig.h"
 #include "WUtil.h"
 
 #include <stdlib.h>
diff --git a/WINGs/usleep.c b/WINGs/usleep.c
index 69f5e9df..4d250b30 100644
--- a/WINGs/usleep.c
+++ b/WINGs/usleep.c
@@ -1,6 +1,6 @@
 
 
-#include "../src/config.h"
+#include "wconfig.h"
 
 
 #ifdef HAVE_SYS_TIME_H
diff --git a/WINGs/wballoon.c b/WINGs/wballoon.c
index f6547796..6d5f75f3 100644
--- a/WINGs/wballoon.c
+++ b/WINGs/wballoon.c
@@ -1,7 +1,7 @@
 
 
 
-#include "../src/config.h"
+#include "wconfig.h"
 #include "WINGsP.h"
 
 #ifdef SHAPE