diff --git a/src/circuit/Makefile.am b/src/circuit/Makefile.am
index f05d7645a..41630a607 100644
--- a/src/circuit/Makefile.am
+++ b/src/circuit/Makefile.am
@@ -48,7 +48,9 @@ libinp_a_SOURCES = \
 		inpmkmod.c	\
 		inpmktmp.c	\
 		inppas1.c	\
+		inppas1.h	\
 		inppas2.c	\
+		inppas2.h	\
 		inppname.c	\
 		inpptree.c	\
 		inpsymt.c	\
@@ -58,7 +60,6 @@ libinp_a_SOURCES = \
 		inp.h
 
 
-
 INCLUDES = -I$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/circuit/inppas1.c b/src/circuit/inppas1.c
index a55d1114d..21115c9b2 100644
--- a/src/circuit/inppas1.c
+++ b/src/circuit/inppas1.c
@@ -3,11 +3,12 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#include "ngspice.h"
 #include <stdio.h>
-#include "inpdefs.h"
-#include "ifsim.h"
-#include "inp.h"
+
+#include <config.h>
+#include <ngspice.h>
+
+#include "inppas1.h"
 
 /*
  * The first pass of the circuit parser just looks for '.model' lines
diff --git a/src/circuit/inppas1.h b/src/circuit/inppas1.h
new file mode 100644
index 000000000..6635e6228
--- /dev/null
+++ b/src/circuit/inppas1.h
@@ -0,0 +1,8 @@
+#ifndef _INPPAS1_H
+#define _INPPAS1_H
+
+#include <inpdefs.h>
+
+void INPpas1(void *ckt, card *deck, INPtables *tab);
+
+#endif
diff --git a/src/circuit/inppas2.c b/src/circuit/inppas2.c
index 863e88917..62b0a7cfa 100644
--- a/src/circuit/inppas2.c
+++ b/src/circuit/inppas2.c
@@ -3,17 +3,12 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#include "ngspice.h"
-#include <ctype.h>
-#include "ifsim.h"
-#include "cpdefs.h"
-#include "fteext.h"
-#include "ftedefs.h"
-#include "inpdefs.h"
-#include "iferrmsg.h"
-#include "tskdefs.h"
-#include "inpmacs.h"
-#include "inp.h"
+#include <config.h>
+#include <ngspice.h>
+#include <iferrmsg.h>
+#include <inpmacs.h>
+
+#include "inppas2.h"
 
 /* pass 2 - Scan through the lines.  ".model" cards have processed
  *  in pass1 and are ignored here.
diff --git a/src/circuit/inppas2.h b/src/circuit/inppas2.h
new file mode 100644
index 000000000..9095ef7ae
--- /dev/null
+++ b/src/circuit/inppas2.h
@@ -0,0 +1,9 @@
+#ifndef _INPPAS2_H
+#define _INPPAS2_H
+
+#include <inpdefs.h>
+
+void INPpas2(void *ckt, card *data, INPtables *tab, void *task);
+
+
+#endif
diff --git a/src/circuit/inptyplk.c b/src/circuit/inptyplk.c
index ec23011ad..18d1dfb3b 100644
--- a/src/circuit/inptyplk.c
+++ b/src/circuit/inptyplk.c
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 /*  look up the 'type' in the device description struct and return the
- *  appropriatestrchr for the device found, or -1 for not found 
+ *  appropriate strchr for the device found, or -1 for not found 
  */
 
 #include "ngspice.h"
@@ -19,12 +19,12 @@ INPtypelook(char *type)
 {
 
     int i;
-    for(i=0;i<ft_sim->numDevices;i++) {
-        if(strcmp(type,(*(ft_sim->devices)[i]).name)==0) {
+    for(i = 0; i < ft_sim->numDevices; i++) {
+        if(strcmp(type, (*(ft_sim->devices)[i]).name) == 0) {
             /*found the device - return it */
-            return(i);
+            return i;
         }
     }
-    return(-1);
+    return -1;
 }