diff --git a/tools/Makefile b/tools/Makefile
index c674758..93cea1c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,7 +6,7 @@ SBINDIR	= $(PREFIX)/sbin
 CC	= cc
 CPPFLAGSF= -I ../src
 CPPFLAGS=
-CFLAGSF	= -W
+CFLAGSF	= -W `pkg-config --cflags libDesktop`
 CFLAGS	= -Wall -g -O2 -pedantic
 LDFLAGS	= 
 RM	= rm -f
@@ -18,13 +18,13 @@ INSTALL	= install
 all: $(TARGETS)
 
 helper_OBJS = helper.o
-helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop webkit-1.0`
+helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
 helper_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop webkit-1.0` ../src/ghtml.o
 
-helper: $(helper_OBJS)
+helper: $(helper_OBJS) ../src/ghtml.o
 	$(CC) -o helper $(helper_OBJS) $(helper_LDFLAGS)
 
-helper.o: helper.c ../src/ghtml.c ../src/surfer.h
+helper.o: helper.c ../src/ghtml.c ../src/surfer.h ../config.h
 	$(CC) $(helper_CFLAGS) -c helper.c
 
 clean:
diff --git a/tools/project.conf b/tools/project.conf
index af49fa2..07ae5fd 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,29 +1,21 @@
 targets=helper
 cppflags_force=-I ../src
 #cppflags=-D EMBEDDED
-cflags_force=-W
+cflags_force=-W `pkg-config --cflags libDesktop`
 cflags=-Wall -g -O2 -pedantic
 ldflags=
 dist=Makefile
 
 [helper]
 type=binary
-#cppflags=-D WITH_GTKMOZEMBED
-#cflags=`pkg-config --cflags libDesktop mozilla-gtkmozembed`
-#ldflags=`pkg-config --libs libDesktop mozilla-gtkmozembed`
-#cppflags=-D WITH_GTKHTML
-#cflags=`pkg-config --cflags libDesktop libgtkhtml-2.0 gnet-2.0`
-#ldflags=`pkg-config --libs libDesktop libgtkhtml-2.0 gnet-2.0`
-#cppflags=-D WITH_GTKTEXTVIEW
-#cflags=`pkg-config --cflags libParser libDesktop gnet-2.0`
-#ldflags=`pkg-config --libs libParser libDesktop gnet-2.0`
-cppflags=-D WITH_WEBKIT
-cflags=`pkg-config --cflags libDesktop webkit-1.0`
+#ldflags=`pkg-config --libs libDesktop mozilla-gtkmozembed` ../src/ghtml.o
+#ldflags=`pkg-config --libs libDesktop libgtkhtml-2.0 gnet-2.0` ../src/ghtml.o
+#ldflags=`pkg-config --libs libParser libDesktop gnet-2.0` ../src/ghtml.o
 ldflags=`pkg-config --libs libDesktop webkit-1.0` ../src/ghtml.o
-#cflags=`pkg-config --cflags libDesktop webkitgtk-3.0`
-#ldflags=`pkg-config --libs libDesktop webkitgtk-3.0`
+#ldflags=`pkg-config --libs libDesktop webkitgtk-3.0` ../src/ghtml.o
 sources=helper.c
+depends=../src/ghtml.o
 install=$(BINDIR)
 
 [helper.c]
-depends=../src/ghtml.c,../src/surfer.h
+depends=../src/ghtml.c,../src/surfer.h,../config.h