diff --git a/src/Makefile b/src/Makefile
index 17b2f89..805e5c2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,11 +3,10 @@ PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
 CC	= cc
-CPPFLAGSF= -I ../include -I $(PREFIX)/include
-CPPFLAGS= 
+CPPFLAGSF= -I ../include
+CPPFLAGS= -I $(PREFIX)/include
 CFLAGSF	= -W -fPIC `pkg-config --cflags libSystem`
 CFLAGS	= -Wall -g -O2 -pedantic
-LDFLAGSF= `pkg-config --libs libSystem`
 LDFLAGS	= 
 AR	= ar -rc
 RANLIB	= ranlib
@@ -22,7 +21,7 @@ all: $(TARGETS)
 
 libApp_OBJS = appclient.o appinterface.o appserver.o
 libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)  
+libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem`  
 
 libApp.a: $(libApp_OBJS)
 	$(AR) libApp.a $(libApp_OBJS)
diff --git a/src/project.conf b/src/project.conf
index f5cc896..fd77ba0 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,14 +1,13 @@
 targets=libApp
-cppflags_force=-I ../include -I $(PREFIX)/include
-cppflags=
+cppflags_force=-I ../include
+cppflags=-I $(PREFIX)/include
 cflags_force=-W -fPIC `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -pedantic
-ldflags_force=`pkg-config --libs libSystem`
 ldflags=
 dist=Makefile,appinterface.h
 
 [libApp]
 type=library
 sources=appclient.c,appinterface.c,appserver.c
-ldflags=-ldl -lsocket
+ldflags=`pkg-config --libs libSystem` -ldl -lsocket
 install=$(LIBDIR)
diff --git a/tools/Makefile b/tools/Makefile
index 814dc55..5292afa 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,8 +3,8 @@ PREFIX	= /usr/local
 DESTDIR	= 
 BINDIR	= $(PREFIX)/bin
 CC	= cc
-CPPFLAGSF= -I ../include -I $(PREFIX)/include
-CPPFLAGS=
+CPPFLAGSF= -I ../include
+CPPFLAGS= -I $(PREFIX)/include
 CFLAGSF	= -W
 CFLAGS	= -Wall -g -O2 -pedantic
 LDFLAGSF= -lApp -L../src