diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2ceecd5d..931db97a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -5,7 +5,7 @@
 if ! CPPUNIT_TEST
 
 AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -Wall -Werror
 
 noinst_PROGRAMS = \
 	hello \
diff --git a/examples/Makefile.clang b/examples/Makefile.clang
index 7b13e387..3ce11e90 100644
--- a/examples/Makefile.clang
+++ b/examples/Makefile.clang
@@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
 MAKEFILE = -f Makefile.clang
 LDFLAGS = -L../src -lfinal
-INCLUDES = -I../include -I/usr/include/final
+INCLUDES = -I../src/include -I/usr/include/final
 RM = rm -f
 
 ifdef DEBUG
diff --git a/examples/Makefile.gcc b/examples/Makefile.gcc
index fe1afa1b..ab5225fa 100644
--- a/examples/Makefile.gcc
+++ b/examples/Makefile.gcc
@@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
 MAKEFILE = -f Makefile.gcc
 LDFLAGS = -L../src -lfinal
-INCLUDES = -I../include -I/usr/include/final
+INCLUDES = -I../src/include -I/usr/include/final
 RM = rm -f
 
 ifdef DEBUG
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 9cd7b6e6..86b425d9 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -411,7 +411,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CPPUNIT_TEST_FALSE@AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
-@CPPUNIT_TEST_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
+@CPPUNIT_TEST_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/include -Wall -Werror
 @CPPUNIT_TEST_FALSE@hello_SOURCES = hello.cpp
 @CPPUNIT_TEST_FALSE@dialog_SOURCES = dialog.cpp
 @CPPUNIT_TEST_FALSE@input_dialog_SOURCES = input-dialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index e22fb167..ca88bf2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am  -  The Final Cut library
 #----------------------------------------------------------------------
 
-AM_CPPFLAGS = -I../include -Wall -Werror -DCOMPILE_FINAL_CUT
+AM_CPPFLAGS = -Iinclude -Wall -Werror -DCOMPILE_FINAL_CUT
 
 SUBDIRS = . test
 
@@ -66,65 +66,65 @@ libfinal_la_LDFLAGS = -version-info @SO_VERSION@
 finalcutincludedir = $(includedir)/final
 
 finalcutinclude_HEADERS = \
-	../include/final/fapplication.h \
-	../include/final/fbutton.h \
-	../include/final/fbuttongroup.h \
-	../include/final/fcharmap.h \
-	../include/final/fcheckbox.h \
-	../include/final/fconfig.h \
-	../include/final/fswitch.h \
-	../include/final/fdialog.h \
-	../include/final/fc.h \
-	../include/final/ftypes.h \
-	../include/final/emptyfstring.h \
-	../include/final/fevent.h \
-	../include/final/ffiledialog.h \
-	../include/final/final.h \
-	../include/final/fkey_map.h \
-	../include/final/flabel.h \
-	../include/final/flineedit.h \
-	../include/final/flistbox.h \
-	../include/final/flistview.h \
-	../include/final/fmenu.h \
-	../include/final/fmouse.h \
-	../include/final/fkeyboard.h \
-	../include/final/fdialoglistmenu.h \
-	../include/final/fmenubar.h \
-	../include/final/fmenuitem.h \
-	../include/final/fradiomenuitem.h \
-	../include/final/fcheckmenuitem.h \
-	../include/final/fmenulist.h \
-	../include/final/fmessagebox.h \
-	../include/final/ftooltip.h \
-	../include/final/fobject.h \
-	../include/final/fpoint.h \
-	../include/final/foptiattr.h \
-	../include/final/foptimove.h \
-	../include/final/ftermbuffer.h \
-	../include/final/fprogressbar.h \
-	../include/final/fradiobutton.h \
-	../include/final/frect.h \
-	../include/final/fscrollbar.h \
-	../include/final/fscrollview.h \
-	../include/final/fstatusbar.h \
-	../include/final/fstring.h \
-	../include/final/ftcap_map.h \
-	../include/final/ftermcap.h \
-	../include/final/ftermcapquirks.h \
-	../include/final/ftermxterminal.h \
-	../include/final/ftermfreebsd.h \
-	../include/final/ftermopenbsd.h \
-	../include/final/ftermlinux.h \
-	../include/final/ftermdetection.h \
-	../include/final/ftermios.h \
-	../include/final/fterm.h \
-	../include/final/fvterm.h \
-	../include/final/ftextview.h \
-	../include/final/ftogglebutton.h \
-	../include/final/fcolorpalette.h \
-	../include/final/fwidgetcolors.h \
-	../include/final/fwidget.h \
-	../include/final/fwindow.h
+	include/final/fapplication.h \
+	include/final/fbutton.h \
+	include/final/fbuttongroup.h \
+	include/final/fcharmap.h \
+	include/final/fcheckbox.h \
+	include/final/fconfig.h \
+	include/final/fswitch.h \
+	include/final/fdialog.h \
+	include/final/fc.h \
+	include/final/ftypes.h \
+	include/final/emptyfstring.h \
+	include/final/fevent.h \
+	include/final/ffiledialog.h \
+	include/final/final.h \
+	include/final/fkey_map.h \
+	include/final/flabel.h \
+	include/final/flineedit.h \
+	include/final/flistbox.h \
+	include/final/flistview.h \
+	include/final/fmenu.h \
+	include/final/fmouse.h \
+	include/final/fkeyboard.h \
+	include/final/fdialoglistmenu.h \
+	include/final/fmenubar.h \
+	include/final/fmenuitem.h \
+	include/final/fradiomenuitem.h \
+	include/final/fcheckmenuitem.h \
+	include/final/fmenulist.h \
+	include/final/fmessagebox.h \
+	include/final/ftooltip.h \
+	include/final/fobject.h \
+	include/final/fpoint.h \
+	include/final/foptiattr.h \
+	include/final/foptimove.h \
+	include/final/ftermbuffer.h \
+	include/final/fprogressbar.h \
+	include/final/fradiobutton.h \
+	include/final/frect.h \
+	include/final/fscrollbar.h \
+	include/final/fscrollview.h \
+	include/final/fstatusbar.h \
+	include/final/fstring.h \
+	include/final/ftcap_map.h \
+	include/final/ftermcap.h \
+	include/final/ftermcapquirks.h \
+	include/final/ftermxterminal.h \
+	include/final/ftermfreebsd.h \
+	include/final/ftermopenbsd.h \
+	include/final/ftermlinux.h \
+	include/final/ftermdetection.h \
+	include/final/ftermios.h \
+	include/final/fterm.h \
+	include/final/fvterm.h \
+	include/final/ftextview.h \
+	include/final/ftogglebutton.h \
+	include/final/fcolorpalette.h \
+	include/final/fwidgetcolors.h \
+	include/final/fwidget.h \
+	include/final/fwindow.h
 
 clean-local:
 	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
diff --git a/src/Makefile.clang b/src/Makefile.clang
index a8b43447..36a18907 100644
--- a/src/Makefile.clang
+++ b/src/Makefile.clang
@@ -6,7 +6,7 @@
 VERSION = "0.4.0"
 MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib
-INCLUDEDIR1 = ../include/final
+INCLUDEDIR1 = include/final
 INCLUDEDIR2 = /usr/local/include/final
 INCLUDE_HEADERS = \
 	fapplication.h \
@@ -65,7 +65,7 @@ CXX = clang++
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) -DCOMPILE_FINAL_CUT $(DEBUG) $(VER) $(GPM) -march=x86-64 -frtti -fexceptions
 MAKEFILE = -f Makefile.clang
 LDFLAGS = $(TERMCAP) -lgpm
-INCLUDES = -I../include
+INCLUDES = -Iinclude
 GPM = -D F_HAVE_LIBGPM
 VER = -D F_VERSION=$(VERSION)
 RM = rm -f
diff --git a/src/Makefile.gcc b/src/Makefile.gcc
index be51bd6f..909b2afe 100644
--- a/src/Makefile.gcc
+++ b/src/Makefile.gcc
@@ -6,7 +6,7 @@
 VERSION = "0.4.0"
 MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib
-INCLUDEDIR1 = ../include/final
+INCLUDEDIR1 = include/final
 INCLUDEDIR2 = /usr/local/include/final
 INCLUDE_HEADERS = \
 	fapplication.h \
@@ -65,7 +65,7 @@ CXX = g++
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) -DCOMPILE_FINAL_CUT $(DEBUG) $(VER) $(GPM) -march=x86-64 -frtti -fexceptions
 MAKEFILE = -f Makefile.gcc
 LDFLAGS = $(TERMCAP) -lgpm
-INCLUDES = -I../include
+INCLUDES = -Iinclude
 GPM = -D F_HAVE_LIBGPM
 VER = -D F_VERSION=$(VERSION)
 RM = rm -f
diff --git a/src/Makefile.in b/src/Makefile.in
index 2fde7a48..cdbb5318 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -380,7 +380,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I../include -Wall -Werror -DCOMPILE_FINAL_CUT
+AM_CPPFLAGS = -Iinclude -Wall -Werror -DCOMPILE_FINAL_CUT
 SUBDIRS = . test
 lib_LTLIBRARIES = libfinal.la
 libfinal_la_SOURCES = \
@@ -439,65 +439,65 @@ libfinal_la_SOURCES = \
 libfinal_la_LDFLAGS = -version-info @SO_VERSION@
 finalcutincludedir = $(includedir)/final
 finalcutinclude_HEADERS = \
-	../include/final/fapplication.h \
-	../include/final/fbutton.h \
-	../include/final/fbuttongroup.h \
-	../include/final/fcharmap.h \
-	../include/final/fcheckbox.h \
-	../include/final/fconfig.h \
-	../include/final/fswitch.h \
-	../include/final/fdialog.h \
-	../include/final/fc.h \
-	../include/final/ftypes.h \
-	../include/final/emptyfstring.h \
-	../include/final/fevent.h \
-	../include/final/ffiledialog.h \
-	../include/final/final.h \
-	../include/final/fkey_map.h \
-	../include/final/flabel.h \
-	../include/final/flineedit.h \
-	../include/final/flistbox.h \
-	../include/final/flistview.h \
-	../include/final/fmenu.h \
-	../include/final/fmouse.h \
-	../include/final/fkeyboard.h \
-	../include/final/fdialoglistmenu.h \
-	../include/final/fmenubar.h \
-	../include/final/fmenuitem.h \
-	../include/final/fradiomenuitem.h \
-	../include/final/fcheckmenuitem.h \
-	../include/final/fmenulist.h \
-	../include/final/fmessagebox.h \
-	../include/final/ftooltip.h \
-	../include/final/fobject.h \
-	../include/final/fpoint.h \
-	../include/final/foptiattr.h \
-	../include/final/foptimove.h \
-	../include/final/ftermbuffer.h \
-	../include/final/fprogressbar.h \
-	../include/final/fradiobutton.h \
-	../include/final/frect.h \
-	../include/final/fscrollbar.h \
-	../include/final/fscrollview.h \
-	../include/final/fstatusbar.h \
-	../include/final/fstring.h \
-	../include/final/ftcap_map.h \
-	../include/final/ftermcap.h \
-	../include/final/ftermcapquirks.h \
-	../include/final/ftermxterminal.h \
-	../include/final/ftermfreebsd.h \
-	../include/final/ftermopenbsd.h \
-	../include/final/ftermlinux.h \
-	../include/final/ftermdetection.h \
-	../include/final/ftermios.h \
-	../include/final/fterm.h \
-	../include/final/fvterm.h \
-	../include/final/ftextview.h \
-	../include/final/ftogglebutton.h \
-	../include/final/fcolorpalette.h \
-	../include/final/fwidgetcolors.h \
-	../include/final/fwidget.h \
-	../include/final/fwindow.h
+	include/final/fapplication.h \
+	include/final/fbutton.h \
+	include/final/fbuttongroup.h \
+	include/final/fcharmap.h \
+	include/final/fcheckbox.h \
+	include/final/fconfig.h \
+	include/final/fswitch.h \
+	include/final/fdialog.h \
+	include/final/fc.h \
+	include/final/ftypes.h \
+	include/final/emptyfstring.h \
+	include/final/fevent.h \
+	include/final/ffiledialog.h \
+	include/final/final.h \
+	include/final/fkey_map.h \
+	include/final/flabel.h \
+	include/final/flineedit.h \
+	include/final/flistbox.h \
+	include/final/flistview.h \
+	include/final/fmenu.h \
+	include/final/fmouse.h \
+	include/final/fkeyboard.h \
+	include/final/fdialoglistmenu.h \
+	include/final/fmenubar.h \
+	include/final/fmenuitem.h \
+	include/final/fradiomenuitem.h \
+	include/final/fcheckmenuitem.h \
+	include/final/fmenulist.h \
+	include/final/fmessagebox.h \
+	include/final/ftooltip.h \
+	include/final/fobject.h \
+	include/final/fpoint.h \
+	include/final/foptiattr.h \
+	include/final/foptimove.h \
+	include/final/ftermbuffer.h \
+	include/final/fprogressbar.h \
+	include/final/fradiobutton.h \
+	include/final/frect.h \
+	include/final/fscrollbar.h \
+	include/final/fscrollview.h \
+	include/final/fstatusbar.h \
+	include/final/fstring.h \
+	include/final/ftcap_map.h \
+	include/final/ftermcap.h \
+	include/final/ftermcapquirks.h \
+	include/final/ftermxterminal.h \
+	include/final/ftermfreebsd.h \
+	include/final/ftermopenbsd.h \
+	include/final/ftermlinux.h \
+	include/final/ftermdetection.h \
+	include/final/ftermios.h \
+	include/final/fterm.h \
+	include/final/fvterm.h \
+	include/final/ftextview.h \
+	include/final/ftogglebutton.h \
+	include/final/fcolorpalette.h \
+	include/final/fwidgetcolors.h \
+	include/final/fwidget.h \
+	include/final/fwindow.h
 
 all: all-recursive