From 31b5e7d40a3a951990917db4326a976029989659 Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 5 Oct 2014 10:39:14 +0200 Subject: [PATCH] cleanup, reduce `#include' incantations --- src/spicelib/analysis/cktlxt2.c | 19 ++----------------- src/spicelib/analysis/lxt2_init.c | 17 +---------------- src/xspice/evt/evtlxt2.c | 10 +--------- 3 files changed, 4 insertions(+), 42 deletions(-) diff --git a/src/spicelib/analysis/cktlxt2.c b/src/spicelib/analysis/cktlxt2.c index b1967eda5..906871791 100644 --- a/src/spicelib/analysis/cktlxt2.c +++ b/src/spicelib/analysis/cktlxt2.c @@ -1,31 +1,16 @@ #include "ngspice/ngspice.h" -#include "ngspice/config.h" -#include "ngspice/cktdefs.h" -//#include "ngspice/cktaccept.h" -#include "ngspice/trandefs.h" -#include "ngspice/sperror.h" #include "ngspice/fteext.h" -#include "ngspice/missing_math.h" + #include "../frontend/outitf.h" + #include #ifdef XSPICE -/* gtri - add - wbk - Add headers */ -#include "ngspice/miftypes.h" - -#include "ngspice/evt.h" -#include "ngspice/mif.h" #include "ngspice/evtproto.h" -#include "ngspice/ipctiein.h" -/* gtri - end - wbk - Add headers */ #endif #include "ngspice/lxt2_write.h" -#ifdef CLUSTER -#include "cluster.h" -#endif - #define CKALLOC(var,size,type) \ if(size) { \ if(!(var = (type *) MALLOC((size) * sizeof(type)))) \ diff --git a/src/spicelib/analysis/lxt2_init.c b/src/spicelib/analysis/lxt2_init.c index 71ea6bedd..ad1b58930 100644 --- a/src/spicelib/analysis/lxt2_init.c +++ b/src/spicelib/analysis/lxt2_init.c @@ -1,30 +1,15 @@ #include "ngspice/ngspice.h" -#include "ngspice/config.h" -#include "ngspice/cktdefs.h" -//#include "ngspice/cktaccept.h" -#include "ngspice/trandefs.h" #include "ngspice/sperror.h" #include "ngspice/fteext.h" -#include "ngspice/missing_math.h" + #include "../frontend/outitf.h" #ifdef XSPICE -/* gtri - add - wbk - Add headers */ -#include "ngspice/miftypes.h" - -#include "ngspice/evt.h" -#include "ngspice/mif.h" #include "ngspice/evtproto.h" -#include "ngspice/ipctiein.h" -/* gtri - end - wbk - Add headers */ #endif #include "ngspice/lxt2_write.h" -#ifdef CLUSTER -#include "cluster.h" -#endif - #define CKALLOC(var,size,type) \ if(size) { \ if(!(var = (type *) MALLOC((size) * sizeof(type)))) \ diff --git a/src/xspice/evt/evtlxt2.c b/src/xspice/evt/evtlxt2.c index f3003bb28..8345f1bd6 100644 --- a/src/xspice/evt/evtlxt2.c +++ b/src/xspice/evt/evtlxt2.c @@ -1,14 +1,6 @@ #include "ngspice/ngspice.h" -#include "ngspice/cktdefs.h" -//#include "util.h" - -#include "ngspice/mif.h" -#include "ngspice/evt.h" -#include "ngspice/evtudn.h" - -#include "ngspice/mifproto.h" #include "ngspice/evtproto.h" -#include "ngspice/cm.h" + #include static char *EVTbitmap(int i);