diff --git a/Makefile b/Makefile
index f4be9db..ec2a04d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE	= GToolkit
 VERSION	= 0.0.0
-SUBDIRS	= src tools
+SUBDIRS	= include src tools
 RM	= rm -f
 LN	= ln -f
 TAR	= tar -czvf
@@ -21,10 +21,19 @@ dist:
 	$(RM) -r -- $(PACKAGE)-$(VERSION)
 	$(LN) -s -- . $(PACKAGE)-$(VERSION)
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
+		$(PACKAGE)-$(VERSION)/include/GToolkit.h \
+		$(PACKAGE)-$(VERSION)/include/Makefile \
+		$(PACKAGE)-$(VERSION)/include/project.conf \
+		$(PACKAGE)-$(VERSION)/include/GToolkit/GWidget.h \
+		$(PACKAGE)-$(VERSION)/include/GToolkit/GWindow.h \
+		$(PACKAGE)-$(VERSION)/include/GToolkit/Makefile \
+		$(PACKAGE)-$(VERSION)/include/GToolkit/project.conf \
 		$(PACKAGE)-$(VERSION)/src/common.c \
 		$(PACKAGE)-$(VERSION)/src/gwindow.c \
 		$(PACKAGE)-$(VERSION)/src/gtoolkit.c \
 		$(PACKAGE)-$(VERSION)/src/Makefile \
+		$(PACKAGE)-$(VERSION)/src/common.h \
+		$(PACKAGE)-$(VERSION)/src/gwidget.h \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/tools/test.c \
 		$(PACKAGE)-$(VERSION)/tools/Makefile \
diff --git a/include/GToolkit/Makefile b/include/GToolkit/Makefile
new file mode 100644
index 0000000..71112b8
--- /dev/null
+++ b/include/GToolkit/Makefile
@@ -0,0 +1,26 @@
+PREFIX	= /usr/local
+DESTDIR	= 
+RM	= rm -f
+LN	= ln -f
+MKDIR	= mkdir -p
+INSTALL	= install
+INCLUDEDIR= $(PREFIX)/include
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install: all
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m 0644 -- GWidget.h $(DESTDIR)$(INCLUDEDIR)/GWidget.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m 0644 -- GWindow.h $(DESTDIR)$(INCLUDEDIR)/GWindow.h
+
+uninstall:
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/GWidget.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/GWindow.h
+
+.PHONY: all clean distclean install uninstall
diff --git a/include/GToolkit/project.conf b/include/GToolkit/project.conf
new file mode 100644
index 0000000..72bcd8d
--- /dev/null
+++ b/include/GToolkit/project.conf
@@ -0,0 +1,2 @@
+includes=GWidget.h,GWindow.h
+dist=Makefile
diff --git a/include/Makefile b/include/Makefile
new file mode 100644
index 0000000..7ed8d27
--- /dev/null
+++ b/include/Makefile
@@ -0,0 +1,31 @@
+SUBDIRS	= GToolkit
+PREFIX	= /usr/local
+DESTDIR	= 
+RM	= rm -f
+LN	= ln -f
+MKDIR	= mkdir -p
+INSTALL	= install
+INCLUDEDIR= $(PREFIX)/include
+
+
+all: subdirs
+
+subdirs:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
+
+clean:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
+
+distclean:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
+
+install: all
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m 0644 -- GToolkit.h $(DESTDIR)$(INCLUDEDIR)/GToolkit.h
+
+uninstall:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/GToolkit.h
+
+.PHONY: all subdirs clean distclean install uninstall
diff --git a/include/project.conf b/include/project.conf
new file mode 100644
index 0000000..75c3e02
--- /dev/null
+++ b/include/project.conf
@@ -0,0 +1,3 @@
+subdirs=GToolkit
+includes=GToolkit.h
+dist=Makefile
diff --git a/project.conf b/project.conf
index 3f93fcb..3ee083f 100644
--- a/project.conf
+++ b/project.conf
@@ -1,5 +1,5 @@
 package=GToolkit
 version=0.0.0
 
-subdirs=src,tools
+subdirs=include,src,tools
 dist=Makefile
diff --git a/src/project.conf b/src/project.conf
index 3b8482f..45d1079 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -2,7 +2,7 @@ targets=libGToolkit
 cppflags_force=-I ../include
 cflags_force=-W `pkg-config --cflags gl`
 cflags=-Wall -fPIC -g -O2 -pedantic
-dist=Makefile
+dist=Makefile,common.h,gwidget.h
 
 [libGToolkit]
 type=library