diff --git a/ChangeLog b/ChangeLog
index ac0e4e2ba..cdbde3e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08  Robert Larice
+ * src/include/inpdefs.h ,
+ * src/spicelib/parser/inp.h :
+    collect the other INP*() prototypes in "inpdefs.h"
+
 2010-10-08  Robert Larice
  * src/include/inpdefs.h ,
  * src/spicelib/parser/inp.h ,
diff --git a/src/include/inpdefs.h b/src/include/inpdefs.h
index eb0d325f1..c34f315e4 100644
--- a/src/include/inpdefs.h
+++ b/src/include/inpdefs.h
@@ -124,5 +124,13 @@ int INP2dot(CKTcircuit *, INPtables *, card *, TSKtask *, CKTnode *);
 INPtables *INPtabInit(int);
 void INPkillMods(void);
 void INPtabEnd(INPtables *);
+char * INPfindVer(char *line, char *version);
+int INPgetStr(char **line, char **token, int gobble);
+int INPgetTitle(CKTcircuit **ckt, card **data);
+int INPgetUTok(char **line, char **token, int gobble);
+int INPgetU2Tok(char **line, char **token, int gobble);
+int INPremTerm(char *token, INPtables *tab);
+
+
 
 #endif /*INP*/
diff --git a/src/spicelib/parser/inp.h b/src/spicelib/parser/inp.h
index e0b60aacd..e171062f0 100644
--- a/src/spicelib/parser/inp.h
+++ b/src/spicelib/parser/inp.h
@@ -6,17 +6,6 @@
 #ifndef INP_H_INCLUDED
 #define INP_H_INCLUDED
 
-/* ifeval.c */
-
-int IFeval(IFparseTree *tree, double gmin, double *result, double *vals, 
-	   double *derivs);
-
-/* ifnewuid.c */
-
-int IFnewUid(CKTcircuit *ckt, IFuid *newuid, IFuid olduid, char *suffix, int type, 
-	     CKTnode **nodedata);
-int IFdelUid(CKTcircuit *ckt, IFuid uid, int type);
-
 /* inp2xx.c */
 
 void INP2B(CKTcircuit *ckt, INPtables *tab, card *current);
@@ -43,58 +32,7 @@ void INP2V(CKTcircuit *ckt, INPtables *tab, card *current);
 void INP2W(CKTcircuit *ckt, INPtables *tab, card *current);
 void INP2Y(CKTcircuit *ckt, INPtables *tab, card *current);
 void INP2Z(CKTcircuit *ckt, INPtables *tab, card *current);
-int INP2dot(CKTcircuit *ckt, INPtables *tab, card *current, TSKtask *task, CKTnode *gnode);
 
-/* inpxxxx.c */
-
-int INPaName(char *parm, IFvalue *val, CKTcircuit *ckt, int *dev, char *devnam, 
-	     GENinstance **fast, IFsimulator *sim, int *dataType, IFvalue *selector);
-int INPapName(CKTcircuit *ckt, int type, JOB *analPtr, char *parmname, IFvalue *value);
-void INPcaseFix(register char *string);
-char * INPdomodel(CKTcircuit *ckt, card *image, INPtables *tab);
-void INPdoOpts(CKTcircuit *ckt, JOB *anal, card *optCard, INPtables *tab);
-char * INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast, double *leading,
-		   int *waslead, INPtables *tab);
-char * INPerrCat(char *a, char *b);
-char * INPerror(int type);
-double INPevaluate(char **line, int *error, int gobble);
-char * INPfindLev(char *line, int *level);
-char * INPfindVer(char *line, char *version);
-char * INPgetMod(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab);
-int INPgetStr(char **line, char **token, int gobble);
-int INPgetTitle(CKTcircuit **ckt, card **data);
-int INPgetTok(char **line, char **token, int gobble);
-int INPgetUTok(char **line, char **token, int gobble);
-int INPgetU2Tok(char **line, char **token, int gobble);
-IFvalue * INPgetValue(CKTcircuit *ckt, char **line, int type, INPtables *tab);
-void INPkillMods(void);
-void INPlist(FILE *file, card *deck, int type);
-int INPlookMod(char *name);
-int INPmakeMod(char *token, int type, card *line);
-char * INPmkTemp(char *string);
-void INPpas1(CKTcircuit *ckt, card *deck, INPtables *tab);
-void INPpas2(CKTcircuit *ckt, card *data, INPtables *tab, TSKtask *task);
-int INPpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, GENinstance *fast);
-
-/* inpptree.c */
-
-void INPgetTree(char **line, INPparseTree **pt, CKTcircuit *ckt, INPtables *tab);
-
-
-/* inpsymt.c */
-
-INPtables * INPtabInit(int numlines);
-int INPtermInsert(CKTcircuit *ckt, char **token, INPtables *tab, CKTnode **node);
-int INPmkTerm(CKTcircuit *ckt, char **token, INPtables *tab, CKTnode **node);
-int INPgndInsert(CKTcircuit *ckt, char **token, INPtables *tab, CKTnode **node);
-int INPretrieve(char **token, INPtables *tab);
-int INPinsert(char **token, INPtables *tab);
-int INPinsertNofree(char **token, INPtables *tab);
-int INPremove(char *token, INPtables *tab);
-int INPremTerm(char *token, INPtables *tab);
-void INPtabEnd(INPtables *tab);
-
-int INPtypelook(char *type);
 
 /* ptfuncs.c */
 
@@ -137,6 +75,4 @@ double PTge0(double arg);
 double PTle0(double arg);
 
 
-/* sperror.c */
-
 #endif