diff --git a/src/Makefile.am b/src/Makefile.am
index 214ac883a..cdc02d489 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,6 @@ DYNAMIC_DEVICELIBS = 					\
 	spicelib/devices/bsim3soi_dd/libbsim3soidd.a	\
 	spicelib/devices/cccs/libcccs.a			\
 	spicelib/devices/ccvs/libccvs.a			\
-	spicelib/devices/ccvs/libccvs.a			\
 	spicelib/devices/cpl/libcpl.a			\
 	spicelib/devices/csw/libcsw.a			\
 	spicelib/devices/dio/libdio.a			\
diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c
index aa60f310e..468d1779a 100644
--- a/src/frontend/plotting/graf.c
+++ b/src/frontend/plotting/graf.c
@@ -21,7 +21,6 @@ $Id$
 #include <graph.h>
 #include "ftedbgra.h"
 #include "ftedev.h"
-#include <terminal.h>
 #include <variable.h>
 #include "graf.h"
 #include "graphdb.h"
diff --git a/src/spicelib/devices/txl/Makefile.am b/src/spicelib/devices/txl/Makefile.am
index 512cd35cb..a786fb353 100755
--- a/src/spicelib/devices/txl/Makefile.am
+++ b/src/spicelib/devices/txl/Makefile.am
@@ -15,7 +15,6 @@ libtxl_a_SOURCES = 	\
 	txlload.c  \
 	txlmdel.c  \
 	txlparam.c \
-	txlacct.c  \
 	txldel.c   \
 	txlmask.c  \
 	txlmpar.c  \
diff --git a/src/xspice/icm/Makefile.am b/src/xspice/icm/Makefile.am
index d713acc8e..a60da9bf5 100755
--- a/src/xspice/icm/Makefile.am
+++ b/src/xspice/icm/Makefile.am
@@ -27,7 +27,7 @@ SYSTEM_LIBS = -lm -lncurses -L/usr/X11R6/lib -lX11 -lXt -lXext -lXmu -lXaw  -lSM
 
 LOCAL_LIBS = -lcmxsp,-levtxsp,-lidnxsp,-lipcxsp,-lenhxsp,-lmifxsp,-ldev,-lckt,-linp,-lparser,-lhlp,-linp,-lderiv,-lcmaths,-lpoly,-lni,-lsparse,-lmisc,-lfte,-lplotting
 
-DEVICE_LIBS = -lasrc,-lbjt,-lbsim1,-lbsim2,-lbsim3,-lbsim3v1,-lbsim3v2,-lbsim4,-lcap,-lbsim3soipd,-lbsim3soifd,-lbsim3soidd,-lcccs,-lccvs,-lccvs,-lcpl,-lcsw,-ldio,-lind,-lisrc,-lhfet,-lhfet2,-ljfet,-ljfet2,-lltra,-lmes,-lmesa,-lmos1,-lmos2,-lmos3,-lmos6,-lmos9,-lres,-lsoi3,-lsw,-ltxl,-ltra,-lurc,-lvccs,-lvcvs,-lvsrc
+DEVICE_LIBS = -lasrc,-lbjt,-lbsim1,-lbsim2,-lbsim3,-lbsim3v1,-lbsim3v2,-lbsim4,-lcap,-lbsim3soipd,-lbsim3soifd,-lbsim3soidd,-lcccs,-lccvs,-lcpl,-lcsw,-ldio,-lind,-lisrc,-lhfet,-lhfet2,-ljfet,-ljfet2,-lltra,-lmes,-lmesa,-lmos1,-lmos2,-lmos3,-lmos6,-lmos9,-lres,-lsoi3,-lsw,-ltxl,-ltra,-lurc,-lvccs,-lvcvs,-lvsrc