diff --git a/2d/Makefile.am b/2d/Makefile.am
index 2ce85c7ce..520b4bc31 100644
--- a/2d/Makefile.am
+++ b/2d/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = lib2d.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 if USE_ASM
 ASM_SRCS =
diff --git a/3d/Makefile.am b/3d/Makefile.am
index fcdb3ff53..e91b648c1 100644
--- a/3d/Makefile.am
+++ b/3d/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = lib3d.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 lib3d_a_SOURCES = \
 clipper.c  globvars.c  interp.c  points.c  setup.c \
diff --git a/Makefile.am b/Makefile.am
index 5b9ceee7a..47013c262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS=1.5
 
 SUBDIRS = 2d 3d maths mem cfile iff texmap misc arch main
 
-EXTRA_SUBDIRS = includes tools unused debian rpm
+EXTRA_SUBDIRS = include tools unused debian rpm
 
 bin_PROGRAMS = @TARGETS@
 
diff --git a/cfile/Makefile.am b/cfile/Makefile.am
index e1e0391fc..b5f1c6eee 100644
--- a/cfile/Makefile.am
+++ b/cfile/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libcfile.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 libcfile_a_SOURCES = cfile.c
diff --git a/iff/Makefile.am b/iff/Makefile.am
index 9ea5d2318..78268e175 100644
--- a/iff/Makefile.am
+++ b/iff/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_SUBDIRS = archive
 
 noinst_LIBRARIES = libiff.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 libiff_a_SOURCES = iff.c
 
diff --git a/main/Makefile.am b/main/Makefile.am
index 8443f09cc..3b0dd2197 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_SUBDIRS = old
 
 noinst_LIBRARIES = libmain.a
 
-INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include
 
 CFLAGS += -fwritable-strings
 
diff --git a/maths/Makefile.am b/maths/Makefile.am
index d2530d25c..b6a2a207d 100644
--- a/maths/Makefile.am
+++ b/maths/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libmaths.a
-INCLUDES = -I $(top_srcdir)/includes 
+INCLUDES = -I $(top_srcdir)/include
 
 if USE_ASM
 libmaths_a_SOURCES = vecmat.c rand.c tables.c
diff --git a/mem/Makefile.am b/mem/Makefile.am
index 4680aae2f..1e77aa62b 100644
--- a/mem/Makefile.am
+++ b/mem/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libmem.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 libmem_a_SOURCES = mem.c
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 20713c341..3e48bfa50 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libmisc.a
-INCLUDES = -I $(top_srcdir)/includes
+INCLUDES = -I $(top_srcdir)/include
 
 libmisc_a_SOURCES = \
 args.c	    d_delay.c  error.c	  strio.c \
diff --git a/texmap/Makefile.am b/texmap/Makefile.am
index 00efedbd5..1b979eefe 100644
--- a/texmap/Makefile.am
+++ b/texmap/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libtexmap.a
-INCLUDES = -I $(top_srcdir)/includes -DFL1_WITH_FLAT
+INCLUDES = -I $(top_srcdir)/include -DFL1_WITH_FLAT
 
 if USE_ASM
 libtexmap_a_SOURCES = ntmap.c scanline.c tmapflat.c tmappent.S tmapppro.S