diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am
index dd73f1f4..d357ba1f 100644
--- a/src/BuildTiles/Clipper/Makefile.am
+++ b/src/BuildTiles/Clipper/Makefile.am
@@ -13,4 +13,4 @@ testclipper_LDADD = \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
 	-lsgdebug -lsgmisc -lz -lgpc
 
-INCLUDES += -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src/Lib
diff --git a/src/BuildTiles/GenOutput/Makefile.am b/src/BuildTiles/GenOutput/Makefile.am
index 79359b28..e0edb833 100644
--- a/src/BuildTiles/GenOutput/Makefile.am
+++ b/src/BuildTiles/GenOutput/Makefile.am
@@ -3,6 +3,6 @@ noinst_LIBRARIES = libGenOutput.a
 libGenOutput_a_SOURCES = genobj.cxx genobj.hxx
 
 INCLUDES += \
-	-I$(top_builddir) \
-	-I$(top_builddir)/src/Lib \
-	-I$(top_builddir)/src/Construct
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src/Lib \
+	-I$(top_srcdir)/src/Construct
diff --git a/src/BuildTiles/Main/Makefile.am b/src/BuildTiles/Main/Makefile.am
index 29b73aaf..216af950 100644
--- a/src/BuildTiles/Main/Makefile.am
+++ b/src/BuildTiles/Main/Makefile.am
@@ -22,6 +22,6 @@ fgfs_master_SOURCES = master.cxx
 fgfs_master_LDADD = -lsgbucket -lsgmisc
 
 INCLUDES += \
-	-I$(top_builddir)/src \
-	-I$(top_builddir)/src/Lib \
-	-I$(top_builddir)/src/Construct
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/Lib \
+	-I$(top_srcdir)/src/Construct
diff --git a/src/BuildTiles/Match/Makefile.am b/src/BuildTiles/Match/Makefile.am
index b0d8b04c..9d58c278 100644
--- a/src/BuildTiles/Match/Makefile.am
+++ b/src/BuildTiles/Match/Makefile.am
@@ -2,4 +2,4 @@ noinst_LIBRARIES = libMatch.a
 
 libMatch_a_SOURCES = match.cxx match.hxx
 
-INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct
+INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
diff --git a/src/BuildTiles/Triangulate/Makefile.am b/src/BuildTiles/Triangulate/Makefile.am
index d93dd5fe..aa822d5e 100644
--- a/src/BuildTiles/Triangulate/Makefile.am
+++ b/src/BuildTiles/Triangulate/Makefile.am
@@ -4,4 +4,4 @@ libTriangulate_a_SOURCES = \
 	triangle.cxx triangle.hxx \
 	trieles.cxx trieles.hxx
 
-INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct
+INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am
index e56b3cb7..c18bcb3f 100644
--- a/src/Lib/Array/Makefile.am
+++ b/src/Lib/Array/Makefile.am
@@ -10,4 +10,4 @@ testarray_LDADD = \
 	$(top_builddir)/src/Lib/Array/libArray.a \
 	-lsgbucket -lsgmath -lsgmisc -lz
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir)/src
diff --git a/src/Lib/DEM/Makefile.am b/src/Lib/DEM/Makefile.am
index 4262c2ce..f9cfadf8 100644
--- a/src/Lib/DEM/Makefile.am
+++ b/src/Lib/DEM/Makefile.am
@@ -2,10 +2,5 @@ noinst_LIBRARIES = libDEM.a
 
 libDEM_a_SOURCES = dem.cxx dem.hxx
 
-INCLUDES += -I$(top_builddir)/src
-
-# We can't build this with "-O2" (optimization) since this causes a seg fault
-# I haven't found a way to strip this out of the CXXFLAGS, so I'm just
-# setting it to "-g"
-# CXXFLAGS = -g
+INCLUDES += -I$(top_srcdir)/src
 
diff --git a/src/Lib/Geometry/Makefile.am b/src/Lib/Geometry/Makefile.am
index f018c4f3..1daa89e3 100644
--- a/src/Lib/Geometry/Makefile.am
+++ b/src/Lib/Geometry/Makefile.am
@@ -7,6 +7,6 @@ libGeometry_a_SOURCES = \
 	trisegs.cxx trisegs.hxx
 
 INCLUDES += \
-	-I$(top_builddir)/src \
-	-I$(top_builddir)/src/Lib \
-	-I$(top_builddir)/src/Construct
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/Lib \
+	-I$(top_srcdir)/src/Construct
diff --git a/src/Lib/Optimize/Makefile.am b/src/Lib/Optimize/Makefile.am
index b213a43d..7afcae7e 100644
--- a/src/Lib/Optimize/Makefile.am
+++ b/src/Lib/Optimize/Makefile.am
@@ -4,4 +4,4 @@ libOptimize_a_SOURCES = \
 	genfans.cxx genfans.hxx \
 	genstrips.cxx genstrips.hxx
 
-INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct
+INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
diff --git a/src/Lib/Polygon/Makefile.am b/src/Lib/Polygon/Makefile.am
index f162bb31..4164233b 100644
--- a/src/Lib/Polygon/Makefile.am
+++ b/src/Lib/Polygon/Makefile.am
@@ -7,4 +7,4 @@ libPolygon_a_SOURCES = \
 	split.cxx split.hxx \
 	superpoly.cxx superpoly.hxx
 
-INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
diff --git a/src/Lib/poly2tri/Makefile.am b/src/Lib/poly2tri/Makefile.am
index 8acaf613..cf79f27a 100644
--- a/src/Lib/poly2tri/Makefile.am
+++ b/src/Lib/poly2tri/Makefile.am
@@ -16,4 +16,4 @@ libpoly2tri_a_SOURCES = \
 	tri.c \
 	triangulate.h
 
-# INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
+# INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/Lib
diff --git a/src/Lib/shapelib/Makefile.am b/src/Lib/shapelib/Makefile.am
index ea63ff97..9a01d232 100644
--- a/src/Lib/shapelib/Makefile.am
+++ b/src/Lib/shapelib/Makefile.am
@@ -34,4 +34,4 @@ shptest_LDADD = libshape.a
 shputils_SOURCES = shputils.c
 shputils_LDADD = libshape.a
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir)/src
diff --git a/src/Prep/DemChop/Makefile.am b/src/Prep/DemChop/Makefile.am
index e7f10972..1f94d3a8 100644
--- a/src/Prep/DemChop/Makefile.am
+++ b/src/Prep/DemChop/Makefile.am
@@ -33,7 +33,7 @@ demchop_LDADD = \
 	-lsgbucket -lsgmisc -lsgdebug -lz
 	$(base_LIBS)
 
-INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
diff --git a/src/Prep/DemInfo/Makefile.am b/src/Prep/DemInfo/Makefile.am
index f63bde29..e6d66933 100644
--- a/src/Prep/DemInfo/Makefile.am
+++ b/src/Prep/DemInfo/Makefile.am
@@ -33,7 +33,7 @@ deminfo_LDADD = \
 	-lsgbucket -lsgmisc -lz \
 	$(base_LIBS)
 
-INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am
index 6d6f9eff..49d440ba 100644
--- a/src/Prep/GSHHS/Makefile.am
+++ b/src/Prep/GSHHS/Makefile.am
@@ -19,4 +19,4 @@ debug_LDADD = \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
 	-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
 
-INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
diff --git a/src/Prep/MergerClipper/Makefile.am b/src/Prep/MergerClipper/Makefile.am
index 292302f1..04bd1e96 100644
--- a/src/Prep/MergerClipper/Makefile.am
+++ b/src/Prep/MergerClipper/Makefile.am
@@ -12,4 +12,4 @@ testmerger_LDADD = \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
 	-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
 
-INCLUDES += -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src/Lib
diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am
index ab16a877..f301389b 100644
--- a/src/Prep/ShapeFile/Makefile.am
+++ b/src/Prep/ShapeFile/Makefile.am
@@ -8,4 +8,4 @@ shape_decode_LDADD = \
 	$(top_builddir)/src/Lib/shapelib/libshape.a \
 	-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
 
-INCLUDES += -I$(top_builddir)/src/Lib
+INCLUDES += -I$(top_srcdir)/src/Lib