diff --git a/ChangeLog b/ChangeLog
index 61137e381..15e6ea240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-27  Robert Larice
+ * **/Makefile.am ,
+  #4/6 config.h --> ngspice/config.h,  AM_CPPFLAGS
+
 2011-12-27  Robert Larice
  * **/Makefile.am ,
  * src/spicelib/devices/adms/admst/ngspice.xml ,
diff --git a/src/Makefile.am b/src/Makefile.am
index 03ba17658..5c401495f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -283,7 +283,7 @@ endif !WINDOWS
 
 ## General Includes and libraries:
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@
+AM_CPPFLAGS = @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/frontend/Makefile.am b/src/frontend/Makefile.am
index c331e9ec1..a72cc0214 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -193,7 +193,7 @@ libfte_la_SOURCES =	\
 # testcommands_LDADD = libfte.a plotting/libplotting.a ../misc/libmisc.a
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
+AM_CPPFLAGS = @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 1263c418f..9efff5940 100644
--- a/src/frontend/help/Makefile.am
+++ b/src/frontend/help/Makefile.am
@@ -14,7 +14,7 @@ libhlp_la_SOURCES = \
 
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include @X_CFLAGS@
 
 endif
 
diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am
index 69af54e43..e17468958 100644
--- a/src/frontend/plotting/Makefile.am
+++ b/src/frontend/plotting/Makefile.am
@@ -31,6 +31,6 @@ libplotting_la_SOURCES += \
 	xgraph.h
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/trannoise/Makefile.am b/src/frontend/trannoise/Makefile.am
index 616a20465..afc764904 100644
--- a/src/frontend/trannoise/Makefile.am
+++ b/src/frontend/trannoise/Makefile.am
@@ -7,6 +7,6 @@ libtrannoise_la_SOURCES = \
 	1-f-code.c	\
 	wallace.c
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/wdisp/Makefile.am b/src/frontend/wdisp/Makefile.am
index e988484a4..8894cecac 100644
--- a/src/frontend/wdisp/Makefile.am
+++ b/src/frontend/wdisp/Makefile.am
@@ -10,6 +10,6 @@ libwindisp_la_SOURCES = \
 	ftegraf.h
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp
+AM_CPPFLAGS = @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 fbf2877f1..971877131 100644
--- a/src/maths/cmaths/Makefile.am
+++ b/src/maths/cmaths/Makefile.am
@@ -57,6 +57,6 @@ endif !TCLWIN
 endif !WINDOWS
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am
index 43ad2e7ef..63bb6b6ab 100644
--- a/src/spicelib/analysis/Makefile.am
+++ b/src/spicelib/analysis/Makefile.am
@@ -103,5 +103,5 @@ libckt_la_SOURCES = \
 		cluster.c
 
 
-AM_CPPFLAGS =  -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = @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 e36909416..cb165f95a 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -134,6 +134,6 @@ libdev_la_SOURCES =	\
 
 EXTRA_DIST = @NOTVLADEVDIR@
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index d8d20905d..585e71ea8 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -73,6 +73,6 @@ $(srcdir)/inpptree.c : inpptree-parser.c
 inpptree-parser.c inpptree-parser.h : inpptree-parser.y
 	bison $(srcdir)/inpptree-parser.y
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CPPFLAGS = @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 1fcfa49b9..f26c73dda 100755
--- a/src/xspice/cm/Makefile.am
+++ b/src/xspice/cm/Makefile.am
@@ -13,6 +13,6 @@ libcmxsp_la_SOURCES = \
 
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/ipc/Makefile.am b/src/xspice/ipc/Makefile.am
index 7ffbb255e..c31653ec0 100755
--- a/src/xspice/ipc/Makefile.am
+++ b/src/xspice/ipc/Makefile.am
@@ -11,6 +11,6 @@ libipcxsp_la_SOURCES = \
 	ipcstdio.c   \
 	ipctiein.c
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in