diff --git a/tools/Makefile b/tools/Makefile
index 9a23f99..c85d8ac 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,7 +4,7 @@ DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	?= cc
 CPPFLAGSF= -I ../include
-CPPFLAGS= -I $(PREFIX)/include
+CPPFLAGS=
 CFLAGSF	= -W `pkg-config --cflags libSystem`
 CFLAGS	= -Wall -g -O2 -pedantic
 LDFLAGSF= -L../src `pkg-config --libs libSystem` -lApp
diff --git a/tools/appbroker.c b/tools/appbroker.c
index c390093..4cabea9 100644
--- a/tools/appbroker.c
+++ b/tools/appbroker.c
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS System libApp */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
-#include "System/App.h"
+#include "App.h"
 
 #define APPBROKER_PROGNAME "AppBroker"
 
diff --git a/tools/appclient.c b/tools/appclient.c
index 2062982..1ea55b4 100644
--- a/tools/appclient.c
+++ b/tools/appclient.c
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS System libApp */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
-#include "System/App.h"
+#include "App.h"
 
 #define APPCLIENT_PROGNAME "AppClient"
 
diff --git a/tools/project.conf b/tools/project.conf
index f157436..aec7824 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,6 +1,6 @@
 targets=AppBroker,AppClient
 cppflags_force=-I ../include
-cppflags=-I $(PREFIX)/include
+cppflags=
 cflags_force=-W `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -pedantic
 ldflags_force=-L../src `pkg-config --libs libSystem` -lApp