diff --git a/Makefile.am b/Makefile.am
index 77b3337f9..566752532 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,8 @@ libgtsam_la_LDFLAGS = -version-info 0:0:0
 
 # Store the absolute path to the directory above gtsam for the include path,
 # saves us from having an extra 'gtsam' subdirectory.
-BORG_SRCROOT := $(shell cd $(top_srcdir)/.. && pwd)
-AM_MAKEFLAGS = "BORG_SRCROOT=$(BORG_SRCROOT)"
+#BORG_SRCROOT := $(shell cd $(top_srcdir)/.. && pwd)
+#AM_MAKEFLAGS = "BORG_SRCROOT=$(BORG_SRCROOT)"
 
 # Add these files to make sure they're in the distribution
 noinst_HEADERS = gtsam.h
diff --git a/base/Makefile.am b/base/Makefile.am
index 9db994250..32d814d93 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -49,7 +49,7 @@ base_HEADERS = $(headers)
 noinst_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = $(sources)
 
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 
 if USE_BLAS
 AM_CPPFLAGS += -DGT_USE_CBLAS
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 32b2c65e5..9a3770838 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,7 +19,7 @@ noinst_PROGRAMS += PlanarSLAMExample   # Solves SLAM example from tutorial by us
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 AM_LDFLAGS = $(BOOST_LDFLAGS) 
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 LDADD = ../libgtsam.la
 AM_DEFAULT_SOURCE_EXT = .cpp
 if USE_LDL
diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index f7463f30b..ee1636780 100644
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -41,7 +41,7 @@ geometrydir = $(pkgincludedir)/geometry
 geometry_HEADERS = $(headers)
 noinst_LTLIBRARIES = libgeometry.la
 libgeometry_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
diff --git a/inference/Makefile.am b/inference/Makefile.am
index 9754151a4..e6551b7ca 100644
--- a/inference/Makefile.am
+++ b/inference/Makefile.am
@@ -58,7 +58,7 @@ inferencedir = $(pkgincludedir)/inference
 inference_HEADERS = $(headers)
 noinst_LTLIBRARIES = libinference.la
 libinference_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
diff --git a/linear/Makefile.am b/linear/Makefile.am
index 8fed48825..607d110ab 100644
--- a/linear/Makefile.am
+++ b/linear/Makefile.am
@@ -46,7 +46,7 @@ lineardir = $(pkgincludedir)/linear
 linear_HEADERS = $(headers)
 noinst_LTLIBRARIES = liblinear.la
 liblinear_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
diff --git a/nonlinear/Makefile.am b/nonlinear/Makefile.am
index 85005ced9..329021ffd 100644
--- a/nonlinear/Makefile.am
+++ b/nonlinear/Makefile.am
@@ -46,7 +46,7 @@ nonlineardir = $(pkgincludedir)/nonlinear
 nonlinear_HEADERS = $(headers)
 noinst_LTLIBRARIES = libnonlinear.la
 libnonlinear_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
diff --git a/slam/Makefile.am b/slam/Makefile.am
index 5935893fb..07e8a244d 100644
--- a/slam/Makefile.am
+++ b/slam/Makefile.am
@@ -68,7 +68,7 @@ slamdir = $(pkgincludedir)/slam
 slam_HEADERS = $(headers)
 noinst_LTLIBRARIES = libslam.la
 libslam_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 265a731db..bbf582e8f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,7 @@ noinst_PROGRAMS = timeGaussianFactorGraph timeFactorOverhead
 # rules to build unit tests
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT)
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
 AM_LDFLAGS = $(BOOST_LDFLAGS) 
 
 # link to serialization library for test 
diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index d6b0e9e10..c5d793b31 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -18,7 +18,7 @@ noinst_HEADERS = geometry.h utilities.h Argument.h Constructor.h Method.h Class.
 
 noinst_PROGRAMS = wrap
 wrap_SOURCES = ${common} wrap.cpp
-AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) -DTOPSRCDIR="\"$(top_srcdir)\""
+AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/.. -DTOPSRCDIR="\"$(top_srcdir)\""
 AM_CXXFLAGS = -MMD
 AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS)