diff --git a/Makefile b/Makefile
index 87d6d72..bcf6d22 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/project.conf
 	$(RM) -- $(PACKAGE)-$(VERSION)
 
-install: all
+install:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 
 uninstall:
diff --git a/include/Makefile b/include/Makefile
index 1c1ffa8..185108f 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -13,11 +13,11 @@ clean:
 
 distclean: clean
 
-install: all
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL) -m 0644 -- Panel.h $(DESTDIR)$(INCLUDEDIR)/Panel.h
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Desktop
+	$(INSTALL) -m 0644 -- Panel.h $(DESTDIR)$(PREFIX)/include/Desktop/Panel.h
 
 uninstall:
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Panel.h
+	$(RM) -- $(DESTDIR)$(PREFIX)/include/Desktop/Panel.h
 
 .PHONY: all clean distclean install uninstall
diff --git a/include/Panel.h b/include/Panel.h
index 1b06b4d..f856080 100644
--- a/include/Panel.h
+++ b/include/Panel.h
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Panel */
 /* 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
@@ -15,8 +15,8 @@
 
 
 
-#ifndef PANEL_PANEL_H
-# define PANEL_PANEL_H
+#ifndef DESKTOP_PANEL_H
+# define DESKTOP_PANEL_H
 
 # include <gtk/gtk.h>
 
@@ -66,4 +66,4 @@ struct _PanelApplet
 	void * priv;
 };
 
-#endif /* !PANEL_PANEL_H */
+#endif /* !DESKTOP_PANEL_H */
diff --git a/include/project.conf b/include/project.conf
index 9e9d585..6bda692 100644
--- a/include/project.conf
+++ b/include/project.conf
@@ -1,2 +1,5 @@
 includes=Panel.h
 dist=Makefile
+
+[Panel.h]
+install=$(PREFIX)/include/Desktop