diff --git a/wmcliphist/Makefile b/wmcliphist/Makefile
index c8ba5a9..2baafa7 100644
--- a/wmcliphist/Makefile
+++ b/wmcliphist/Makefile
@@ -1,6 +1,6 @@
 CC ?= gcc
 PREFIX = /usr/local
-INCLUDES = `pkg-config --cflags gtk+-2.0 x11` -I. -Ifoodock
+INCLUDES = `pkg-config --cflags gtk+-2.0 x11`
 
 # for normal use
 CFLAGS += -Wall -ansi -pedantic $(INCLUDES)
diff --git a/wmcliphist/clipboard.c b/wmcliphist/clipboard.c
index b39b915..ad341f7 100644
--- a/wmcliphist/clipboard.c
+++ b/wmcliphist/clipboard.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 #include <time.h>
 
 /* when true, clipboard will be automatically taken up by wmcliphist */
diff --git a/wmcliphist/gui.c b/wmcliphist/gui.c
index 55bda91..beee837 100644
--- a/wmcliphist/gui.c
+++ b/wmcliphist/gui.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 #include <gdk/gdkkeysyms.h>
 
 
diff --git a/wmcliphist/history.c b/wmcliphist/history.c
index d4db3ad..43a0878 100644
--- a/wmcliphist/history.c
+++ b/wmcliphist/history.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 
 
 int	autosave_period = 120;
diff --git a/wmcliphist/hotkeys.c b/wmcliphist/hotkeys.c
index 890c089..ae412dd 100644
--- a/wmcliphist/hotkeys.c
+++ b/wmcliphist/hotkeys.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 #include <gdk/gdkkeysyms.h>
 
 /* Exec on hotkey? */
diff --git a/wmcliphist/rcconfig.c b/wmcliphist/rcconfig.c
index 388793c..1f2cf46 100644
--- a/wmcliphist/rcconfig.c
+++ b/wmcliphist/rcconfig.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 #include <sys/stat.h>
 
 #define	RC_BUF_SIZE	256
diff --git a/wmcliphist/utils.c b/wmcliphist/utils.c
index 7a88962..070a3d1 100644
--- a/wmcliphist/utils.c
+++ b/wmcliphist/utils.c
@@ -1,4 +1,4 @@
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 
 /*
  * converts text in UTF-8 to charset by actual locale
diff --git a/wmcliphist/wmcliphist.c b/wmcliphist/wmcliphist.c
index f038251..32ddc8a 100644
--- a/wmcliphist/wmcliphist.c
+++ b/wmcliphist/wmcliphist.c
@@ -2,25 +2,25 @@
  * (c) 2001 Michal Krause <michal@krause.cz>
  */
 
-#include <wmcliphist.h>
+#include "wmcliphist.h"
 
-#include <icon/ico_60x60_mask.xbm>
-#include <icon/ico_60x60_black.xpm>
-#include <icon/ico_60x60_white.xpm>
-#include <icon/ico_60x60_gray.xpm>
+#include "icon/ico_60x60_mask.xbm"
+#include "icon/ico_60x60_black.xpm"
+#include "icon/ico_60x60_white.xpm"
+#include "icon/ico_60x60_gray.xpm"
 
-#include <icon/ico_40x40_mask.xbm>
-#include <icon/ico_40x40_black.xpm>
-#include <icon/ico_40x40_white.xpm>
-#include <icon/ico_40x40_gray.xpm>
+#include "icon/ico_40x40_mask.xbm"
+#include "icon/ico_40x40_black.xpm"
+#include "icon/ico_40x40_white.xpm"
+#include "icon/ico_40x40_gray.xpm"
 
-#include <icon/ico_30x30_mask.xbm>
-#include <icon/ico_30x30_black.xpm>
-#include <icon/ico_30x30_white.xpm>
-#include <icon/ico_30x30_gray.xpm>
+#include "icon/ico_30x30_mask.xbm"
+#include "icon/ico_30x30_black.xpm"
+#include "icon/ico_30x30_white.xpm"
+#include "icon/ico_30x30_gray.xpm"
 
-#include <icon/ico_16x16_mask.xbm>
-#include <icon/ico_16x16.xpm>
+#include "icon/ico_16x16_mask.xbm"
+#include "icon/ico_16x16.xpm"
 
 /*
  * print some help
diff --git a/wmcliphist/wmcliphist.h b/wmcliphist/wmcliphist.h
index c55cdc2..bd23c9c 100644
--- a/wmcliphist/wmcliphist.h
+++ b/wmcliphist/wmcliphist.h
@@ -20,9 +20,9 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
-#include <foodock.h>
+#include "foodock/foodock.h"
 
-#include <debug.h>
+#include "debug.h"
 
 
 #define	VERSION			0x0003