diff --git a/wmmemfree/dockapp.c b/wmmemfree/dockapp.c
index 020c62f..9c3ff16 100644
--- a/wmmemfree/dockapp.c
+++ b/wmmemfree/dockapp.c
@@ -21,15 +21,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/xpm.h>
 #include <X11/extensions/shape.h>
+#include <X11/extensions/shapeconst.h>
 #include <X11/cursorfont.h>
 
 #include "wmmemfree.h"
 #include "options.h"
-#include "draw.h"
 
 #include "xpm/bg.xpm"
 #include "xpm/on.xpm"
diff --git a/wmmemfree/dockapp.h b/wmmemfree/dockapp.h
index 148e6d2..a644f56 100644
--- a/wmmemfree/dockapp.h
+++ b/wmmemfree/dockapp.h
@@ -21,8 +21,8 @@
 #ifndef __DOCKAPP_H__
 #define __DOCKAPP_H__
 
+#include <X11/X.h>
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #define WINDOW_WIDTH 64
 #define WINDOW_HEIGHT 64
diff --git a/wmmemfree/draw.c b/wmmemfree/draw.c
index 944eca3..7323e47 100644
--- a/wmmemfree/draw.c
+++ b/wmmemfree/draw.c
@@ -18,9 +18,7 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include "dockapp.h"
 #include "draw.h"
diff --git a/wmmemfree/wmmemfree.c b/wmmemfree/wmmemfree.c
index 3e5062e..38c6246 100644
--- a/wmmemfree/wmmemfree.c
+++ b/wmmemfree/wmmemfree.c
@@ -18,6 +18,7 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#include <bits/types/struct_timeval.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sys/time.h>