diff --git a/Math/Makefile.am b/Math/Makefile.am
index 01af4fd34..2308375c2 100644
--- a/Math/Makefile.am
+++ b/Math/Makefile.am
@@ -12,4 +12,4 @@ libMath_la_SOURCES = \
 	polar.c polar.h \
 	vector.c vector.h
 
-INCLUDES += -I..
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
diff --git a/Math/Makefile.in b/Math/Makefile.in
index cd7d4153b..a4e90796c 100644
--- a/Math/Makefile.in
+++ b/Math/Makefile.in
@@ -84,12 +84,12 @@ libMath_la_SOURCES = \
 	polar.c polar.h \
 	vector.c vector.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../Simulator/Include/config.h
+CONFIG_HEADER = ../../Include/config.h
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -323,7 +323,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I..
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.