diff --git a/ChangeLog b/ChangeLog
index 3e344bd40..d7c1a6ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2011-08-20  Robert Larice
+ * src/spicelib/devices/adms/admst/*.xml :
+   #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+     adms-2
+
 2011-08-20  Robert Larice
  * src/xspice/cmpp/pp_mod.c ,
  * src/xspice/cmpp/writ_ifs.c :
    #5/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+     xspice
 
 2011-08-20  Robert Larice
  * visualc/vngspice.vcproj :
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
index ca5e70c7f..057655636 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-07-23 07:57:07  dwarning
+  Revision 1.7  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.6  2011/07/23 07:57:07  dwarning
   lower case substitution in xml module
 
   Revision 1.5  2011/01/13 17:05:46  dwarning
@@ -54,10 +57,10 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;devdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/devdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/suffix.h&gt;
 
 <admst:text format="IFparm $(module)pTable[] = {\n"/>
 <admst:join select="variable[parametertype='instance' and input='yes']" separator=",\n">
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
index f086316bc..506d9c848 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2006/03/05 09:38:41  pnenzi
@@ -67,11 +70,11 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index 4f963542a..751691c9c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.7  2011-08-12 15:18:41  rlar
+  Revision 1.8  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.7  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.6  2011/01/13 17:05:46  dwarning
@@ -58,13 +61,13 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;const.h&quot;
-#include &quot;cktdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
index 191a79f10..f9acbfa6d 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.17  2011-01-13 17:05:46  dwarning
+  Revision 1.18  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.17  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.16  2011/01/12 20:06:59  dwarning
@@ -96,11 +99,11 @@
 #ifndef $(module)
 #define $(module)
 
-#include &quot;cktdefs.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;gendefs.h&quot;
-#include &quot;complex.h&quot;
-#include &quot;noisedef.h&quot;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/gendefs.h&gt;
+#include &lt;ngspice/complex.h&gt;
+#include &lt;ngspice/noisedef.h&gt;
 
 <admst:for-each select="variable">
 <admst:value-of select="name"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
index d31b0704a..c50c79b46 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.3  2011-01-13 17:05:46  dwarning
+  Revision 1.4  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.3  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.2  2006/03/05 09:38:41  pnenzi
@@ -57,10 +60,10 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
index 6c8fc9138..d9fd6cb01 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.3  2011-01-13 17:05:46  dwarning
+  Revision 1.4  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.3  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.2  2006/03/05 09:38:41  pnenzi
@@ -57,9 +60,9 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/suffix.h&gt;
 
 void $(module)destroy(GENmodel **inModel)
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index cffb94835..a7f27aa85 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.15  2011-08-12 15:18:41  rlar
+  Revision 1.16  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.15  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.14  2011/01/13 17:05:46  dwarning
@@ -255,14 +258,14 @@
 
 <admst:template match="code">
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;smpdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/smpdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;const.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 #define jacobian(a,b) here-&gt;PTR_J_##a##_##b##_required=1;
 #define static_jacobian4(p,q,r,s)  jacobian(p,r) jacobian(p,s) jacobian(q,r) jacobian(q,s)
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
index b5e0253e6..08a6149a5 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.8  2011-08-20 17:27:13  rlar
+  Revision 1.9  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.8  2011/08/20 17:27:13  rlar
   #1/7 use a subdirectory "ngspice" for includes to create a uniq namespace
 
   Revision 1.7  2011/01/13 17:05:46  dwarning
@@ -59,7 +62,7 @@
 <admst:template match="code">
 #include "config.h"
 
-#include <ngspice/devdefs.h>
+#include &lt;ngspice/devdefs.h&gt;
 
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
index 96302434c..cc1c10c37 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.10  2011-08-12 15:18:41  rlar
+  Revision 1.11  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.10  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.9  2011/01/13 17:05:46  dwarning
@@ -83,14 +86,14 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;const.h&quot;
-#include &quot;trandefs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;devdefs.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/trandefs.h&gt;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/devdefs.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 /*fixme: noise not implemented in ngspice*/
 #define ngspice_flickernoise(p,n,mag,freq,info)\\
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
index c2120f8b1..ccc23b300 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.7  2011-08-12 15:18:41  rlar
+  Revision 1.8  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.7  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.6  2011/01/13 17:05:46  dwarning
@@ -57,14 +60,14 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;const.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;devdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/devdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
index 1be388e14..ed41bb8a3 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.3  2011-01-13 17:05:46  dwarning
+  Revision 1.4  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.3  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.2  2006/03/05 09:38:41  pnenzi
@@ -57,10 +60,10 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
index bc3e35c99..38538bdc5 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2007/04/24 08:59:09  r29173
@@ -55,12 +58,12 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;const.h&quot;
-#include &quot;ifsim.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
index bd24de574..d60fae4de 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2011-01-13 17:05:46  dwarning
+  Revision 1.3  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.2  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.1  2007/07/05 09:45:33  r29173
@@ -45,12 +48,12 @@
 <admst:template match="code">
 <admst:variable name="module" select="%(attribute[name='ngspicename']/value)"/>
 
-#include &quot;ngspice.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;iferrmsg.h&quot;
-#include &quot;noisedef.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/iferrmsg.h&gt;
+#include &lt;ngspice/noisedef.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 extern void   NevalSrc();
 extern double Nintegrate();
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
index 9f7a4a099..752074e46 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.7  2011-08-12 15:18:41  rlar
+  Revision 1.8  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.7  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.6  2011/01/13 17:05:46  dwarning
@@ -57,12 +60,12 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;const.h&quot;
-#include &quot;ifsim.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
index 208a82ebb..dd5602a93 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2011-08-12 15:18:41  rlar
+  Revision 1.5  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.4  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.3  2011/01/13 17:05:46  dwarning
@@ -61,12 +64,12 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;complex.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/complex.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
index c5787c95e..25531c3b2 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2006/03/06 12:50:15  r29173
@@ -67,14 +70,14 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;smpdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/smpdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;const.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)setup (SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
      /* load the $(module) device structure with those pointers needed later 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
index 6cb59541c..0fca0ecb9 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.7  2011-08-12 15:18:41  rlar
+  Revision 1.8  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.7  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.6  2011/01/13 17:05:46  dwarning
@@ -71,14 +74,14 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
-#include &quot;smpdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
+#include &lt;ngspice/smpdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;const.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;ifsim.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/const.h&gt;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/ifsim.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 #define _STATIC
 #define _DYNAMIC
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
index 1018b3146..7dc727ef6 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
@@ -4,7 +4,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2011-01-13 17:05:46  dwarning
+  Revision 1.3  2011-08-20 17:49:37  rlar
+  #6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
+  Revision 1.2  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.1  2006/03/10 09:55:53  pnenzi
@@ -55,11 +58,11 @@
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-#include &quot;ngspice.h&quot;
-#include &quot;cktdefs.h&quot;
+#include &lt;ngspice/ngspice.h&gt;
+#include &lt;ngspice/cktdefs.h&gt;
 #include &quot;$(module)defs.h&quot;
-#include &quot;sperror.h&quot;
-#include &quot;suffix.h&quot;
+#include &lt;ngspice/sperror.h&gt;
+#include &lt;ngspice/suffix.h&gt;
 
 int $(module)trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {