#1/7 use a subdirectory "ngspice" for includes to create a uniq namespace

ChangeLog

@@ -1,3 +1,7 @@
+2011-08-20  Robert Larice
+ * **/* :
+   #1/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
 2011-08-20  Robert Larice
  * src/frontend/parse-bison.c ,
  * src/frontend/parse-bison.h ,

src/ciderlib/input/bdryset.c

@@ -4,12 +4,12 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "bdrydefs.h"
-#include "meshext.h"
-#include "gendev.h"
-#include "sperror.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/bdrydefs.h>
+#include <ngspice/meshext.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
 
 extern int BDRYcheck( BDRYcard *, DOMNdomain * );
 extern int BDRYsetup( BDRYcard *, MESHcoord *, MESHcoord *, DOMNdomain * );

src/ciderlib/input/boundary.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "bdrydefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/bdrydefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 #define UM_TO_CM 1.0e-4
 

src/ciderlib/input/cards.c

@@ -4,8 +4,8 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
 
 extern IFcardInfo CONTinfo;
 extern IFcardInfo DOPinfo;

src/ciderlib/input/contact.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "contdefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/contdefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int CONTnewCard(void**,void*);
 extern int CONTparam(int,IFvalue*,void*);

src/ciderlib/input/contset.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "contdefs.h"
-#include "meshext.h"
-#include "gendev.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/contdefs.h>
+#include <ngspice/meshext.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int CONTcheck( CONTcard * );
 extern int CONTsetup( CONTcard *, ELCTelectrode * );

src/ciderlib/input/domain.c

@@ -4,14 +4,14 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group\
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "numenum.h"
-#include "domndefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/numenum.h>
+#include <ngspice/domndefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 #define UM_TO_CM 1.0e-4
 

src/ciderlib/input/domnset.c

@@ -4,15 +4,15 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modifed: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "numenum.h"
-#include "domndefs.h"
-#include "material.h"
-#include "meshext.h"
-#include "gendev.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/domndefs.h>
+#include <ngspice/material.h>
+#include <ngspice/meshext.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 
 extern int DOMNcheck( DOMNcard *, MATLmaterial * );

src/ciderlib/input/doping.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "dopdefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/dopdefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 #define UM_TO_CM 1.0e-4
 

src/ciderlib/input/dopset.c

@@ -5,18 +5,18 @@ Modifed: 2001 Paolo Nenzi
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "numenum.h"
-#include "dopdefs.h"
-#include "meshext.h"
-#include "profile.h"
-#include "gendev.h"
-#include "sperror.h"
-#include "suffix.h"
-#include "cidersupt.h"
-#include "carddefs.h"
-#include "ciderinp.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/dopdefs.h>
+#include <ngspice/meshext.h>
+#include <ngspice/profile.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
+#include <ngspice/cidersupt.h>
+#include <ngspice/carddefs.h>
+#include <ngspice/ciderinp.h>
 
 extern int DOPnewCard(void**,void*);
 extern int DOPparam(int,IFvalue*,void*);

src/ciderlib/input/elctset.c

@@ -4,14 +4,14 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "elctdefs.h"
-#include "meshext.h"
-#include "twomesh.h"
-#include "gendev.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/elctdefs.h>
+#include <ngspice/meshext.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 
 extern int ELCTcheck( ELCTcard * );

src/ciderlib/input/electrod.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "elctdefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/elctdefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 #define UM_TO_CM 1.0e-4
 

src/ciderlib/input/material.c

@@ -4,14 +4,14 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "numenum.h"
-#include "matldefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/numenum.h>
+#include <ngspice/matldefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 
 extern int MATLnewCard(void**,void *);

src/ciderlib/input/matlset.c

@@ -5,15 +5,15 @@ Modified: 2001 Paolo Nenzi
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "matldefs.h"
-#include "material.h"
-#include "sperror.h"
-#include "suffix.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/matldefs.h>
+#include <ngspice/material.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
+#include <ngspice/cidersupt.h>
 
 extern int MATLcheck( MATLcard * );
 extern int MATLsetup( MATLcard *, MaterialInfo ** );

src/ciderlib/input/mesh.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "meshdefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/meshdefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int XMSHnewCard(void**,void*);
 extern int YMSHnewCard(void**,void*);

src/ciderlib/input/meshset.c

@@ -9,13 +9,13 @@ Mesh Setup & Query Routines.
 **********/
 
 /* Imports */
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "meshdefs.h"
-#include "meshext.h"
-#include "gendev.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/meshdefs.h>
+#include <ngspice/meshext.h>
+#include <ngspice/gendev.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 /* Local Constants */
 #define CMP_TOL	1.0e-9		/* Tolerance on (double) comparisons */

src/ciderlib/input/method.c

@@ -4,14 +4,14 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "numenum.h"
-#include "methdefs.h"
-#include "sperror.h"
-#include "devdefs.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/numenum.h>
+#include <ngspice/methdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/suffix.h>
 
 
 extern int METHnewCard(void**,void*);

src/ciderlib/input/mobility.c

@@ -4,14 +4,14 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "numenum.h"
-#include "mobdefs.h"
-#include "sperror.h"
-#include "devdefs.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/numenum.h>
+#include <ngspice/mobdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/suffix.h>
 
 extern int MOBnewCard(void**,void*);
 extern int MOBparam(int,IFvalue*,void*);

src/ciderlib/input/mobset.c

@@ -4,15 +4,15 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "mobdefs.h"
-#include "material.h"
-#include "sperror.h"
-#include "suffix.h"
-#include <cidersupt.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/mobdefs.h>
+#include <ngspice/material.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
+#include <ngspice/cidersupt.h>
 
 extern int MOBcheck( MOBcard *, MaterialInfo * );
 extern int MOBsetup( MOBcard *, MaterialInfo * );

src/ciderlib/input/models.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "modldefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/modldefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int MODLnewCard(void**,void*);
 extern int MODLparam(int,IFvalue*,void*);

src/ciderlib/input/modlset.c

@@ -5,11 +5,11 @@ Modified: 2001 Paolo Nenzi
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "modldefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/modldefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int MODLcheck( MODLcard * );
 extern int MODLsetup( MODLcard * );

src/ciderlib/input/optionsc.c

@@ -4,13 +4,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "optndefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/optndefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 #define M_TO_CM 1.0e2
 #define M2_TO_CM2 (M_TO_CM * M_TO_CM)

src/ciderlib/input/outpset.c

@@ -5,12 +5,12 @@ Modified: 2001 Paolo Nenzi
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "cktdefs.h"
-#include "numenum.h"
-#include "outpdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cktdefs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/outpdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 
 extern int OUTPcheck( OUTPcard * );
 extern int OUTPsetup( OUTPcard * );

src/ciderlib/input/output.c

@@ -4,14 +4,14 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 Modified: 2001 Paolo Nenzi
 **********/
 
-#include "ngspice.h"
-#include "numcards.h"
-#include "numgen.h"
-#include "numenum.h"
-#include "outpdefs.h"
-#include "devdefs.h"
-#include "sperror.h"
-#include "suffix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numcards.h>
+#include <ngspice/numgen.h>
+#include <ngspice/numenum.h>
+#include <ngspice/outpdefs.h>
+#include <ngspice/devdefs.h>
+#include <ngspice/sperror.h>
+#include <ngspice/suffix.h>
 #include "../misc/tilde.h"
 
 extern int OUTPnewCard(void**,void*);

src/ciderlib/oned/oneadmit.c

@@ -6,19 +6,19 @@ $Id$
 
 /* Functions to compute small-signal parameters of 1D devices */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "numconst.h"
-#include "onedev.h"
-#include "onemesh.h"
-#include "complex.h"
-#include "spmatrix.h"
-#include "ifsim.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/numconst.h>
+#include <ngspice/onedev.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/complex.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/ifsim.h>
 
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 
 extern IFfrontEnd *SPfrontEnd;

src/ciderlib/oned/oneaval.c

@@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/macros.h>
 
 #include "onedext.h"
 #include "oneddefs.h"

src/ciderlib/oned/onecond.c

@@ -6,13 +6,13 @@ $Id$
 
 /* Functions to compute device conductances and currents */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "macros.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/macros.h>
+#include <ngspice/spmatrix.h>
 
 #include "onedext.h"
 #include "oneddefs.h"

src/ciderlib/oned/onecont.c

@@ -4,16 +4,16 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "spmatrix.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/macros.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/bernoull.h"
 
 

src/ciderlib/oned/onedest.c

@@ -3,12 +3,12 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onedev.h"
-#include "onemesh.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onedev.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/spmatrix.h>
 #include "onedext.h"
 #include "oneddefs.h"
 

src/ciderlib/oned/onedext.h

@@ -7,12 +7,12 @@
 #ifndef _ONEDEXT_H
 #define _ONEDEXT_H
 
-#include "profile.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "carddefs.h"
-#include "bool.h"
-#include "complex.h"
+#include <ngspice/profile.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/carddefs.h>
+#include <ngspice/bool.h>
+#include <ngspice/complex.h>
  
 /* oneadmit.c */
 extern int NUMDadmittance(ONEdevice *, double, SPcomplex *);

src/ciderlib/oned/onedopng.c

@@ -4,16 +4,16 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "profile.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/profile.h>
+#include <ngspice/macros.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 /* functions in this file are used to calculate the conc */
 

src/ciderlib/oned/onefreez.c

@@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "onemesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/onemesh.h>
 #include "../../maths/misc/accuracy.h"
 #include "onedext.h"
 #include "oneddefs.h"

src/ciderlib/oned/onemesh.c

@@ -4,12 +4,12 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/macros.h>
 #include "onedext.h"
 #include "oneddefs.h"
 

src/ciderlib/oned/onepoiss.c

@@ -4,14 +4,14 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "spmatrix.h"
+#include <ngspice/spmatrix.h>
 
 /* Functions to setup and solve the 1D poisson equation. */
 

src/ciderlib/oned/oneprint.c

@@ -5,14 +5,14 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "carddefs.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/carddefs.h>
+#include <ngspice/spmatrix.h>
 #include "onedext.h"
 #include "oneddefs.h"
 

src/ciderlib/oned/oneproj.c

@@ -4,17 +4,17 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "macros.h"
-#include "spmatrix.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/macros.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/bool.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 
 /*

src/ciderlib/oned/oneread.c

@@ -8,15 +8,15 @@ $Id$
  * Functions needed to read solutions for 1D devices.
  */
  
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onedev.h"
-#include "onemesh.h"
-#include "plot.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onedev.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/plot.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 int
 ONEreadState(ONEdevice *pDevice, char *fileName, int numVolts, 

src/ciderlib/oned/onesetup.c

@@ -9,17 +9,17 @@ $Id$
 One-Dimensional Numerical Device Setup Routines
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "onemesh.h"
-#include "onedev.h"
-#include "carddefs.h"		/* XXX Not really modular if we need this. */
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/onedev.h>
+#include <ngspice/carddefs.h>		/* XXX Not really modular if we need this. */
 /* #include "material.h" */
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 /* compute node parameters */
 void

src/ciderlib/oned/onesolve.c

@@ -9,20 +9,20 @@ $Id$
  * Functions needed to calculate solutions for 1D devices.
  */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "onedev.h"
-#include "onemesh.h"
-#include "spmatrix.h"
-#include "bool.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/onedev.h>
+#include <ngspice/onemesh.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/bool.h>
+#include <ngspice/macros.h>
 #include "onedext.h"
 #include "oneddefs.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/norm.h"
 
-#include "ifsim.h"
+#include <ngspice/ifsim.h>
 extern IFfrontEnd *SPfrontEnd;
 
 

src/ciderlib/support/database.c

@@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California.  All rights reserved.
 Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "fteext.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/fteext.h>
 /* #include "ftedata.h" */
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 struct plot *
 DBread( char *fileName )

src/ciderlib/support/devprint.c

@@ -5,9 +5,9 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 
 /* Device-type Dependent Printing Routines */
 
-#include "ngspice.h"
-#include "optndefs.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/optndefs.h>
+#include <ngspice/cidersupt.h>
 
 void
 printVoltages(FILE *file, char *mName, char *iName, int devType, 

src/ciderlib/support/geominfo.c

@@ -4,11 +4,11 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "gendev.h"
-#include "macros.h"
-#include "memory.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/gendev.h>
+#include <ngspice/macros.h>
+#include <ngspice/memory.h>
+#include <ngspice/cidersupt.h>
 
 void printCoordInfo(CoordInfo *pFirstCoord)
 {

src/ciderlib/support/globals.c

@@ -4,11 +4,11 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/cidersupt.h>
 
 /* Global Variable Declarations 
 char *LogFileName = "cider.log";

src/ciderlib/support/integset.c

@@ -4,9 +4,9 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numenum.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numenum.h>
+#include <ngspice/cidersupt.h>
 
 /* compute the coefficient for the integration and predictor methods */
 /* based on the Lagrange polynomial method in Liniger et. al. */

src/ciderlib/support/integuse.c

@@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "gendev.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/gendev.h>
+#include <ngspice/cidersupt.h>
 
 /* function to compute the integrated variables discretization */
 

src/ciderlib/support/logfile.c

@@ -3,8 +3,8 @@ Copyright 1992 Regents of the University of California.  All rights reserved.
 Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cidersupt.h>
 
 static char *LogFileName = "cider.log";
 static int LogError = 0;

src/ciderlib/support/mater.c

@@ -4,12 +4,12 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "material.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/material.h>
+#include <ngspice/cidersupt.h>
 
 
 /*

src/ciderlib/support/misc.c

@@ -9,11 +9,11 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
  * code will run without having to compile the oned code
  */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "spmatrix.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/cidersupt.h>
 
 
 /* Used in Solution Projection Calculations */

src/ciderlib/support/mobil.c

@@ -4,13 +4,13 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "macros.h"
-#include "material.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/macros.h>
+#include <ngspice/material.h>
+#include <ngspice/cidersupt.h>
 
 void MOBdefaults(MaterialInfo *info , int carrier, int type, 
                  int concmodel, int fieldmodel )

src/ciderlib/support/recomb.c

@@ -3,9 +3,9 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/cidersupt.h>
 
 /*
  * function recomb calculates the recobination rates and the 

src/ciderlib/support/suprem.c

@@ -7,9 +7,9 @@ $Id$
 
 /* Functions to read SUPREM (Binary or Ascii) & ASCII input files */
 
-#include "ngspice.h"
-#include "profile.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/profile.h>
+#include <ngspice/cidersupt.h>
 
 void
 readAsciiData( char *fileName, int impType, DOPtable **ppTable )

src/ciderlib/support/suprmitf.c

@@ -9,8 +9,8 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
  */
 
 
-#include "ngspice.h"
-#include "cidersupt.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cidersupt.h>
 
 #define MAXMAT 10
 #define MAXIMP 4

src/ciderlib/twod/twoadmit.c

@@ -6,20 +6,20 @@ $Id$
 
 /* Functions to compute the ac admittances of a device. */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "numconst.h"
-#include "twodev.h"
-#include "twomesh.h"
-#include "complex.h"
-#include "spmatrix.h"
-#include "bool.h"
-#include "macros.h"
-#include "ifsim.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/numconst.h>
+#include <ngspice/twodev.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/complex.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/bool.h>
+#include <ngspice/macros.h>
+#include <ngspice/ifsim.h>
 #include "twoddefs.h"  
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 extern IFfrontEnd *SPfrontEnd;
 

src/ciderlib/twod/twoaval.c

@@ -4,10 +4,10 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1990 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twocond.c

@@ -6,13 +6,13 @@ $Id$
 
 /* Functions to compute terminal conductances & currents. */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twocont.c

@@ -5,16 +5,16 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/bernoull.h"
 
 /*

src/ciderlib/twod/twocurr.c

@@ -4,10 +4,10 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twodest.c

@@ -3,12 +3,12 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twodev.h"
-#include "twomesh.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twodev.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twodext.h

@@ -7,12 +7,12 @@
 #ifndef _TWODEXT_H
 #define _TWODEXT_H
 
-#include "profile.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "carddefs.h"
-#include "bool.h"
-#include "complex.h"
+#include <ngspice/profile.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/carddefs.h>
+#include <ngspice/bool.h>
+#include <ngspice/complex.h>
  
 /* twoadmit.c */
 extern int NUMD2admittance(TWOdevice *, double, SPcomplex *);

src/ciderlib/twod/twodopng.c

@@ -4,17 +4,17 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "profile.h"
-#include "macros.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/profile.h>
+#include <ngspice/macros.h>
+#include <ngspice/bool.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 /* functions in this file are used to calculate the conc */
 

src/ciderlib/twod/twoelect.c

@@ -4,13 +4,13 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
 #include "twoddefs.h"
 #include "twodext.h"
 
@@ -19,7 +19,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #define NEXT		next
 #define SORT		TWOssortElectrodes
 #define SORT1		TWOsortElectrodes
-#include "lsort.h"
+#include <ngspice/lsort.h>
 
 #define ARG_MIN(a,b,c) ((a) > (b) ? 1 : ((a) < (b) ? -1 : (c)))
 

src/ciderlib/twod/twofield.c

@@ -4,10 +4,10 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twomesh.c

@@ -5,13 +5,13 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twomobdv.c

@@ -3,10 +3,10 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "twomesh.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/bool.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twomobfn.c

@@ -4,12 +4,12 @@ Author:	1990 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "material.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/material.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twomobil.c

@@ -3,9 +3,9 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1990 David A. Gates, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "twomesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/twomesh.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twoncont.c

@@ -5,16 +5,16 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/bernoull.h"
 
 

src/ciderlib/twod/twopcont.c

@@ -5,16 +5,16 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/bernoull.h"
 
 /*

src/ciderlib/twod/twopoiss.c

@@ -5,12 +5,12 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twoprint.c

@@ -5,15 +5,15 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "carddefs.h"
-#include "spmatrix.h"
-#include "bool.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/carddefs.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/bool.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twoproj.c

@@ -9,16 +9,16 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
  * two-level Newton scheme
  */
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "bool.h"
-#include "spmatrix.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/bool.h>
+#include <ngspice/spmatrix.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 
 /* Forward Declarations */

src/ciderlib/twod/tworead.c

@@ -8,15 +8,15 @@ $Id$
  * Functions needed to read solutions for 2D devices.
  */
 
-#include "ngspice.h"
-#include "plot.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twodev.h"
-#include "twomesh.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/plot.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twodev.h>
+#include <ngspice/twomesh.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 
 int

src/ciderlib/twod/twosetbc.c

@@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twosetup.c

@@ -9,16 +9,16 @@ $Id$
 Two-Dimensional Numerical Device Setup Routines
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numconst.h"
-#include "numenum.h"
-#include "twomesh.h"
-#include "twodev.h"
-#include "carddefs.h"		/* XXX Not really modular if we need this. */
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numconst.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/twodev.h>
+#include <ngspice/carddefs.h>		/* XXX Not really modular if we need this. */
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 
 
 /* compute node parameters */

src/ciderlib/twod/twosolve.c

@@ -5,21 +5,21 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 $Id$
 **********/
 
-#include "ngspice.h"
-#include "numglobs.h"
-#include "numenum.h"
-#include "twodev.h"
-#include "twomesh.h"
-#include "spmatrix.h"
-#include "bool.h"
-#include "macros.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/numglobs.h>
+#include <ngspice/numenum.h>
+#include <ngspice/twodev.h>
+#include <ngspice/twomesh.h>
+#include <ngspice/spmatrix.h>
+#include <ngspice/bool.h>
+#include <ngspice/macros.h>
 #include "twoddefs.h"
 #include "twodext.h"
-#include "cidersupt.h"
+#include <ngspice/cidersupt.h>
 #include "../../maths/misc/norm.h"
 
 
-#include "ifsim.h"
+#include <ngspice/ifsim.h>
 extern IFfrontEnd *SPfrontEnd;
 
 

src/frontend/arg.c

@@ -8,10 +8,10 @@ Author: 1987 Jeffrey M. Hsu
       and prompt the user if necessary.
 */
 
-#include <ngspice.h>
-#include <fteinput.h>
-#include <cpdefs.h>
-#include <fteext.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/fteinput.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/fteext.h>
 
 #include "arg.h"
 #include "variable.h"

src/frontend/aspice.c

@@ -8,9 +8,9 @@ $Id$
  * Stuff for asynchronous spice runs, and also rspice.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/ftedefs.h>
 
 #include "aspice.h"
 #include "variable.h"
@@ -33,8 +33,8 @@ $Id$
 
 #include <signal.h>
 
-#include "fteinp.h"
-#include "dvec.h"
+#include <ngspice/fteinp.h>
+#include <ngspice/dvec.h>
 
 #include "../misc/mktemp.h"
 

src/frontend/breakp.c

@@ -8,11 +8,11 @@ $Id$
  * Code to deal with breakpoints and tracing.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftedebug.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/ftedefs.h>
+#include <ngspice/dvec.h>
+#include <ngspice/ftedebug.h>
 #include "breakp.h"
 #include "breakp2.h"
 #include "runcoms2.h"

src/frontend/breakp2.c

@@ -8,11 +8,11 @@ $Id$
  * Code to deal with breakpoints and tracing.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftedebug.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/ftedefs.h>
+#include <ngspice/dvec.h>
+#include <ngspice/ftedebug.h>
 #include "quote.h"
 #include "breakp2.h"
 

src/frontend/circuits.c

@@ -6,10 +6,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 /* Routines for dealing with the circuit database.  This is currently
  * unimplemented.  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/ftedefs.h>
+#include <ngspice/dvec.h>
 #include "circuits.h"
 
 

src/frontend/com_ahelp.c

@@ -1,9 +1,9 @@
 #include <config.h>
-#include <ngspice.h>
+#include <ngspice/ngspice.h>
 
-#include <bool.h>
-#include <wordlist.h>
-#include <fteext.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/fteext.h>
 
 #include "variable.h"
 #include "com_help.h"

src/frontend/com_alias.c

@@ -5,8 +5,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 /* Do alias substitution.  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
 #include "com_alias.h"
 
 struct alias *cp_aliases = NULL;

src/frontend/com_asciiplot.c

@@ -1,8 +1,8 @@
 #include <config.h>
-#include <ngspice.h>
+#include <ngspice/ngspice.h>
 
-#include <bool.h>
-#include <wordlist.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
 
 #include "plotting/plotit.h"
 

src/frontend/com_cdump.c

@@ -1,12 +1,12 @@
 /* Command cdump: dump the control structure to the console output */
 
-#include "ngspice.h"
+#include <ngspice/ngspice.h>
 #include <stdio.h>
 
-#include <wordlist.h>
+#include <ngspice/wordlist.h>
 
 #include "control.h"
-#include "cpextern.h"
+#include <ngspice/cpextern.h>
 
 #include "com_cdump.h"
 

src/frontend/com_chdir.c

@@ -3,9 +3,9 @@
 * $Id$
 ************/
 
-#include "ngspice.h"
+#include <ngspice/ngspice.h>
 
-#include "wordlist.h"
+#include <ngspice/wordlist.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -13,7 +13,7 @@
 
 #include "com_chdir.h"
 #include "quote.h"
-#include "cpextern.h"
+#include <ngspice/cpextern.h>
 
 
 void

src/frontend/com_chdir.h

@@ -6,7 +6,7 @@
 #ifndef COM_CHDIR_H
 #define COM_CHDIR_H
 
-#include <wordlist.h>
+#include <ngspice/wordlist.h>
 
 void com_chdir(wordlist *wl);
 

src/frontend/com_compose.c

@@ -1,13 +1,13 @@
 /* The 'compose' command.  This is a more powerful and convenient form
  * of the 'let' command.  */
-#include <ngspice.h>
-#include <complex.h>
-#include <dvec.h>
-#include <bool.h>
-#include <sim.h>
-#include <pnode.h>
-#include <fteext.h>
-#include <cpextern.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/complex.h>
+#include <ngspice/dvec.h>
+#include <ngspice/bool.h>
+#include <ngspice/sim.h>
+#include <ngspice/pnode.h>
+#include <ngspice/fteext.h>
+#include <ngspice/cpextern.h>
 
 #include "quote.h"
 #include "com_compose.h"

src/frontend/com_compose.h

@@ -2,7 +2,7 @@
 #ifndef _COM_COMPOSE_H
 #define _COM_COMPOSE_H
 
-#include <wordlist.h>
+#include <ngspice/wordlist.h>
 
 
 void com_compose(wordlist *wl);

src/frontend/com_display.c

@@ -1,8 +1,8 @@
-#include <ngspice.h>
-#include <bool.h>
-#include <wordlist.h>
-#include <fteext.h>
-#include <cpextern.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/fteext.h>
+#include <ngspice/cpextern.h>
 
 #include "com_display.h"
 #include "quote.h"

src/frontend/com_display.h

@@ -1,7 +1,7 @@
 #ifndef _COM_DISPLAY_H
 #define _COM_DISPLAY_H
 
-#include <wordlist.h>
+#include <ngspice/wordlist.h>
 
 void com_display(wordlist *wl);
 

src/frontend/com_dl.c

@@ -1,6 +1,6 @@
-#include <ngspice.h> /* for wl */
-#include "ftedefs.h"
-#include <devdefs.h> /* solve deps in dev.h*/
+#include <ngspice/ngspice.h> /* for wl */
+#include <ngspice/ftedefs.h>
+#include <ngspice/devdefs.h> /* solve deps in dev.h*/
 #include <../spicelib/devices/dev.h> /*for load library commands*/
 #include "com_dl.h"
 

src/frontend/com_dump.c

@@ -1,12 +1,12 @@
 #include <config.h>
-#include <ngspice.h>
-#include <bool.h>
-#include <wordlist.h>
-#include <inpdefs.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/inpdefs.h>
 #include "circuits.h"
 #include "com_dump.h"
-#include "cpextern.h"
-#include "fteext.h"
+#include <ngspice/cpextern.h>
+#include <ngspice/fteext.h>
 #include "spiceif.h"
 
 

src/frontend/com_echo.c

@@ -4,13 +4,13 @@
 ************/
 
 #include <config.h>
-#include <ngspice.h>
-#include <wordlist.h>
-#include <bool.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/bool.h>
 
 #include "com_echo.h"
 #include "quote.h"
-#include "cpextern.h"
+#include <ngspice/cpextern.h>
 
 void
 com_echo(wordlist *wlist)

src/frontend/com_echo.h

@@ -6,7 +6,7 @@
 #ifndef COM_ECHO_H
 #define COM_ECHO_H
 
-#include <wordlist.h>
+#include <ngspice/wordlist.h>
 
 void com_echo(wordlist *wlist);
 

src/frontend/com_fft.c

@@ -7,16 +7,16 @@ Author:   2008 Holger Vogt
  * Code to do fast fourier transform on data.
  */
 
-#include "ngspice.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "sim.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/ftedefs.h>
+#include <ngspice/dvec.h>
+#include <ngspice/sim.h>
 
 #include "com_fft.h"
 #include "variable.h"
 #include "parse.h"
 #include "../misc/misc_time.h"
-#include "fftext.h"
+#include <ngspice/fftext.h>
 
 static void fftext(double*, double*, long int, long int, int);
 

src/frontend/com_ghelp.c

@@ -1,13 +1,13 @@
 #ifndef X_DISPLAY_MISSING
-#include <ngspice.h>
-#include <wordlist.h>
-#include <bool.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/bool.h>
 #include <variable.h>
 
 #include "variable.h"
-#include "cpextern.h"
-#include "cpextern.h"
-#include <hlpdefs.h>
+#include <ngspice/cpextern.h>
+#include <ngspice/cpextern.h>
+#include <ngspice/hlpdefs.h>
 #endif
 
 #include "com_ghelp.h"

src/frontend/com_gnuplot.c

@@ -1,8 +1,8 @@
 #include <stddef.h>
 
-#include <ngspice.h>
-#include <bool.h>
-#include <wordlist.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
 
 #include "plotting/plotit.h"
 #include "../misc/mktemp.h"

src/frontend/com_hardcopy.c

@@ -1,14 +1,14 @@
 #include <config.h>
 #include <stdio.h>
 
-#include <ngspice.h>
-#include <defines.h>
-#include <bool.h>
-#include <wordlist.h>
-#include <cpdefs.h>
-#include <fteinput.h>
-#include <ftedev.h>
-#include "ftedbgra.h"
+#include <ngspice/ngspice.h>
+#include <ngspice/defines.h>
+#include <ngspice/bool.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/fteinput.h>
+#include <ngspice/ftedev.h>
+#include <ngspice/ftedbgra.h>
 
 #include "plotting/plotit.h"
 #include "plotting/graphdb.h"

src/frontend/com_help.c

@@ -1,14 +1,14 @@
 #include <config.h>
-#include <ngspice.h>
+#include <ngspice/ngspice.h>
 
-#include <macros.h>
-#include <wordlist.h>
-#include <cpdefs.h>
-#include <bool.h>
+#include <ngspice/macros.h>
+#include <ngspice/wordlist.h>
+#include <ngspice/cpdefs.h>
+#include <ngspice/bool.h>
 
 #include "hcomp.h"
 #include "com_help.h"
-#include "fteext.h"
+#include <ngspice/fteext.h>
 
 
 void

src/frontend/com_history.c

@@ -6,8 +6,8 @@ $Id$
 
 /* Do history substitutions.  */
 
-#include <ngspice.h>
-#include <cpdefs.h>
+#include <ngspice/ngspice.h>
+#include <ngspice/cpdefs.h>
 
 #include "com_history.h"