diff --git a/src/project.conf b/src/project.conf
index 93eba44..0667f0f 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,5 +1,5 @@
 targets=libApp
-cppflags_force=-I ../include
+cppflags_force=-I ../include -I ${OBJDIR}../include/App
 cflags_force=-fPIC `pkg-config --cflags libSystem libMarshall`
 cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libSystem libMarshall`
diff --git a/src/transport/project.conf b/src/transport/project.conf
index c018fcd..66e9d15 100644
--- a/src/transport/project.conf
+++ b/src/transport/project.conf
@@ -1,5 +1,5 @@
 targets=self,tcp,tcp4,tcp6,template,udp,udp4,udp6
-cppflags_force=-I ../../include
+cppflags_force=-I ../../include -I ${OBJDIR}../../include/App
 cppflags=
 cflags_force=-fPIC `pkg-config --cflags libSystem`
 cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
diff --git a/tools/appbroker.c b/tools/appbroker.c
index 3814371..26c9928 100644
--- a/tools/appbroker.c
+++ b/tools/appbroker.c
@@ -20,7 +20,8 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
-#include "App.h"
+#include "App/appserver.h"
+#include "App/apptransport.h"
 
 #ifndef PROGNAME_APPBROKER
 # define PROGNAME_APPBROKER "AppBroker"
diff --git a/tools/appclient.c b/tools/appclient.c
index 398365c..a5e05d9 100644
--- a/tools/appclient.c
+++ b/tools/appclient.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
-#include "App.h"
+#include "App/appclient.h"
 
 #ifndef PROGNAME_APPCLIENT
 # define PROGNAME_APPCLIENT "AppClient"
diff --git a/tools/project.conf b/tools/project.conf
index 42239f0..73bab93 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,5 +1,5 @@
 targets=AppBroker,AppClient,AppTransport
-cppflags_force=-I ../include
+cppflags_force=-I ../include -I $(OBJDIR)../include/App
 cppflags=
 cflags_force=`pkg-config --cflags libSystem libMarshall`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector