diff --git a/src/project.conf b/src/project.conf
index 5e4accc..456c88a 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,7 +1,7 @@
 targets=libApp
 cppflags_force=-I ../include
 cflags_force=-fPIC `pkg-config --cflags libSystem libMarshall`
-cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libSystem libMarshall`
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,appinterface.h,appmessage.h,appstatus.h,apptransport.h
diff --git a/src/transport/project.conf b/src/transport/project.conf
index 24b9b8c..c0f56c2 100644
--- a/src/transport/project.conf
+++ b/src/transport/project.conf
@@ -2,7 +2,7 @@ targets=self,tcp,tcp4,tcp6,template,udp,udp4,udp6
 cppflags_force=-I ../../include
 cppflags=
 cflags_force=-fPIC `pkg-config --cflags libSystem`
-cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libSystem` -L.. -lApp
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,common.h,common.c
diff --git a/tests/project.conf b/tests/project.conf
index 9924dd0..030ac6a 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -1,9 +1,9 @@
 targets=Dummy.h,appclient,appmessage,appserver,includes,lookup,tests.log,transport
-cppflags_force=-I ../include -isystem .
+cppflags_force=-I ../include
 cflags_force=`pkg-config --cflags libSystem`
-cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
-ldflags_force=`pkg-config --libs libSystem` -lApp
-ldflags=-L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -pie -Wl,-z,relro -Wl,-z,now -rdynamic
+cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ldflags_force=`pkg-config --libs libSystem` -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lApp
+ldflags=-pie -Wl,-z,relro -Wl,-z,now -rdynamic
 dist=System/App.h,appbroker.sh,Makefile,Test.expected,Test.interface,pkgconfig.sh,tests.sh
 
 [Dummy.h]
diff --git a/tools/project.conf b/tools/project.conf
index f7a6a51..931f986 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -2,9 +2,9 @@ targets=AppBroker,AppClient
 cppflags_force=-I ../include
 cppflags=
 cflags_force=`pkg-config --cflags libSystem libMarshall`
-cflags=-W -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all
-ldflags_force=-L../src `pkg-config --libs libSystem libMarshall` -lApp
-ldflags=-L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -pie -Wl,-z,relro -Wl,-z,now
+cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ldflags_force=-L$(OBJDIR)../src `pkg-config --libs libSystem libMarshall` -lApp
+ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,appbroker.sh
 
 [AppBroker]