diff --git a/Makefile b/Makefile
index ca31c9d..a23923b 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/CPP-unused.sgml \
 		$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/cpp.sgml \
 		$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/project.conf \
-		$(PACKAGE)-$(VERSION)/include/cpp.h \
+		$(PACKAGE)-$(VERSION)/include/CPP.h \
 		$(PACKAGE)-$(VERSION)/include/Makefile \
 		$(PACKAGE)-$(VERSION)/include/project.conf \
 		$(PACKAGE)-$(VERSION)/src/cpp.c \
diff --git a/include/cpp.h b/include/CPP.h
similarity index 100%
rename from include/cpp.h
rename to include/CPP.h
diff --git a/include/Makefile b/include/Makefile
index e0c0a4b..821c8c0 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -14,10 +14,10 @@ clean:
 distclean: clean
 
 install:
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL) -m 0644 -- cpp.h $(DESTDIR)$(INCLUDEDIR)/cpp.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel
+	$(INSTALL) -m 0644 -- CPP.h $(DESTDIR)$(INCLUDEDIR)/Devel/CPP.h
 
 uninstall:
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/cpp.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/CPP.h
 
 .PHONY: all clean distclean install uninstall
diff --git a/include/project.conf b/include/project.conf
index 6660851..62aa73d 100644
--- a/include/project.conf
+++ b/include/project.conf
@@ -1,2 +1,5 @@
-includes=cpp.h
+includes=CPP.h
 dist=Makefile
+
+[CPP.h]
+install=$(INCLUDEDIR)/Devel
diff --git a/src/Makefile b/src/Makefile
index 9011c43..9456a08 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ AR	?= ar
 RANLIB	?= ranlib
 CCSHARED?= $(CC) -shared
 BINDIR	= $(PREFIX)/bin
+SBINDIR	= $(PREFIX)/sbin
 RM	?= rm -f
 LN	?= ln -f
 MKDIR	?= mkdir -p
@@ -41,16 +42,16 @@ cpp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L. -L$(LIBDIR) -Wl,-rpath,$(LIBDIR) -lcpp
 cpp: $(cpp_OBJS) libcpp.so
 	$(CC) -o cpp $(cpp_OBJS) $(cpp_LDFLAGS)
 
-cpp.o: cpp.c common.h ../include/cpp.h
+cpp.o: cpp.c common.h ../include/CPP.h
 	$(CC) $(libcpp_CFLAGS) -c cpp.c
 
-parser.o: parser.c parser.h ../include/cpp.h
+parser.o: parser.c parser.h ../include/CPP.h
 	$(CC) $(libcpp_CFLAGS) -c parser.c
 
-scanner.o: scanner.c common.h ../include/cpp.h
+scanner.o: scanner.c common.h ../include/CPP.h
 	$(CC) $(libcpp_CFLAGS) -c scanner.c
 
-main.o: main.c ../include/cpp.h ../config.h
+main.o: main.c ../include/CPP.h ../config.h
 	$(CC) $(cpp_CFLAGS) -c main.c
 
 clean:
diff --git a/src/common.h b/src/common.h
index d78beeb..3022b40 100644
--- a/src/common.h
+++ b/src/common.h
@@ -19,7 +19,7 @@
 # define _CPP_COMMON_H
 
 # include "parser.h"
-# include "cpp.h"
+# include "CPP.h"
 
 
 /* types */
diff --git a/src/cpp.c b/src/cpp.c
index 97e4357..2da398e 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "cpp.h"
+#include "CPP.h"
 #include "common.h"
 
 
diff --git a/src/main.c b/src/main.c
index 7024317..7fff4e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "cpp.h"
+#include "CPP.h"
 #include "../config.h"
 
 
diff --git a/src/parser.h b/src/parser.h
index ee6e79e..6278955 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -18,7 +18,7 @@
 #ifndef _CPP_PARSER_H
 # define _CPP_PARSER_H
 
-# include "cpp.h"
+# include "CPP.h"
 
 
 /* types */
diff --git a/src/project.conf b/src/project.conf
index 3566657..6cfe322 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -14,13 +14,13 @@ cflags=-fPIC
 install=$(LIBDIR)
 
 [cpp.c]
-depends=common.h,../include/cpp.h
+depends=common.h,../include/CPP.h
 
 [parser.c]
-depends=parser.h,../include/cpp.h
+depends=parser.h,../include/CPP.h
 
 [scanner.c]
-depends=common.h,../include/cpp.h
+depends=common.h,../include/CPP.h
 
 [cpp]
 type=binary
@@ -30,4 +30,4 @@ ldflags=-L. -L$(LIBDIR) -Wl,-rpath,$(LIBDIR) -lcpp
 install=$(BINDIR)
 
 [main.c]
-depends=../include/cpp.h,../config.h
+depends=../include/CPP.h,../config.h