diff --git a/wmmisc/src/dockapp_draw.c b/wmmisc/src/dockapp_draw.c
index 54e9623..2a5a88e 100644
--- a/wmmisc/src/dockapp_draw.c
+++ b/wmmisc/src/dockapp_draw.c
@@ -19,13 +19,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <X11/Xlib.h>
-#include <X11/xpm.h>
-#include <X11/extensions/shape.h>
-
 #include <libdockapp/wmgeneral.h>
 #include "dockapp_draw.h"
 #include "dockapp_utils.h"
diff --git a/wmmisc/src/dockapp_main.c b/wmmisc/src/dockapp_main.c
index 3b7003f..f1f2ca0 100644
--- a/wmmisc/src/dockapp_main.c
+++ b/wmmisc/src/dockapp_main.c
@@ -21,23 +21,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <getopt.h>
+#include <bits/getopt_core.h>
 #include <signal.h>
 
 #ifdef USE_MTRACE
 #include <mcheck.h>
 #endif /* USE_MTRACE */
 
-#include <X11/Xlib.h>
-#include <X11/xpm.h>
-#include <X11/extensions/shape.h>
-
 #include <libdockapp/wmgeneral.h>
 
 #include "wmmisc-master.xpm"
 #include "dockapp_main.h"
 #include "dockapp_draw.h"
-#include "dockapp_utils.h"
 
 void
 dockapp_show_help( const char* wm_name )
diff --git a/wmmisc/src/dockapp_utils.c b/wmmisc/src/dockapp_utils.c
index f491683..0fe36fe 100644
--- a/wmmisc/src/dockapp_utils.c
+++ b/wmmisc/src/dockapp_utils.c
@@ -18,11 +18,9 @@
  *
  */
 
+#include <bits/types/time_t.h>
+#include <paths.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <utmp.h>