diff --git a/src/Makefile b/src/Makefile
index 14583c9..55e2539 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	?= cc
-CPPFLAGSF= -I ../include
+CPPFLAGSF?=
 CPPFLAGS?=
 CFLAGSF	= -W `pkg-config --cflags libDesktop`
 CFLAGS	= -Wall -g -O2 -pedantic
diff --git a/src/browser.h b/src/browser.h
index 8cfe40e..189572c 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2006-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Browser */
 /* 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
@@ -22,7 +22,7 @@
 # include <gtk/gtk.h>
 # include <System.h>
 # include <Desktop.h>
-# include "Browser.h"
+# include "../include/Browser.h"
 
 
 /* Browser */
diff --git a/src/desktop.c b/src/desktop.c
index 3c74b52..47e08bb 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /* TODO:
  * - let the user define the desktop folder (possibly default to FDO's)
+ * - let the default font color for icons be white
  * - set the font for the icons instantly
  * - track multiple selection on delete/properties */
 
@@ -36,7 +37,7 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrandr.h>
 #include <System.h>
-#include "Browser/desktop.h"
+#include "../include/Browser/desktop.h"
 #include "desktop.h"
 #include "../config.h"
 #define _(string) gettext(string)
diff --git a/src/desktop.h b/src/desktop.h
index 7652726..3255b28 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -20,7 +20,7 @@
 
 # include <gtk/gtk.h>
 # include <Desktop.h>
-# include "Desktop.h"
+# include "../include/Desktop.h"
 # include "desktopicon.h"
 
 
diff --git a/src/desktopctl.c b/src/desktopctl.c
index c9445b9..d51b777 100644
--- a/src/desktopctl.c
+++ b/src/desktopctl.c
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2012 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Browser */
 /* 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
@@ -22,7 +22,7 @@
 #include <libintl.h>
 #include <gtk/gtk.h>
 #include <Desktop.h>
-#include "Browser/desktop.h"
+#include "../include/Browser/desktop.h"
 #include "../config.h"
 #define _(string) gettext(string)
 
diff --git a/src/desktopicon.c b/src/desktopicon.c
index dc79a1c..d381510 100644
--- a/src/desktopicon.c
+++ b/src/desktopicon.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <System.h>
-#include "Browser/desktop.h"
+#include "../include/Browser/desktop.h"
 #include "desktopicon.h"
 #include "../config.h"
 #define _(string) gettext(string)
diff --git a/src/project.conf b/src/project.conf
index 7b66c1e..0073b51 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,6 +1,5 @@
 subdirs=plugins
 targets=browser,copy,delete,desktop,desktopctl,move,open,properties,view
-cppflags_force=-I ../include
 #cppflags=-D EMBEDDED
 cflags_force=-W `pkg-config --cflags libDesktop`
 cflags=-Wall -g -O2 -pedantic
diff --git a/src/properties.c b/src/properties.c
index aabb552..388d226 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -26,7 +26,6 @@
 #include <libintl.h>
 #include <gtk/gtk.h>
 #include <System.h>
-#include "Browser.h"
 #define _Browser _BrowserHidden /* XXX */
 #include "browser.h"
 #undef _Browser