Index: aim.c
===================================================================
--- aim.c	(revision 323412185513364eaef94cf3f6cbb70957d93c5f)
+++ aim.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,5 +1,2 @@
-#include <stdio.h>
-#include <stdio.h>
-#include <sys/stat.h>
 #include "owl.h"
 
Index: cmd.c
===================================================================
--- cmd.c	(revision 14be3a516baee0a39a99eada3fd50d39455b4724)
+++ cmd.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,6 +1,2 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "owl.h"
 
Index: commands.c
===================================================================
--- commands.c	(revision 287c6348d5150301d79b7302c118f46c0bf72182)
+++ commands.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,8 +1,4 @@
+#include "owl.h"
 #include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "owl.h"
 
 /* fn is "char *foo(int argc, const char *const *argv, const char *buff)" */
Index: context.c
===================================================================
--- context.c	(revision 6829afcb7133217c6afdbd7634452d0fabdeaa4f)
+++ context.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <string.h>
 #include "owl.h"
 
Index: dict.c
===================================================================
--- dict.c	(revision ce68f235ae86ae86fa4398ae206bda1194d1fcda)
+++ dict.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -6,9 +6,5 @@
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "owl.h"
-
 
 #define INITSIZE 30
Index: editcontext.c
===================================================================
--- editcontext.c	(revision 6829afcb7133217c6afdbd7634452d0fabdeaa4f)
+++ editcontext.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,4 +1,3 @@
 #include "owl.h"
-
 #include <assert.h>
 
Index: editwin.c
===================================================================
--- editwin.c	(revision f661cee8c04d441ed1b519ade4e831bb8f46b934)
+++ editwin.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,7 +1,3 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
 
 #define VALID_EXCURSION	(0x9a2b4729)
Index: filter.c
===================================================================
--- filter.c	(revision 2560529186e398f85a038e8683d29058857eb7b7)
+++ filter.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <string.h>
 #include "owl.h"
 
Index: filterproc.c
===================================================================
--- filterproc.c	(revision e2cc8487b365b026214922326e880825057eb9e6)
+++ filterproc.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,12 +1,5 @@
-#include <signal.h>
-#include <unistd.h>
-#include <sys/select.h>
-#include <sys/types.h>
+#include "owl.h"
 #include <sys/wait.h>
 #include <poll.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <glib.h>
 
 int send_receive(int rfd, int wfd, const char *out, char **in)
Index: fmtext.c
===================================================================
--- fmtext.c	(revision 7abfcf2abcef37025bc4c07654f96ccce56aabe3)
+++ fmtext.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,5 +1,3 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
 
 /* initialize an fmtext with no data */
Index: functions.c
===================================================================
--- functions.c	(revision 30428a9bdfbc16468abbf043db65d5c4cb37218f)
+++ functions.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,16 +1,7 @@
+#include "owl.h"
+#include "filterproc.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <errno.h>
-#include <signal.h>
-#include "owl.h"
-#include "filterproc.h"
 
 CALLER_OWN char *owl_function_command(const char *cmdbuff)
Index: global.c
===================================================================
--- global.c	(revision dde1b4d29c42d18950164c2f9cb244f4aaae672b)
+++ global.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,11 +1,5 @@
+#include "owl.h"
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h>
-#include <termios.h>
 #include <sys/ioctl.h>
-#include <time.h>
-#include "owl.h"
 
 static void _owl_global_init_windows(owl_global *g);
Index: help.c
===================================================================
--- help.c	(revision 820e8524cac556ce9021ee8060ddf88dfa091400)
+++ help.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,4 +1,3 @@
 #include "owl.h"
-#include <string.h>
 
 void owl_help(void)
Index: keybinding.c
===================================================================
--- keybinding.c	(revision 6829afcb7133217c6afdbd7634452d0fabdeaa4f)
+++ keybinding.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,4 +1,2 @@
-#include <ctype.h>
-#include <string.h>
 #include "owl.h"
 
Index: keymap.c
===================================================================
--- keymap.c	(revision ce68f235ae86ae86fa4398ae206bda1194d1fcda)
+++ keymap.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <string.h>
 #include "owl.h"
 
Index: keypress.c
===================================================================
--- keypress.c	(revision 2560529186e398f85a038e8683d29058857eb7b7)
+++ keypress.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,4 +1,2 @@
-#include <ctype.h>
-#include <string.h>
 #include "owl.h"
 
Index: logging.c
===================================================================
--- logging.c	(revision dde1b4d29c42d18950164c2f9cb244f4aaae672b)
+++ logging.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,7 +1,4 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
+#include <stdio.h>
 
 typedef struct _owl_log_entry { /* noproto */
Index: message.c
===================================================================
--- message.c	(revision 4ebbfbc5360fa004637dd101f5a0c833cdccd60a)
+++ message.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,14 +1,6 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <time.h>
 #include "owl.h"
 #include "filterproc.h"
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 static owl_fmtext_cache fmtext_cache[OWL_FMTEXT_CACHE_SIZE];
Index: messagelist.c
===================================================================
--- messagelist.c	(revision efeec7f945a0024cc21af30c2e6c2110bb5d3c6b)
+++ messagelist.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,5 +1,3 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
 
 void owl_messagelist_create(owl_messagelist *ml)
Index: owl.c
===================================================================
--- owl.c	(revision a7fac140d17626bc37808cae6b389f3240135903)
+++ owl.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -7,19 +7,9 @@
  */
 
+#include "owl.h"
 #include <stdio.h>
-#include <unistd.h>
 #include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <termios.h>
 #include <sys/stat.h>
 #include <locale.h>
-#include "owl.h"
-
 
 #if OWL_STDERR_REDIR
Index: owl.h
===================================================================
--- owl.h	(revision cbc86575b336c399f09c67886f79383681d3e36a)
+++ owl.h	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -22,13 +22,20 @@
 #endif
 #include <sys/param.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <errno.h>
 #include <EXTERN.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <regex.h>
 #include <time.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <string.h>
 #include <termios.h>
+#include <unistd.h>
 #include "libfaim/aim.h"
 #include <wchar.h>
-#include "glib.h"
+#include <glib.h>
 #ifdef HAVE_LIBZEPHYR
 #include <zephyr/zephyr.h>
Index: owl_perl.h
===================================================================
--- owl_perl.h	(revision b8a3e0025038d7a71f4d13206b772d904f95b8a0)
+++ owl_perl.h	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,4 +1,6 @@
 #ifndef INC_BARNOWL_OWL_PERL_H
 #define INC_BARNOWL_OWL_PERL_H
+
+#include <stdio.h>
 
 #define OWL_PERL_VOID_CALL (void)POPs;
Index: perlconfig.c
===================================================================
--- perlconfig.c	(revision dde1b4d29c42d18950164c2f9cb244f4aaae672b)
+++ perlconfig.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,10 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #define OWL_PERL
 #include "owl.h"
+#include <stdio.h>
 
 extern XS(boot_BarnOwl);
Index: perlglue.xs
===================================================================
--- perlglue.xs	(revision a130fc5ed65377322966cc9423b3e4674197922c)
+++ perlglue.xs	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,8 +1,3 @@
 /* -*- mode: c; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifdef HAVE_LIBZEPHYR
-#include <zephyr/zephyr.h>
-#endif
-#include <EXTERN.h>
-
 #define OWL_PERL
 #include "owl.h"
Index: regex.c
===================================================================
--- regex.c	(revision cbc86575b336c399f09c67886f79383681d3e36a)
+++ regex.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <string.h>
 #include "owl.h"
 
Index: tester.c
===================================================================
--- tester.c	(revision 67e5ba36abe583efd14108ede63b5f5f26887257)
+++ tester.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -4,8 +4,5 @@
 #undef WINDOW
 
-#include <unistd.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #undef instr
Index: text.c
===================================================================
--- text.c	(revision 14be3a516baee0a39a99eada3fd50d39455b4724)
+++ text.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,6 +1,2 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #include "owl.h"
 
Index: util.c
===================================================================
--- util.c	(revision 4ebbfbc5360fa004637dd101f5a0c833cdccd60a)
+++ util.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,13 +1,6 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <assert.h>
 #include <stdarg.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
Index: variable.c
===================================================================
--- variable.c	(revision 40de739442c05ead649a68af0f88f1009b076e44)
+++ variable.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,8 +1,4 @@
+#include "owl.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "owl.h"
 
 #define OWLVAR_BOOL(name,default,summary,description) \
Index: view.c
===================================================================
--- view.c	(revision fc8a87a009dfa6320ff6da4006791bb1b1babb7d)
+++ view.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <stdlib.h>
 #include "owl.h"
 
Index: viewwin.c
===================================================================
--- viewwin.c	(revision 6829afcb7133217c6afdbd7634452d0fabdeaa4f)
+++ viewwin.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,3 +1,2 @@
-#include <string.h>
 #include "owl.h"
 
Index: window.c
===================================================================
--- window.c	(revision 6829afcb7133217c6afdbd7634452d0fabdeaa4f)
+++ window.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,5 +1,3 @@
 #include "owl.h"
-
-#include <assert.h>
 
 struct _owl_window { /*noproto*/
Index: zephyr.c
===================================================================
--- zephyr.c	(revision c85575580186bb656ce655826ceccfa0051fe8fa)
+++ zephyr.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,9 +1,5 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+#include "owl.h"
+#include <stdio.h>
 #include <sys/stat.h>
-#include <string.h>
-#include "owl.h"
 
 #ifdef HAVE_LIBZEPHYR
Index: zwrite.c
===================================================================
--- zwrite.c	(revision 3cdd6d22718b22f0f669d34777233912c1688ed6)
+++ zwrite.c	(revision f271129fbb186598811b923e406d65f9d2b3031a)
@@ -1,6 +1,2 @@
-#include <string.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include "owl.h"
 
