diff --git a/src/Makefile.am b/src/Makefile.am
index cdc02d489..b75401b52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -222,7 +222,7 @@ ngspice.idx: ngmakeidx
 ## General Includes and libraries:
 
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@
 
 LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
 
diff --git a/src/ciderlib/input/Makefile.am b/src/ciderlib/input/Makefile.am
index 4afc12296..9e8b1ba90 100644
--- a/src/ciderlib/input/Makefile.am
+++ b/src/ciderlib/input/Makefile.am
@@ -29,5 +29,5 @@ libciderinput_a_SOURCES = 	\
 
 
 EXTRA_DIST = readme
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/ciderlib/oned/Makefile.am b/src/ciderlib/oned/Makefile.am
index fc47262e9..4e8ea9cc5 100644
--- a/src/ciderlib/oned/Makefile.am
+++ b/src/ciderlib/oned/Makefile.am
@@ -21,5 +21,5 @@ libcideroned_a_SOURCES = 	\
 		onesolve.c	
 
 EXTRA_DIST = notes readme
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/ciderlib/support/Makefile.am b/src/ciderlib/support/Makefile.am
index 74db0682f..1ce07fd45 100644
--- a/src/ciderlib/support/Makefile.am
+++ b/src/ciderlib/support/Makefile.am
@@ -17,5 +17,5 @@ libcidersuprt_a_SOURCES = 	\
 		suprem.c	\
 		suprmitf.c	
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/ciderlib/twod/Makefile.am b/src/ciderlib/twod/Makefile.am
index d2b6fa7b8..ff589da7b 100644
--- a/src/ciderlib/twod/Makefile.am
+++ b/src/ciderlib/twod/Makefile.am
@@ -29,5 +29,5 @@ libcidertwod_a_SOURCES = 	\
 		twosolve.c	
 
 EXTRA_DIST = readme
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 0cb67396c..64b630cd2 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -185,6 +185,6 @@ libfte_a_SOURCES = \
 # testcommands_LDADD = libfte.a plotting/libplotting.a ../misc/libmisc.a
 
 
-INCLUDES = -I$(top_srcdir)/src/include @X_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/help/Makefile.am b/src/frontend/help/Makefile.am
index 5a9f8a7ac..a665b63d4 100644
--- a/src/frontend/help/Makefile.am
+++ b/src/frontend/help/Makefile.am
@@ -14,7 +14,7 @@ libhlp_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include @X_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
 
 endif 
 
diff --git a/src/frontend/numparam/Makefile.am b/src/frontend/numparam/Makefile.am
index f20a62bb0..f2ced1d85 100644
--- a/src/frontend/numparam/Makefile.am
+++ b/src/frontend/numparam/Makefile.am
@@ -12,5 +12,5 @@ libnumparam_a_SOURCES = 		\
 	numpaif.h	\
 	numparam.h
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/parser/Makefile.am b/src/frontend/parser/Makefile.am
index b143119a5..aa4caaaf1 100644
--- a/src/frontend/parser/Makefile.am
+++ b/src/frontend/parser/Makefile.am
@@ -22,5 +22,5 @@ libparser_a_SOURCES = \
 		unixcom.h
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am
index 8dd2723bb..53e927b53 100644
--- a/src/frontend/plotting/Makefile.am
+++ b/src/frontend/plotting/Makefile.am
@@ -32,6 +32,6 @@ libplotting_a_SOURCES += \
 	xgraph.h
 endif
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@ 
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@ 
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/wdisp/Makefile.am b/src/frontend/wdisp/Makefile.am
index 3f43f2434..650fbcc48 100644
--- a/src/frontend/wdisp/Makefile.am
+++ b/src/frontend/wdisp/Makefile.am
@@ -11,6 +11,6 @@ libwindisp_a_SOURCES = \
 	ftegraf.h
 	
 	
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am
index 6ca74560f..6ab086c3a 100644
--- a/src/maths/cmaths/Makefile.am
+++ b/src/maths/cmaths/Makefile.am
@@ -44,6 +44,6 @@ TESTS = test_cx_mag test_cx_j test_cx_ph
 endif !WINDOWS
 
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/deriv/Makefile.am b/src/maths/deriv/Makefile.am
index 260e76133..914fd0cb5 100644
--- a/src/maths/deriv/Makefile.am
+++ b/src/maths/deriv/Makefile.am
@@ -19,5 +19,5 @@ libderiv_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/misc/Makefile.am b/src/maths/misc/Makefile.am
index f5815c594..ff37e8bf6 100644
--- a/src/maths/misc/Makefile.am
+++ b/src/maths/misc/Makefile.am
@@ -15,6 +15,6 @@ libmathmisc_a_SOURCES = \
 	norm.h		\
 	norm.c		 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/ni/Makefile.am b/src/maths/ni/Makefile.am
index f685a50a3..6171f5c91 100644
--- a/src/maths/ni/Makefile.am
+++ b/src/maths/ni/Makefile.am
@@ -31,6 +31,6 @@ libni_a_SOURCES = \
 		nisenre.h
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/poly/Makefile.am b/src/maths/poly/Makefile.am
index bdff80280..58e0685c4 100644
--- a/src/maths/poly/Makefile.am
+++ b/src/maths/poly/Makefile.am
@@ -13,6 +13,6 @@ libpoly_a_SOURCES = \
 	polyeval.h
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am
index ddedb9686..eb2670e96 100644
--- a/src/maths/sparse/Makefile.am
+++ b/src/maths/sparse/Makefile.am
@@ -18,6 +18,6 @@ libsparse_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index 831d3d0c3..9cf279a9f 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -35,5 +35,5 @@ libmisc_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am
index d828f2b24..8bdcedfdb 100644
--- a/src/spicelib/analysis/Makefile.am
+++ b/src/spicelib/analysis/Makefile.am
@@ -100,5 +100,5 @@ libckt_a_SOURCES = \
 		ckt.h  
 
 
-INCLUDES =  -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS =  -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index ef76d2adf..2374bd73d 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -132,6 +132,6 @@ libdev_a_SOURCES = 	\
 	cktinit.c	\
 	limit.c
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 9aa2f840f..6e1b8695c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.12  2008-08-19 08:48:26  r29173
+  Revision 1.13  2008-08-24 17:12:59  pnenzi
+
+  Updated to new automake standard. Replaced all INCLUDES with AM_CPPFLAGS
+
+  Revision 1.12  2008/08/19 08:48:26  r29173
   add dependency $module.c: admsva/$module.va
 
   Revision 1.11  2007/07/05 09:44:12  r29173
@@ -184,7 +188,7 @@ CLEANFILES = 		\\
 	$(module)conv.c	\\
 	$(module)getic.c
 
-INCLUDES = -I\$(top_srcdir)/src/include
+AM_CPPFLAGS = -I\$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/asrc/Makefile.am b/src/spicelib/devices/asrc/Makefile.am
index e8644972b..7b1e6c30b 100644
--- a/src/spicelib/devices/asrc/Makefile.am
+++ b/src/spicelib/devices/asrc/Makefile.am
@@ -22,5 +22,5 @@ libasrc_a_SOURCES = 	\
 	asrcset.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bjt/Makefile.am b/src/spicelib/devices/bjt/Makefile.am
index e0ebc3acb..87ba8b0ca 100644
--- a/src/spicelib/devices/bjt/Makefile.am
+++ b/src/spicelib/devices/bjt/Makefile.am
@@ -36,6 +36,6 @@ libbjt_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bjt2/Makefile.am b/src/spicelib/devices/bjt2/Makefile.am
index d128231db..579b35db7 100644
--- a/src/spicelib/devices/bjt2/Makefile.am
+++ b/src/spicelib/devices/bjt2/Makefile.am
@@ -40,6 +40,6 @@ libbjt2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim1/Makefile.am b/src/spicelib/devices/bsim1/Makefile.am
index e4037786d..5e3909f51 100644
--- a/src/spicelib/devices/bsim1/Makefile.am
+++ b/src/spicelib/devices/bsim1/Makefile.am
@@ -32,5 +32,5 @@ libbsim1_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim2/Makefile.am b/src/spicelib/devices/bsim2/Makefile.am
index 41e2e4997..cfc71d52c 100644
--- a/src/spicelib/devices/bsim2/Makefile.am
+++ b/src/spicelib/devices/bsim2/Makefile.am
@@ -30,6 +30,6 @@ libbsim2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3/Makefile.am b/src/spicelib/devices/bsim3/Makefile.am
index 3efd7a2fa..f2e345088 100644
--- a/src/spicelib/devices/bsim3/Makefile.am
+++ b/src/spicelib/devices/bsim3/Makefile.am
@@ -29,6 +29,6 @@ libbsim3_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3soi/Makefile.am b/src/spicelib/devices/bsim3soi/Makefile.am
index f17cc0306..88e13f14b 100644
--- a/src/spicelib/devices/bsim3soi/Makefile.am
+++ b/src/spicelib/devices/bsim3soi/Makefile.am
@@ -29,6 +29,6 @@ libbsim3soi_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3soi_dd/Makefile.am b/src/spicelib/devices/bsim3soi_dd/Makefile.am
index b25219734..907039cbb 100644
--- a/src/spicelib/devices/bsim3soi_dd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_dd/Makefile.am
@@ -29,6 +29,6 @@ libbsim3soidd_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3soi_fd/Makefile.am b/src/spicelib/devices/bsim3soi_fd/Makefile.am
index 39a29352a..9367905d2 100644
--- a/src/spicelib/devices/bsim3soi_fd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_fd/Makefile.am
@@ -29,6 +29,6 @@ libbsim3soifd_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3soi_pd/Makefile.am b/src/spicelib/devices/bsim3soi_pd/Makefile.am
index 7d90a3d51..00ca0f63b 100644
--- a/src/spicelib/devices/bsim3soi_pd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_pd/Makefile.am
@@ -29,6 +29,6 @@ libbsim3soipd_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v0/Makefile.am b/src/spicelib/devices/bsim3v0/Makefile.am
index b1933693d..2b5aa9689 100644
--- a/src/spicelib/devices/bsim3v0/Makefile.am
+++ b/src/spicelib/devices/bsim3v0/Makefile.am
@@ -28,6 +28,6 @@ libbsim3v0_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v1/Makefile.am b/src/spicelib/devices/bsim3v1/Makefile.am
index 96c18b12f..cef738bb2 100644
--- a/src/spicelib/devices/bsim3v1/Makefile.am
+++ b/src/spicelib/devices/bsim3v1/Makefile.am
@@ -29,6 +29,6 @@ libbsim3v1_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v1a/Makefile.am b/src/spicelib/devices/bsim3v1a/Makefile.am
index f4e4a77bd..5abfaf8a7 100644
--- a/src/spicelib/devices/bsim3v1a/Makefile.am
+++ b/src/spicelib/devices/bsim3v1a/Makefile.am
@@ -28,6 +28,6 @@ libbsim3v1a_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v1s/Makefile.am b/src/spicelib/devices/bsim3v1s/Makefile.am
index 2b64574f7..08fbc954e 100644
--- a/src/spicelib/devices/bsim3v1s/Makefile.am
+++ b/src/spicelib/devices/bsim3v1s/Makefile.am
@@ -29,6 +29,6 @@ libbsim3v1s_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v32/Makefile.am b/src/spicelib/devices/bsim3v32/Makefile.am
index b75b121a1..f87859fc5 100644
--- a/src/spicelib/devices/bsim3v32/Makefile.am
+++ b/src/spicelib/devices/bsim3v32/Makefile.am
@@ -29,6 +29,6 @@ libbsim3v32_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim4/Makefile.am b/src/spicelib/devices/bsim4/Makefile.am
index c9bf85550..65b19542f 100644
--- a/src/spicelib/devices/bsim4/Makefile.am
+++ b/src/spicelib/devices/bsim4/Makefile.am
@@ -30,6 +30,6 @@ libbsim4_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim4v2/Makefile.am b/src/spicelib/devices/bsim4v2/Makefile.am
index ee73ad0c3..acde0a348 100644
--- a/src/spicelib/devices/bsim4v2/Makefile.am
+++ b/src/spicelib/devices/bsim4v2/Makefile.am
@@ -30,6 +30,6 @@ libbsim4v2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim4v3/Makefile.am b/src/spicelib/devices/bsim4v3/Makefile.am
index c746d228e..0012c3ace 100644
--- a/src/spicelib/devices/bsim4v3/Makefile.am
+++ b/src/spicelib/devices/bsim4v3/Makefile.am
@@ -30,6 +30,6 @@ libbsim4v3_a_SOURCES =	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim4v4/Makefile.am b/src/spicelib/devices/bsim4v4/Makefile.am
index d7aa6c304..dd26e003a 100644
--- a/src/spicelib/devices/bsim4v4/Makefile.am
+++ b/src/spicelib/devices/bsim4v4/Makefile.am
@@ -30,6 +30,6 @@ libbsim4v4_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim4v5/Makefile.am b/src/spicelib/devices/bsim4v5/Makefile.am
index 3c58c0f5a..6ce8e40ba 100644
--- a/src/spicelib/devices/bsim4v5/Makefile.am
+++ b/src/spicelib/devices/bsim4v5/Makefile.am
@@ -30,6 +30,6 @@ libbsim4v5_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cap/Makefile.am b/src/spicelib/devices/cap/Makefile.am
index f4c9d220c..56635a401 100644
--- a/src/spicelib/devices/cap/Makefile.am
+++ b/src/spicelib/devices/cap/Makefile.am
@@ -31,6 +31,6 @@ libcap_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cccs/Makefile.am b/src/spicelib/devices/cccs/Makefile.am
index f0757d68c..bd295f7d7 100644
--- a/src/spicelib/devices/cccs/Makefile.am
+++ b/src/spicelib/devices/cccs/Makefile.am
@@ -24,5 +24,5 @@ libcccs_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ccvs/Makefile.am b/src/spicelib/devices/ccvs/Makefile.am
index 146db18de..ff12a0f96 100644
--- a/src/spicelib/devices/ccvs/Makefile.am
+++ b/src/spicelib/devices/ccvs/Makefile.am
@@ -25,6 +25,6 @@ libccvs_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cpl/Makefile.am b/src/spicelib/devices/cpl/Makefile.am
index 05e81d731..7619cc511 100755
--- a/src/spicelib/devices/cpl/Makefile.am
+++ b/src/spicelib/devices/cpl/Makefile.am
@@ -19,6 +19,6 @@ libcpl_a_SOURCES = 	\
 	cplsetup.c \
 	cplinit.c
     
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/csw/Makefile.am b/src/spicelib/devices/csw/Makefile.am
index 0b7fe6b26..7d0bc533b 100644
--- a/src/spicelib/devices/csw/Makefile.am
+++ b/src/spicelib/devices/csw/Makefile.am
@@ -25,5 +25,5 @@ libcsw_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/dio/Makefile.am b/src/spicelib/devices/dio/Makefile.am
index f73c31d89..66e59a092 100644
--- a/src/spicelib/devices/dio/Makefile.am
+++ b/src/spicelib/devices/dio/Makefile.am
@@ -34,5 +34,5 @@ libdio_a_SOURCES = 	\
 	diotrunc.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet1/Makefile.am b/src/spicelib/devices/hfet1/Makefile.am
index d7a86fb89..c4abc66f9 100644
--- a/src/spicelib/devices/hfet1/Makefile.am
+++ b/src/spicelib/devices/hfet1/Makefile.am
@@ -26,5 +26,5 @@ libhfet_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet2/Makefile.am b/src/spicelib/devices/hfet2/Makefile.am
index eb9878d10..6eebf8d5e 100644
--- a/src/spicelib/devices/hfet2/Makefile.am
+++ b/src/spicelib/devices/hfet2/Makefile.am
@@ -26,5 +26,5 @@ libhfet2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hisim/Makefile.am b/src/spicelib/devices/hisim/Makefile.am
index 5d2344185..4b4a43b32 100644
--- a/src/spicelib/devices/hisim/Makefile.am
+++ b/src/spicelib/devices/hisim/Makefile.am
@@ -33,6 +33,6 @@ libhisim_a_SOURCES = 	hisim.h		\
 			hsm1trunc.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ind/Makefile.am b/src/spicelib/devices/ind/Makefile.am
index 94ab7147c..ba722a70b 100644
--- a/src/spicelib/devices/ind/Makefile.am
+++ b/src/spicelib/devices/ind/Makefile.am
@@ -41,5 +41,5 @@ libind_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/isrc/Makefile.am b/src/spicelib/devices/isrc/Makefile.am
index db407b76a..d4a6f12c1 100644
--- a/src/spicelib/devices/isrc/Makefile.am
+++ b/src/spicelib/devices/isrc/Makefile.am
@@ -21,5 +21,5 @@ libisrc_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet/Makefile.am b/src/spicelib/devices/jfet/Makefile.am
index 78c4ed50e..7350e3622 100644
--- a/src/spicelib/devices/jfet/Makefile.am
+++ b/src/spicelib/devices/jfet/Makefile.am
@@ -29,5 +29,5 @@ libjfet_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet2/Makefile.am b/src/spicelib/devices/jfet2/Makefile.am
index b564836e5..4a6d4103c 100644
--- a/src/spicelib/devices/jfet2/Makefile.am
+++ b/src/spicelib/devices/jfet2/Makefile.am
@@ -30,5 +30,5 @@ libjfet2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ltra/Makefile.am b/src/spicelib/devices/ltra/Makefile.am
index 8324ffdb3..fb90e64a9 100644
--- a/src/spicelib/devices/ltra/Makefile.am
+++ b/src/spicelib/devices/ltra/Makefile.am
@@ -26,5 +26,5 @@ libltra_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mes/Makefile.am b/src/spicelib/devices/mes/Makefile.am
index db36235c6..c1b487f39 100644
--- a/src/spicelib/devices/mes/Makefile.am
+++ b/src/spicelib/devices/mes/Makefile.am
@@ -29,5 +29,5 @@ libmes_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mesa/Makefile.am b/src/spicelib/devices/mesa/Makefile.am
index 5ecbcbc0d..da44c9ced 100644
--- a/src/spicelib/devices/mesa/Makefile.am
+++ b/src/spicelib/devices/mesa/Makefile.am
@@ -26,5 +26,5 @@ libmesa_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos1/Makefile.am b/src/spicelib/devices/mos1/Makefile.am
index 81f44026e..9e702a8f9 100644
--- a/src/spicelib/devices/mos1/Makefile.am
+++ b/src/spicelib/devices/mos1/Makefile.am
@@ -35,5 +35,5 @@ libmos1_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos2/Makefile.am b/src/spicelib/devices/mos2/Makefile.am
index a307a789d..d432fd72d 100644
--- a/src/spicelib/devices/mos2/Makefile.am
+++ b/src/spicelib/devices/mos2/Makefile.am
@@ -34,5 +34,5 @@ libmos2_a_SOURCES = 	\
 	mos2trun.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos3/Makefile.am b/src/spicelib/devices/mos3/Makefile.am
index c73d67bcb..9e1ff43ae 100644
--- a/src/spicelib/devices/mos3/Makefile.am
+++ b/src/spicelib/devices/mos3/Makefile.am
@@ -34,5 +34,5 @@ libmos3_a_SOURCES = 	\
 	mos3trun.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos6/Makefile.am b/src/spicelib/devices/mos6/Makefile.am
index c4367d188..13a4eb9ad 100644
--- a/src/spicelib/devices/mos6/Makefile.am
+++ b/src/spicelib/devices/mos6/Makefile.am
@@ -23,5 +23,5 @@ libmos6_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos9/Makefile.am b/src/spicelib/devices/mos9/Makefile.am
index 1c3817268..bc03c5b91 100644
--- a/src/spicelib/devices/mos9/Makefile.am
+++ b/src/spicelib/devices/mos9/Makefile.am
@@ -35,5 +35,5 @@ libmos9_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/nbjt/Makefile.am b/src/spicelib/devices/nbjt/Makefile.am
index 609303cf8..adb6abb96 100644
--- a/src/spicelib/devices/nbjt/Makefile.am
+++ b/src/spicelib/devices/nbjt/Makefile.am
@@ -25,6 +25,6 @@ libnbjt_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/nbjt2/Makefile.am b/src/spicelib/devices/nbjt2/Makefile.am
index f8a5612d1..5e4abe902 100644
--- a/src/spicelib/devices/nbjt2/Makefile.am
+++ b/src/spicelib/devices/nbjt2/Makefile.am
@@ -25,6 +25,6 @@ libnbjt2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ndev/Makefile.am b/src/spicelib/devices/ndev/Makefile.am
index 1067f9972..bbd5c8e6e 100644
--- a/src/spicelib/devices/ndev/Makefile.am
+++ b/src/spicelib/devices/ndev/Makefile.am
@@ -25,6 +25,6 @@ libndev_a_SOURCES = 	\
 	ndevtrun.c	
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numd/Makefile.am b/src/spicelib/devices/numd/Makefile.am
index 33fe6326d..328cbb070 100644
--- a/src/spicelib/devices/numd/Makefile.am
+++ b/src/spicelib/devices/numd/Makefile.am
@@ -24,6 +24,6 @@ libnumd_a_SOURCES = 	\
 	numdtrun.c	
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numd2/Makefile.am b/src/spicelib/devices/numd2/Makefile.am
index fc4be5528..1f26029ad 100644
--- a/src/spicelib/devices/numd2/Makefile.am
+++ b/src/spicelib/devices/numd2/Makefile.am
@@ -25,6 +25,6 @@ libnumd2_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numos/Makefile.am b/src/spicelib/devices/numos/Makefile.am
index e4f0f4213..68d67b28a 100644
--- a/src/spicelib/devices/numos/Makefile.am
+++ b/src/spicelib/devices/numos/Makefile.am
@@ -25,6 +25,6 @@ libnumos_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/res/Makefile.am b/src/spicelib/devices/res/Makefile.am
index b37d40cc2..c7a50be85 100644
--- a/src/spicelib/devices/res/Makefile.am
+++ b/src/spicelib/devices/res/Makefile.am
@@ -28,5 +28,5 @@ libres_a_SOURCES = 		\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/soi3/Makefile.am b/src/spicelib/devices/soi3/Makefile.am
index d90f63961..283ba3108 100644
--- a/src/spicelib/devices/soi3/Makefile.am
+++ b/src/spicelib/devices/soi3/Makefile.am
@@ -28,5 +28,5 @@ libsoi3_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/sw/Makefile.am b/src/spicelib/devices/sw/Makefile.am
index 5960e5abf..2d41724a3 100644
--- a/src/spicelib/devices/sw/Makefile.am
+++ b/src/spicelib/devices/sw/Makefile.am
@@ -25,5 +25,5 @@ libsw_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/tra/Makefile.am b/src/spicelib/devices/tra/Makefile.am
index 8ea816a30..a6eac4324 100644
--- a/src/spicelib/devices/tra/Makefile.am
+++ b/src/spicelib/devices/tra/Makefile.am
@@ -22,5 +22,5 @@ libtra_a_SOURCES = 	\
 	tratrunc.c
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/txl/Makefile.am b/src/spicelib/devices/txl/Makefile.am
index a786fb353..0b26e2842 100755
--- a/src/spicelib/devices/txl/Makefile.am
+++ b/src/spicelib/devices/txl/Makefile.am
@@ -21,6 +21,6 @@ libtxl_a_SOURCES = 	\
 	txlsetup.c \
 	txlinit.c
     
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/urc/Makefile.am b/src/spicelib/devices/urc/Makefile.am
index 4a60136b3..8e4ffb698 100644
--- a/src/spicelib/devices/urc/Makefile.am
+++ b/src/spicelib/devices/urc/Makefile.am
@@ -20,5 +20,5 @@ liburc_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vbic/Makefile.am b/src/spicelib/devices/vbic/Makefile.am
index 329dac8b1..61bbeb433 100644
--- a/src/spicelib/devices/vbic/Makefile.am
+++ b/src/spicelib/devices/vbic/Makefile.am
@@ -28,6 +28,6 @@ libvbic_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vccs/Makefile.am b/src/spicelib/devices/vccs/Makefile.am
index 59ef5e385..dd34d35c0 100644
--- a/src/spicelib/devices/vccs/Makefile.am
+++ b/src/spicelib/devices/vccs/Makefile.am
@@ -24,5 +24,5 @@ libvccs_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vcvs/Makefile.am b/src/spicelib/devices/vcvs/Makefile.am
index 8da46ea46..00855043f 100644
--- a/src/spicelib/devices/vcvs/Makefile.am
+++ b/src/spicelib/devices/vcvs/Makefile.am
@@ -25,5 +25,5 @@ libvcvs_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vsrc/Makefile.am b/src/spicelib/devices/vsrc/Makefile.am
index 92ece971a..a91a59737 100644
--- a/src/spicelib/devices/vsrc/Makefile.am
+++ b/src/spicelib/devices/vsrc/Makefile.am
@@ -25,6 +25,6 @@ libvsrc_a_SOURCES = 	\
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index 5c7662e8c..e890ff940 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -66,6 +66,6 @@ libinp_a_SOURCES = \
 		inp.h
 
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/cm/Makefile.am b/src/xspice/cm/Makefile.am
index 1ed131250..56cd8cae0 100755
--- a/src/xspice/cm/Makefile.am
+++ b/src/xspice/cm/Makefile.am
@@ -13,6 +13,6 @@ cmexport.c
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/enh/Makefile.am b/src/xspice/enh/Makefile.am
index 827d4675d..09614da7d 100755
--- a/src/xspice/enh/Makefile.am
+++ b/src/xspice/enh/Makefile.am
@@ -8,6 +8,6 @@ libenhxsp_a_SOURCES = \
 enh.c  \
 enhtrans.c
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/evt/Makefile.am b/src/xspice/evt/Makefile.am
index d03788259..c8de88592 100755
--- a/src/xspice/evt/Makefile.am
+++ b/src/xspice/evt/Makefile.am
@@ -22,6 +22,6 @@ evtplot.c  \
 evtqueue.c  \
 evttermi.c
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/icm/Makefile.am b/src/xspice/icm/Makefile.am
index a60da9bf5..a5c57fe09 100755
--- a/src/xspice/icm/Makefile.am
+++ b/src/xspice/icm/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = icm_spice2poly
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/xspice/idn/Makefile.am b/src/xspice/idn/Makefile.am
index 1d1ebc2f9..e2ff8e812 100755
--- a/src/xspice/idn/Makefile.am
+++ b/src/xspice/idn/Makefile.am
@@ -7,6 +7,6 @@ noinst_LIBRARIES = libidnxsp.a
 libidnxsp_a_SOURCES = \
 	idndig.c
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/ipc/Makefile.am b/src/xspice/ipc/Makefile.am
index dc19a55e9..1f0a3a296 100755
--- a/src/xspice/ipc/Makefile.am
+++ b/src/xspice/ipc/Makefile.am
@@ -11,6 +11,6 @@ ipcsockets.c \
 ipcstdio.c   \
 ipctiein.c
 
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/mif/Makefile.am b/src/xspice/mif/Makefile.am
index 757d3dcd8..a2f2f51c7 100755
--- a/src/xspice/mif/Makefile.am
+++ b/src/xspice/mif/Makefile.am
@@ -21,6 +21,6 @@ libmifxsp_a_SOURCES = \
 	mifdestr.c \
 	mif.c
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in