diff --git a/src/Makefile b/src/Makefile
index 617e1ea..256eb35 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,10 +5,10 @@ DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	= cc
 CPPFLAGSF= -I ../include
-CPPFLAGS= -I $(PREFIX)/include
-CFLAGSF	= -W `pkg-config --cflags gtk+-2.0`
+CPPFLAGS= 
+CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
 CFLAGS	= -Wall -g -O2 -pedantic
-LDFLAGSF= `pkg-config --libs gtk+-2.0` -lSystem
+LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
 LDFLAGS	= -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
 RM	= rm -f
 LN	= ln -f
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index ce5e60c..5834eff 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -4,7 +4,7 @@ DESTDIR	=
 LIBDIR	= $(PREFIX)/lib
 CC	= cc
 CPPFLAGSF= -I ../../include
-CPPFLAGS= -I $(PREFIX)/include
+CPPFLAGS= 
 CFLAGSF	= -W `pkg-config --cflags gtk+-2.0`
 CFLAGS	= -Wall -g -O2 -pedantic -fPIC
 AR	= ar -rc
diff --git a/src/plugins/project.conf b/src/plugins/project.conf
index f4ac178..3f67dcf 100644
--- a/src/plugins/project.conf
+++ b/src/plugins/project.conf
@@ -1,6 +1,6 @@
 targets=blacklist,debug,engineering,openmoko,oss,panel,profiles,smscrypt
 cppflags_force=-I ../../include
-cppflags=-I $(PREFIX)/include
+cppflags=
 cflags_force=-W `pkg-config --cflags gtk+-2.0`
 cflags=-Wall -g -O2 -pedantic -fPIC
 dist=Makefile
diff --git a/src/project.conf b/src/project.conf
index 068e7b0..8877cff 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,9 +1,9 @@
 targets=phone,phone-contacts,phone-dialer,phone-logs,phone-messages,phone-settings
 cppflags_force=-I ../include
-cppflags=-I $(PREFIX)/include
-cflags_force=-W `pkg-config --cflags gtk+-2.0`
+cppflags=
+cflags_force=-W `pkg-config --cflags libSystem gtk+-2.0`
 cflags=-Wall -g -O2 -pedantic
-ldflags_force=`pkg-config --libs gtk+-2.0` -lSystem
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
 ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
 subdirs=plugins
 dist=Makefile,callbacks.h,command.h,gsm.h,modem.h,phone.h,common.c