10 files changed, 41 insertions, 50 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 295fb21c..e2d74443 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2008-04-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* include/nagman.H1: Remove.
+	* include/session.H1: Move content to sman/session.c.  Remove.
+	* sman/session.c: Don't include "session.H1" anymore.
+	* sman/spadclient.c: Don't include "spadclient.H1" anymore.
+	* include/spadclient.H1: Remove.
+	* include/spadbuf.H1: Move content to hyper/spadbuf.c.  Remove.
+	* hyper/spadbuf.c: Don't include "spadbuf.H1" anymore.
+	* hyper/htadd.c: Don't include "htadd.H1" anymore.
+	* include/htadd.H1: Move content to hyper/htadd.c.  Remove.
+
+2008-04-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* lib/openpty.c: Remove conditional inclusion of <stropts.h>
 	* hyper/spadbuf.c: Remove conditional inclusion of <bstring.h>
 	* sman/session.c: Likewise.
diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c
index edc2add4..534d9c55 100644
--- a/src/hyper/htadd.c
+++ b/src/hyper/htadd.c
@@ -47,7 +47,6 @@
 
 #include "lex.h"
 
-#include "htadd.H1"
 #include "addfile.h"
 #include "halloc.H1"
 #include "hash.H1"
@@ -55,6 +54,17 @@
 #include "lex.H1"
 
 
+static void add_file(char*, char*, int);
+static void add_new_pages(FILE*, FILE*, char*, char*);
+static int build_db_filename(short, char*, char*);
+static void copy_file(char*, char*);
+static void delete_db(FILE*, FILE*, char*);
+static int delete_file(char*, char*);
+static void get_filename(void);
+static void parse_args(char**, char*, char**, short*);
+static void update_db(FILE*, FILE*, FILE*, char*, char*, int);
+static int writable(struct stat);
+
 
 
 /*
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index 1a6bc0ef..b8795723 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -52,7 +52,6 @@
 #include "edible.h"
 #include "com.h"
 
-#include "spadbuf.H1"
 #include "sockio.h"
 #include "edin.H1"
 #include "wct.H1"
@@ -60,6 +59,10 @@
 #include "cursor.H1"
 #include "fnct_key.H1"
 
+static void spadbuf_inter_handler(int);
+static void spadbuf_function_chars(void);
+static void interp_io(void);
+static void init_parent(void);
 
 
 unsigned char _INTR, _QUIT, _ERASE, _KILL, _EOF, _EOL, _RES1, _RES2;
diff --git a/src/include/htadd.H1 b/src/include/htadd.H1
deleted file mode 100644
index 22ee5487..00000000
--- a/src/include/htadd.H1
+++ /dev/null
@@ -1,13 +0,0 @@
-extern int main(int argc , char * * argv);
-#ifdef _HTADD_C
-static void add_file(char * dbname , char * name , int fresh);
-static void add_new_pages(FILE * temp_db , FILE * new_file , char * addname , char * fullname);
-static int build_db_filename(short flag , char * db_dir , char * dbfilename);
-static void copy_file(char * f1 , char * f2);
-static void delete_db(FILE * db , FILE * temp_db , char * name);
-static int delete_file(char * dbname , char * name);
-static void get_filename(void);
-static void parse_args(char * * argv , char * db_dir , char * * filenames , short * fl);
-static void update_db(FILE * db , FILE * temp_db , FILE * new_file , char * addname , char * fullname , int fresh);
-static int writable(struct stat buff);
-#endif
diff --git a/src/include/nagman.H1 b/src/include/nagman.H1
deleted file mode 100644
index 4a58ccd1..00000000
--- a/src/include/nagman.H1
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void main(int argc , char * * argv);
-#ifdef _NAGMAN_C
-static void term(int sig);
-static long size_of_file(char * filename);
-static void rpcloop(void);
-static void catchSignals(void);
-#endif
diff --git a/src/include/session.H1 b/src/include/session.H1
deleted file mode 100644
index 4eadaabf..00000000
--- a/src/include/session.H1
+++ /dev/null
@@ -1,15 +0,0 @@
-extern int main(void);
-#ifdef _SESSION_C
-static void usr1_handler(int sig);
-static void usr2_handler(int sig);
-static void term_handler(int sig);
-static void close_client(int frame);
-static void read_SpadServer_command(void);
-static int test_sock_for_process(Sock * sock);
-static void read_menu_client_command(void);
-static void read_from_spad_io(void);
-static void kill_spad(void);
-static int accept_session_connection(Sock * server_sock);
-static void read_from_session(Sock * sock);
-static void manage_sessions(void);
-#endif
diff --git a/src/include/spadbuf.H1 b/src/include/spadbuf.H1
deleted file mode 100644
index d5a0de9e..00000000
--- a/src/include/spadbuf.H1
+++ /dev/null
@@ -1,7 +0,0 @@
-extern int main(int argc , char * * argv);
-#ifdef _SPADBUF_C
-static void spadbuf_inter_handler(int sig);
-static void spadbuf_function_chars(void);
-static void interp_io(void);
-static void init_parent(void);
-#endif
diff --git a/src/include/spadclient.H1 b/src/include/spadclient.H1
deleted file mode 100644
index 66cd1529..00000000
--- a/src/include/spadclient.H1
+++ /dev/null
@@ -1,4 +0,0 @@
-extern int main(void);
-#ifdef _SPADCLIENT_C
-static void inter_handler(int sig);
-#endif
diff --git a/src/sman/session.c b/src/sman/session.c
index 442da39d..8376e9ca 100644
--- a/src/sman/session.c
+++ b/src/sman/session.c
@@ -47,7 +47,20 @@
 #include "com.h"
 #include "bsdsignal.h"
 #include "sockio.h"
-#include "session.H1"
+
+static void usr1_handler(int);
+static void usr2_handler(int);
+static void term_handler(int);
+static void close_client(int);
+static void read_SpadServer_command(void);
+static int test_sock_for_process(Sock*);
+static void read_menu_client_command(void);
+static void read_from_spad_io(void);
+static void kill_spad(void);
+static int accept_session_connection(Sock*);
+static void read_from_session(Sock*);
+static void manage_sessions(void);
+
 
 #define BufSize         4096    /* size of communication buffer */
 
diff --git a/src/sman/spadclient.c b/src/sman/spadclient.c
index 1d74dabf..d7825dc7 100644
--- a/src/sman/spadclient.c
+++ b/src/sman/spadclient.c
@@ -45,7 +45,6 @@
 #include "bsdsignal.h"
 
 #include "sockio.h"
-#include "spadclient.H1"
 
 Sock *sock;