Clean up includes.

src/dialog.c

@@ -23,16 +23,13 @@
 #include <stdarg.h>
 #include "global.h"
 #include "tty.h"
-#include "menu.h"
-#include "win.h"
-#include "color.h"
 #include "mouse.h"
-#include "help.h"
-#include "key.h"	/* For mi_getch() */
+#include "help.h"	/* interactive_display() */
+#include "key.h"	/* mi_getch() */
 #include "dialog.h"
-#include "layout.h"
-#include "execute.h"
-#include "main.h"
+#include "layout.h"	/* winch_flag */
+#include "execute.h"	/* suspend_cmd() */
+#include "main.h"	/* slow_terminal */
 
 #define waddc(w,y1,x1,c) move (w->y+y1, w->x+x1); addch (c)
 

src/key.c

@@ -893,12 +893,12 @@ static int getch_with_delay (void)
 /* Returns EV_MOUSE if it is a mouse event */
 /* Returns EV_NONE  if non-blocking or interrupt set and nothing was done */
 int
-get_event (Gpm_Event * event, int redo_event, int block)
+get_event (struct Gpm_Event * event, int redo_event, int block)
 {
     int c;
     static int flag;		/* Return value from select */
 #ifdef HAVE_LIBGPM
-    static Gpm_Event ev;	/* Mouse event */
+    static struct Gpm_Event ev;	/* Mouse event */
 #endif
     struct timeval timeout;
     struct timeval *time_addr = NULL;

src/key.h

@@ -1,13 +1,12 @@
 #ifndef __KEY_H
 #define __KEY_H
 
-#include "mouse.h" /* Gpm_Event */
-
 void init_key (void);
 void init_key_input_fd (void);
 void done_key (void);
 
-int get_event (Gpm_Event *event, int redo_event, int block);
+struct Gpm_Event;
+int get_event (struct Gpm_Event *event, int redo_event, int block);
 int is_idle (void);
 
 int mi_getch (void);

src/menu.h

@@ -1,7 +1,6 @@
 #ifndef __MENU_H
 #define __MENU_H
 
-#include "dialog.h"
 #include "widget.h"
 
 typedef void (*callfn) (void);

src/user.h

@@ -1,8 +1,6 @@
 #ifndef __USER_H
 #define __USER_H
 
-#include "panel.h"
-
 struct WEdit;
 void user_menu_cmd (struct WEdit *edit_widget);
 char *expand_format (struct WEdit *edit_widget, char c, int quote);

src/wtools.c

@@ -29,16 +29,13 @@
 
 #include "global.h"
 #include "tty.h"
-#include "win.h"
-#include "color.h"
-#include "mouse.h"
+#include "color.h"		/* dialog_colors */
 #include "dialog.h"
 #include "widget.h"
-#include "menu.h"
 #include "wtools.h"
-#include "key.h"	/* For mi_getch() */
-#include "complete.h"   /* INPUT_COMPLETE_CD */
-#include "background.h"   /* parent_call */
+#include "key.h"		/* mi_getch() */
+#include "complete.h"		/* INPUT_COMPLETE_CD */
+#include "background.h"		/* parent_call */
 
 
 Listbox *