diff --git a/examples/Makefile.am b/examples/Makefile.am
index 88bbc5ae..54b126de 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,7 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES		= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES		= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 			  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 			  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e98f0f52..31dda65f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 3c2ad0e0..5bab7942 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index b7d1c017..d61567c7 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am
index 125f7d8a..19bd1d1d 100644
--- a/sysdeps/guile/Makefile.am
+++ b/sysdeps/guile/Makefile.am
@@ -6,7 +6,7 @@ DIST_SUBDIRS			= names
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am
index 24387126..80f4fb88 100644
--- a/sysdeps/guile/names/Makefile.am
+++ b/sysdeps/guile/names/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index 0c17dbea..7d161c51 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am
index 96e43037..f650e158 100644
--- a/sysdeps/names/Makefile.am
+++ b/sysdeps/names/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am
index 7903bcab..35a64d0a 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am
index 9c188950..2545ce47 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am
index 65d5a793..cc5126d7 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE