diff --git a/ChangeLog b/ChangeLog
index b960719ff..f17a9045d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Robert Larice
+ * src/include/* :
+   #2/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+     move the include files down into the new directory
+
 2011-08-20  Robert Larice
  * **/* :
    #1/7 use a subdirectory "ngspice" for includes to create a uniq namespace
diff --git a/src/include/.cvsignore b/src/include/ngspice/.cvsignore
similarity index 100%
rename from src/include/.cvsignore
rename to src/include/ngspice/.cvsignore
diff --git a/src/include/1-f-code.h b/src/include/ngspice/1-f-code.h
similarity index 100%
rename from src/include/1-f-code.h
rename to src/include/ngspice/1-f-code.h
diff --git a/src/include/ChangeLog b/src/include/ngspice/ChangeLog
similarity index 100%
rename from src/include/ChangeLog
rename to src/include/ngspice/ChangeLog
diff --git a/src/include/FastNorm3.h b/src/include/ngspice/FastNorm3.h
similarity index 100%
rename from src/include/FastNorm3.h
rename to src/include/ngspice/FastNorm3.h
diff --git a/src/include/Makefile.am b/src/include/ngspice/Makefile.am
similarity index 100%
rename from src/include/Makefile.am
rename to src/include/ngspice/Makefile.am
diff --git a/src/include/acdefs.h b/src/include/ngspice/acdefs.h
similarity index 100%
rename from src/include/acdefs.h
rename to src/include/ngspice/acdefs.h
diff --git a/src/include/bdrydefs.h b/src/include/ngspice/bdrydefs.h
similarity index 100%
rename from src/include/bdrydefs.h
rename to src/include/ngspice/bdrydefs.h
diff --git a/src/include/bool.h b/src/include/ngspice/bool.h
similarity index 100%
rename from src/include/bool.h
rename to src/include/ngspice/bool.h
diff --git a/src/include/carddefs.h b/src/include/ngspice/carddefs.h
similarity index 100%
rename from src/include/carddefs.h
rename to src/include/ngspice/carddefs.h
diff --git a/src/include/ciderinp.h b/src/include/ngspice/ciderinp.h
similarity index 100%
rename from src/include/ciderinp.h
rename to src/include/ngspice/ciderinp.h
diff --git a/src/include/cidersupt.h b/src/include/ngspice/cidersupt.h
similarity index 100%
rename from src/include/cidersupt.h
rename to src/include/ngspice/cidersupt.h
diff --git a/src/include/cktdefs.h b/src/include/ngspice/cktdefs.h
similarity index 100%
rename from src/include/cktdefs.h
rename to src/include/ngspice/cktdefs.h
diff --git a/src/include/cluster.h b/src/include/ngspice/cluster.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/cluster.h
rename to src/include/ngspice/cluster.h
diff --git a/src/include/cm.h b/src/include/ngspice/cm.h
similarity index 100%
rename from src/include/cm.h
rename to src/include/ngspice/cm.h
diff --git a/src/include/cmconstants.h b/src/include/ngspice/cmconstants.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/cmconstants.h
rename to src/include/ngspice/cmconstants.h
diff --git a/src/include/cmproto.h b/src/include/ngspice/cmproto.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/cmproto.h
rename to src/include/ngspice/cmproto.h
diff --git a/src/include/cmtypes.h b/src/include/ngspice/cmtypes.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/cmtypes.h
rename to src/include/ngspice/cmtypes.h
diff --git a/src/include/compatmode.h b/src/include/ngspice/compatmode.h
similarity index 100%
rename from src/include/compatmode.h
rename to src/include/ngspice/compatmode.h
diff --git a/src/include/complex.h b/src/include/ngspice/complex.h
similarity index 100%
rename from src/include/complex.h
rename to src/include/ngspice/complex.h
diff --git a/src/include/const.h b/src/include/ngspice/const.h
similarity index 100%
rename from src/include/const.h
rename to src/include/ngspice/const.h
diff --git a/src/include/contdefs.h b/src/include/ngspice/contdefs.h
similarity index 100%
rename from src/include/contdefs.h
rename to src/include/ngspice/contdefs.h
diff --git a/src/include/cpdefs.h b/src/include/ngspice/cpdefs.h
similarity index 100%
rename from src/include/cpdefs.h
rename to src/include/ngspice/cpdefs.h
diff --git a/src/include/cpextern.h b/src/include/ngspice/cpextern.h
similarity index 100%
rename from src/include/cpextern.h
rename to src/include/ngspice/cpextern.h
diff --git a/src/include/cpstd.h b/src/include/ngspice/cpstd.h
similarity index 100%
rename from src/include/cpstd.h
rename to src/include/ngspice/cpstd.h
diff --git a/src/include/defines.h b/src/include/ngspice/defines.h
similarity index 100%
rename from src/include/defines.h
rename to src/include/ngspice/defines.h
diff --git a/src/include/devdefs.h b/src/include/ngspice/devdefs.h
similarity index 100%
rename from src/include/devdefs.h
rename to src/include/ngspice/devdefs.h
diff --git a/src/include/dgen.h b/src/include/ngspice/dgen.h
similarity index 100%
rename from src/include/dgen.h
rename to src/include/ngspice/dgen.h
diff --git a/src/include/distodef.h b/src/include/ngspice/distodef.h
similarity index 100%
rename from src/include/distodef.h
rename to src/include/ngspice/distodef.h
diff --git a/src/include/dllitf.h b/src/include/ngspice/dllitf.h
similarity index 100%
rename from src/include/dllitf.h
rename to src/include/ngspice/dllitf.h
diff --git a/src/include/domndefs.h b/src/include/ngspice/domndefs.h
similarity index 100%
rename from src/include/domndefs.h
rename to src/include/ngspice/domndefs.h
diff --git a/src/include/dopdefs.h b/src/include/ngspice/dopdefs.h
similarity index 100%
rename from src/include/dopdefs.h
rename to src/include/ngspice/dopdefs.h
diff --git a/src/include/dstring.h b/src/include/ngspice/dstring.h
similarity index 100%
rename from src/include/dstring.h
rename to src/include/ngspice/dstring.h
diff --git a/src/include/dvec.h b/src/include/ngspice/dvec.h
similarity index 100%
rename from src/include/dvec.h
rename to src/include/ngspice/dvec.h
diff --git a/src/include/elctdefs.h b/src/include/ngspice/elctdefs.h
similarity index 100%
rename from src/include/elctdefs.h
rename to src/include/ngspice/elctdefs.h
diff --git a/src/include/enh.h b/src/include/ngspice/enh.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/enh.h
rename to src/include/ngspice/enh.h
diff --git a/src/include/evt.h b/src/include/ngspice/evt.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/evt.h
rename to src/include/ngspice/evt.h
diff --git a/src/include/evtproto.h b/src/include/ngspice/evtproto.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/evtproto.h
rename to src/include/ngspice/evtproto.h
diff --git a/src/include/evtudn.h b/src/include/ngspice/evtudn.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/evtudn.h
rename to src/include/ngspice/evtudn.h
diff --git a/src/include/fftext.h b/src/include/ngspice/fftext.h
similarity index 100%
rename from src/include/fftext.h
rename to src/include/ngspice/fftext.h
diff --git a/src/include/ftedbgra.h b/src/include/ngspice/ftedbgra.h
similarity index 100%
rename from src/include/ftedbgra.h
rename to src/include/ngspice/ftedbgra.h
diff --git a/src/include/ftedebug.h b/src/include/ngspice/ftedebug.h
similarity index 100%
rename from src/include/ftedebug.h
rename to src/include/ngspice/ftedebug.h
diff --git a/src/include/ftedefs.h b/src/include/ngspice/ftedefs.h
similarity index 100%
rename from src/include/ftedefs.h
rename to src/include/ngspice/ftedefs.h
diff --git a/src/include/ftedev.h b/src/include/ngspice/ftedev.h
similarity index 100%
rename from src/include/ftedev.h
rename to src/include/ngspice/ftedev.h
diff --git a/src/include/fteext.h b/src/include/ngspice/fteext.h
similarity index 100%
rename from src/include/fteext.h
rename to src/include/ngspice/fteext.h
diff --git a/src/include/fteinp.h b/src/include/ngspice/fteinp.h
similarity index 100%
rename from src/include/fteinp.h
rename to src/include/ngspice/fteinp.h
diff --git a/src/include/fteinput.h b/src/include/ngspice/fteinput.h
similarity index 100%
rename from src/include/fteinput.h
rename to src/include/ngspice/fteinput.h
diff --git a/src/include/fteoptdefs.h b/src/include/ngspice/fteoptdefs.h
similarity index 100%
rename from src/include/fteoptdefs.h
rename to src/include/ngspice/fteoptdefs.h
diff --git a/src/include/fteparse.h b/src/include/ngspice/fteparse.h
similarity index 100%
rename from src/include/fteparse.h
rename to src/include/ngspice/fteparse.h
diff --git a/src/include/gendefs.h b/src/include/ngspice/gendefs.h
similarity index 100%
rename from src/include/gendefs.h
rename to src/include/ngspice/gendefs.h
diff --git a/src/include/gendev.h b/src/include/ngspice/gendev.h
similarity index 100%
rename from src/include/gendev.h
rename to src/include/ngspice/gendev.h
diff --git a/src/include/graph.h b/src/include/ngspice/graph.h
similarity index 100%
rename from src/include/graph.h
rename to src/include/ngspice/graph.h
diff --git a/src/include/grid.h b/src/include/ngspice/grid.h
similarity index 100%
rename from src/include/grid.h
rename to src/include/ngspice/grid.h
diff --git a/src/include/hash.h b/src/include/ngspice/hash.h
similarity index 100%
rename from src/include/hash.h
rename to src/include/ngspice/hash.h
diff --git a/src/include/hlpdefs.h b/src/include/ngspice/hlpdefs.h
similarity index 100%
rename from src/include/hlpdefs.h
rename to src/include/ngspice/hlpdefs.h
diff --git a/src/include/iferrmsg.h b/src/include/ngspice/iferrmsg.h
similarity index 100%
rename from src/include/iferrmsg.h
rename to src/include/ngspice/iferrmsg.h
diff --git a/src/include/ifsim.h b/src/include/ngspice/ifsim.h
similarity index 100%
rename from src/include/ifsim.h
rename to src/include/ngspice/ifsim.h
diff --git a/src/include/inpdefs.h b/src/include/ngspice/inpdefs.h
similarity index 100%
rename from src/include/inpdefs.h
rename to src/include/ngspice/inpdefs.h
diff --git a/src/include/inpmacs.h b/src/include/ngspice/inpmacs.h
similarity index 100%
rename from src/include/inpmacs.h
rename to src/include/ngspice/inpmacs.h
diff --git a/src/include/inpptree.h b/src/include/ngspice/inpptree.h
similarity index 100%
rename from src/include/inpptree.h
rename to src/include/ngspice/inpptree.h
diff --git a/src/include/ipc.h b/src/include/ngspice/ipc.h
similarity index 100%
rename from src/include/ipc.h
rename to src/include/ngspice/ipc.h
diff --git a/src/include/ipcproto.h b/src/include/ngspice/ipcproto.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/ipcproto.h
rename to src/include/ngspice/ipcproto.h
diff --git a/src/include/ipctiein.h b/src/include/ngspice/ipctiein.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/ipctiein.h
rename to src/include/ngspice/ipctiein.h
diff --git a/src/include/jobdefs.h b/src/include/ngspice/jobdefs.h
similarity index 100%
rename from src/include/jobdefs.h
rename to src/include/ngspice/jobdefs.h
diff --git a/src/include/lsort.h b/src/include/ngspice/lsort.h
similarity index 100%
rename from src/include/lsort.h
rename to src/include/ngspice/lsort.h
diff --git a/src/include/macros.h b/src/include/ngspice/macros.h
similarity index 100%
rename from src/include/macros.h
rename to src/include/ngspice/macros.h
diff --git a/src/include/material.h b/src/include/ngspice/material.h
similarity index 100%
rename from src/include/material.h
rename to src/include/ngspice/material.h
diff --git a/src/include/matldefs.h b/src/include/ngspice/matldefs.h
similarity index 100%
rename from src/include/matldefs.h
rename to src/include/ngspice/matldefs.h
diff --git a/src/include/memory.h b/src/include/ngspice/memory.h
similarity index 100%
rename from src/include/memory.h
rename to src/include/ngspice/memory.h
diff --git a/src/include/meshdefs.h b/src/include/ngspice/meshdefs.h
similarity index 100%
rename from src/include/meshdefs.h
rename to src/include/ngspice/meshdefs.h
diff --git a/src/include/meshext.h b/src/include/ngspice/meshext.h
similarity index 100%
rename from src/include/meshext.h
rename to src/include/ngspice/meshext.h
diff --git a/src/include/methdefs.h b/src/include/ngspice/methdefs.h
similarity index 100%
rename from src/include/methdefs.h
rename to src/include/ngspice/methdefs.h
diff --git a/src/include/mif.h b/src/include/ngspice/mif.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/mif.h
rename to src/include/ngspice/mif.h
diff --git a/src/include/mifcmdat.h b/src/include/ngspice/mifcmdat.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/mifcmdat.h
rename to src/include/ngspice/mifcmdat.h
diff --git a/src/include/mifdefs.h b/src/include/ngspice/mifdefs.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/mifdefs.h
rename to src/include/ngspice/mifdefs.h
diff --git a/src/include/mifparse.h b/src/include/ngspice/mifparse.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/mifparse.h
rename to src/include/ngspice/mifparse.h
diff --git a/src/include/mifproto.h b/src/include/ngspice/mifproto.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/mifproto.h
rename to src/include/ngspice/mifproto.h
diff --git a/src/include/miftypes.h b/src/include/ngspice/miftypes.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/miftypes.h
rename to src/include/ngspice/miftypes.h
diff --git a/src/include/missing_math.h b/src/include/ngspice/missing_math.h
similarity index 100%
rename from src/include/missing_math.h
rename to src/include/ngspice/missing_math.h
diff --git a/src/include/mobdefs.h b/src/include/ngspice/mobdefs.h
similarity index 100%
rename from src/include/mobdefs.h
rename to src/include/ngspice/mobdefs.h
diff --git a/src/include/modldefs.h b/src/include/ngspice/modldefs.h
similarity index 100%
rename from src/include/modldefs.h
rename to src/include/ngspice/modldefs.h
diff --git a/src/include/multi_line.h b/src/include/ngspice/multi_line.h
similarity index 100%
rename from src/include/multi_line.h
rename to src/include/ngspice/multi_line.h
diff --git a/src/include/ngspice.h b/src/include/ngspice/ngspice.h
similarity index 100%
rename from src/include/ngspice.h
rename to src/include/ngspice/ngspice.h
diff --git a/src/include/noisedef.h b/src/include/ngspice/noisedef.h
similarity index 100%
rename from src/include/noisedef.h
rename to src/include/ngspice/noisedef.h
diff --git a/src/include/numcards.h b/src/include/ngspice/numcards.h
similarity index 100%
rename from src/include/numcards.h
rename to src/include/ngspice/numcards.h
diff --git a/src/include/numconst.h b/src/include/ngspice/numconst.h
similarity index 100%
rename from src/include/numconst.h
rename to src/include/ngspice/numconst.h
diff --git a/src/include/numenum.h b/src/include/ngspice/numenum.h
similarity index 100%
rename from src/include/numenum.h
rename to src/include/ngspice/numenum.h
diff --git a/src/include/numgen.h b/src/include/ngspice/numgen.h
similarity index 100%
rename from src/include/numgen.h
rename to src/include/ngspice/numgen.h
diff --git a/src/include/numglobs.h b/src/include/ngspice/numglobs.h
similarity index 100%
rename from src/include/numglobs.h
rename to src/include/ngspice/numglobs.h
diff --git a/src/include/onedev.h b/src/include/ngspice/onedev.h
similarity index 100%
rename from src/include/onedev.h
rename to src/include/ngspice/onedev.h
diff --git a/src/include/onemesh.h b/src/include/ngspice/onemesh.h
similarity index 100%
rename from src/include/onemesh.h
rename to src/include/ngspice/onemesh.h
diff --git a/src/include/opdefs.h b/src/include/ngspice/opdefs.h
similarity index 100%
rename from src/include/opdefs.h
rename to src/include/ngspice/opdefs.h
diff --git a/src/include/optdefs.h b/src/include/ngspice/optdefs.h
similarity index 100%
rename from src/include/optdefs.h
rename to src/include/ngspice/optdefs.h
diff --git a/src/include/optndefs.h b/src/include/ngspice/optndefs.h
similarity index 100%
rename from src/include/optndefs.h
rename to src/include/ngspice/optndefs.h
diff --git a/src/include/outpdefs.h b/src/include/ngspice/outpdefs.h
similarity index 100%
rename from src/include/outpdefs.h
rename to src/include/ngspice/outpdefs.h
diff --git a/src/include/plot.h b/src/include/ngspice/plot.h
similarity index 100%
rename from src/include/plot.h
rename to src/include/ngspice/plot.h
diff --git a/src/include/pnode.h b/src/include/ngspice/pnode.h
similarity index 100%
rename from src/include/pnode.h
rename to src/include/ngspice/pnode.h
diff --git a/src/include/profile.h b/src/include/ngspice/profile.h
similarity index 100%
rename from src/include/profile.h
rename to src/include/ngspice/profile.h
diff --git a/src/include/pssdefs.h b/src/include/ngspice/pssdefs.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/pssdefs.h
rename to src/include/ngspice/pssdefs.h
diff --git a/src/include/pzdefs.h b/src/include/ngspice/pzdefs.h
similarity index 100%
rename from src/include/pzdefs.h
rename to src/include/ngspice/pzdefs.h
diff --git a/src/include/sen2defs.h b/src/include/ngspice/sen2defs.h
similarity index 100%
rename from src/include/sen2defs.h
rename to src/include/ngspice/sen2defs.h
diff --git a/src/include/sensdefs.h b/src/include/ngspice/sensdefs.h
similarity index 100%
rename from src/include/sensdefs.h
rename to src/include/ngspice/sensdefs.h
diff --git a/src/include/sensgen.h b/src/include/ngspice/sensgen.h
similarity index 100%
rename from src/include/sensgen.h
rename to src/include/ngspice/sensgen.h
diff --git a/src/include/sim.h b/src/include/ngspice/sim.h
similarity index 100%
rename from src/include/sim.h
rename to src/include/ngspice/sim.h
diff --git a/src/include/smpdefs.h b/src/include/ngspice/smpdefs.h
similarity index 100%
rename from src/include/smpdefs.h
rename to src/include/ngspice/smpdefs.h
diff --git a/src/include/sperror.h b/src/include/ngspice/sperror.h
similarity index 100%
rename from src/include/sperror.h
rename to src/include/ngspice/sperror.h
diff --git a/src/include/spmatrix.h b/src/include/ngspice/spmatrix.h
similarity index 100%
rename from src/include/spmatrix.h
rename to src/include/ngspice/spmatrix.h
diff --git a/src/include/suffix.h b/src/include/ngspice/suffix.h
similarity index 100%
rename from src/include/suffix.h
rename to src/include/ngspice/suffix.h
diff --git a/src/include/swec.h b/src/include/ngspice/swec.h
similarity index 100%
rename from src/include/swec.h
rename to src/include/ngspice/swec.h
diff --git a/src/include/tclspice.h b/src/include/ngspice/tclspice.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/include/tclspice.h
rename to src/include/ngspice/tclspice.h
diff --git a/src/include/tfdefs.h b/src/include/ngspice/tfdefs.h
similarity index 100%
rename from src/include/tfdefs.h
rename to src/include/ngspice/tfdefs.h
diff --git a/src/include/trandefs.h b/src/include/ngspice/trandefs.h
similarity index 100%
rename from src/include/trandefs.h
rename to src/include/ngspice/trandefs.h
diff --git a/src/include/trcvdefs.h b/src/include/ngspice/trcvdefs.h
similarity index 100%
rename from src/include/trcvdefs.h
rename to src/include/ngspice/trcvdefs.h
diff --git a/src/include/tskdefs.h b/src/include/ngspice/tskdefs.h
similarity index 100%
rename from src/include/tskdefs.h
rename to src/include/ngspice/tskdefs.h
diff --git a/src/include/twodev.h b/src/include/ngspice/twodev.h
similarity index 100%
rename from src/include/twodev.h
rename to src/include/ngspice/twodev.h
diff --git a/src/include/twomesh.h b/src/include/ngspice/twomesh.h
similarity index 100%
rename from src/include/twomesh.h
rename to src/include/ngspice/twomesh.h
diff --git a/src/include/typedefs.h b/src/include/ngspice/typedefs.h
similarity index 100%
rename from src/include/typedefs.h
rename to src/include/ngspice/typedefs.h
diff --git a/src/include/wallace.h b/src/include/ngspice/wallace.h
similarity index 100%
rename from src/include/wallace.h
rename to src/include/ngspice/wallace.h
diff --git a/src/include/wordlist.h b/src/include/ngspice/wordlist.h
similarity index 100%
rename from src/include/wordlist.h
rename to src/include/ngspice/wordlist.h
diff --git a/src/include/wstdio.h b/src/include/ngspice/wstdio.h
similarity index 100%
rename from src/include/wstdio.h
rename to src/include/ngspice/wstdio.h