Index: trunk/src/action_act.c
===================================================================
--- trunk/src/action_act.c	(revision 1845)
+++ trunk/src/action_act.c	(revision 1846)
@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include "global.h"
 #include "error.h"
 #include "action_helper.h"
 #include "hid_actions.h"
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 1845)
+++ trunk/src/action_helper.c	(revision 1846)
@@ -30,7 +30,6 @@
 
 #include "config.h"
 
-#include "global.h"
 #include "conf_core.h"
 
 #include "action_helper.h"
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 1845)
+++ trunk/src/buffer.c	(revision 1846)
@@ -33,11 +33,8 @@
 #include "conf_core.h"
 
 #include <stdlib.h>
-#include <memory.h>
 #include <math.h>
 
-#include "global.h"
-
 #include "action_helper.h"
 #include "buffer.h"
 #include "copy.h"
@@ -46,15 +43,12 @@
 #include "data.h"
 #include "error.h"
 #include "plug_io.h"
-#include "mymem.h"
 #include "mirror.h"
 #include "misc.h"
 #include "polygon.h"
-#include "rats.h"
 #include "rotate.h"
 #include "remove.h"
 #include "rtree.h"
-#include "search.h"
 #include "select.h"
 #include "set.h"
 #include "funchash_core.h"
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 1845)
+++ trunk/src/change.c	(revision 1846)
@@ -36,26 +36,17 @@
 #include <stdio.h>
 #include <setjmp.h>
 
-#include "global.h"
 #include "conf_core.h"
 
-#include "change.h"
-#include "create.h"
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
-#include "mymem.h"
 #include "misc.h"
 #include "mirror.h"
 #include "polygon.h"
-#include "rats.h"
-#include "remove.h"
 #include "rtree.h"
-#include "search.h"
 #include "select.h"
-#include "set.h"
-#include "thermal.h"
 #include "undo.h"
 #include "hid_actions.h"
 
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 1845)
+++ trunk/src/change_act.c	(revision 1846)
@@ -33,7 +33,6 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "funchash_core.h"
 
@@ -40,7 +39,6 @@
 #include "action_helper.h"
 #include "hid_actions.h"
 #include "change.h"
-#include "crosshair.h"
 #include "draw.h"
 #include "search.h"
 #include "misc.h"
Index: trunk/src/clip.c
===================================================================
--- trunk/src/clip.c	(revision 1845)
+++ trunk/src/clip.c	(revision 1846)
@@ -29,17 +29,9 @@
 
 
 #include "config.h"
-
-#include <assert.h>
+#include "clip.h"
 #include <math.h>
-#include <stdlib.h>
 
-#include "global.h"
-#include "data.h"
-#include "draw.h"
-#include "mymem.h"
-
-
 RCSID("$Id$");
 
 /* Clip the line to the clipBox
Index: trunk/src/conf_act.c
===================================================================
--- trunk/src/conf_act.c	(revision 1845)
+++ trunk/src/conf_act.c	(revision 1846)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-#include "global.h"
-#include "data.h"
-#include "action_helper.h"
 #include "conf.h"
 #include "error.h"
 
Index: trunk/src/conf_hid.c
===================================================================
--- trunk/src/conf_hid.c	(revision 1845)
+++ trunk/src/conf_hid.c	(revision 1846)
@@ -1,4 +1,3 @@
-#include "conf.h"
 #include "conf_hid.h"
 #include <genht/hash.h>
 #include <genht/htpp.h>
Index: trunk/src/copy.c
===================================================================
--- trunk/src/copy.c	(revision 1845)
+++ trunk/src/copy.c	(revision 1846)
@@ -36,18 +36,13 @@
 
 #include <stdlib.h>
 
-#include "global.h"
 
-#include "copy.h"
 #include "create.h"
 #include "data.h"
 #include "draw.h"
-#include "mymem.h"
-#include "mirror.h"
 #include "misc.h"
 #include "move.h"
 #include "polygon.h"
-#include "rats.h"
 #include "rtree.h"
 #include "select.h"
 #include "undo.h"
Index: trunk/src/create.c
===================================================================
--- trunk/src/create.c	(revision 1845)
+++ trunk/src/create.c	(revision 1846)
@@ -36,20 +36,14 @@
 #include <setjmp.h>
 #include <stdlib.h>
 
-#include "global.h"
 #include "conf_core.h"
 
 #include "create.h"
 #include "data.h"
-#include "draw.h"
 #include "error.h"
-#include "mymem.h"
 #include "misc.h"
-#include "pcb-printf.h"
-#include "polygon.h"
 #include "rtree.h"
 #include "search.h"
-#include "set.h"
 #include "undo.h"
 #include "plug_io.h"
 #include "stub_vendor.h"
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 1845)
+++ trunk/src/crosshair.c	(revision 1846)
@@ -36,7 +36,6 @@
 #include <memory.h>
 #include <math.h>
 
-#include "global.h"
 #include "conf_core.h"
 
 #include "box.h"
@@ -45,8 +44,6 @@
 #include "draw.h"
 #include "error.h"
 #include "line.h"
-#include "misc.h"
-#include "mymem.h"
 #include "rtree.h"
 #include "search.h"
 #include "polygon.h"
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 1845)
+++ trunk/src/draw.c	(revision 1846)
@@ -32,21 +32,13 @@
 
 #include "config.h"
 
-#include "global.h"
 #include "conf_core.h"
-
-/*#include "clip.h"*/
-#include "compat_misc.h"
-#include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
-#include "mymem.h"
 #include "misc.h"
 #include "rotate.h"
 #include "rtree.h"
-#include "search.h"
-#include "select.h"
 #include "print.h"
 #include "hid_helper.h"
 
Index: trunk/src/drill.c
===================================================================
--- trunk/src/drill.c	(revision 1845)
+++ trunk/src/drill.c	(revision 1846)
@@ -29,17 +29,10 @@
  */
 #include "config.h"
 
-
-#include "data.h"
-#include "error.h"
 #include "mymem.h"
 
-
 RCSID("$Id$");
 
-
-
-
 /*
  * some local prototypes
  */
Index: trunk/src/error.c
===================================================================
--- trunk/src/error.c	(revision 1845)
+++ trunk/src/error.c	(revision 1846)
@@ -56,12 +56,9 @@
 #include "error.h"
 #include "plug_io.h"
 
-#include "misc.h"
 
-
 RCSID("$Id$");
 
-
 #define utf8_dup_string(a,b) *(a) = strdup(b)
 
 /* ----------------------------------------------------------------------
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 1845)
+++ trunk/src/file_act.c	(revision 1846)
@@ -26,18 +26,14 @@
  */
 #include "config.h"
 #include "conf_core.h"
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
 #include "error.h"
-#include "undo.h"
 
 #include "crosshair.h"
 #include "set.h"
 #include "plug_io.h"
 #include "buffer.h"
-#include "mymem.h"
 #include "misc.h"
 #include "remove.h"
 #include "create.h"
Index: trunk/src/find.c
===================================================================
--- trunk/src/find.c	(revision 1845)
+++ trunk/src/find.c	(revision 1846)
@@ -77,19 +77,14 @@
 #include <sys/times.h>
 #endif
 
-#include "global.h"
 #include "conf_core.h"
-
-#include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
 #include "find.h"
-#include "mymem.h"
 #include "misc.h"
 #include "rtree.h"
 #include "polygon.h"
-#include "pcb-printf.h"
 #include "search.h"
 #include "set.h"
 #include "undo.h"
Index: trunk/src/find_act.c
===================================================================
--- trunk/src/find_act.c	(revision 1845)
+++ trunk/src/find_act.c	(revision 1846)
@@ -26,15 +26,10 @@
  */
 #include "config.h"
 #include "conf_core.h"
-#include "global.h"
 #include "data.h"
-#include "action_helper.h"
-#include "change.h"
 #include "error.h"
-#include "undo.h"
+#include "find.h"
 
-#include "find.h"
-#include "pcb-printf.h"
 /* -------------------------------------------------------------------------- */
 
 static const char drc_syntax[] = "DRC()";
Index: trunk/src/flags.c
===================================================================
--- trunk/src/flags.c	(revision 1845)
+++ trunk/src/flags.c	(revision 1846)
@@ -33,9 +33,7 @@
 #include <string.h>
 #endif
 
-#include "global.h"
 #include "data.h"
-#include "pcb-printf.h"
 #include "hid_flags.h"
 
 
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 1845)
+++ trunk/src/gui_act.c	(revision 1846)
@@ -26,10 +26,8 @@
  */
 #include "config.h"
 #include "conf_core.h"
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
 #include "error.h"
 #include "undo.h"
 #include "funchash_core.h"
Index: trunk/src/heap.c
===================================================================
--- trunk/src/heap.c	(revision 1845)
+++ trunk/src/heap.c	(revision 1846)
@@ -34,12 +34,8 @@
 /* operations on heaps.
  */
 
+#include <assert.h>
 #include "config.h"
-
-#include "global.h"
-
-#include <assert.h>
-
 #include "heap.h"
 
 
Index: trunk/src/hid_actions.c
===================================================================
--- trunk/src/hid_actions.c	(revision 1845)
+++ trunk/src/hid_actions.c	(revision 1846)
@@ -11,12 +11,8 @@
 #include <genht/hash.h>
 #include <genht/htsp.h>
 
-#include "global.h"
-#include "data.h"
 #include "error.h"
 #include "event.h"
-
-#include "hid.h"
 #include "hid_actions.h"
 
 RCSID("$Id$");
Index: trunk/src/hid_attrib.c
===================================================================
--- trunk/src/hid_attrib.c	(revision 1845)
+++ trunk/src/hid_attrib.c	(revision 1846)
@@ -3,7 +3,6 @@
 #include "config.h"
 #include "global.h"
 #include "hid_attrib.h"
-#include "hid_helper.h"
 #include "misc.h"
 #include "pcb-printf.h"
 #include "compat_fs.h"
Index: trunk/src/hid_cfg.c
===================================================================
--- trunk/src/hid_cfg.c	(revision 1845)
+++ trunk/src/hid_cfg.c	(revision 1846)
@@ -27,10 +27,8 @@
 #include <liblihata/tree.h>
 
 #include "global.h"
-#include "hid.h"
 #include "hid_cfg.h"
 #include "hid_actions.h"
-#include "hid_cfg.h"
 #include "error.h"
 #include "paths.h"
 
Index: trunk/src/hid_flags.c
===================================================================
--- trunk/src/hid_flags.c	(revision 1845)
+++ trunk/src/hid_flags.c	(revision 1846)
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "global.h"
 #include "data.h"
 #include "misc.h"
 #include "conf.h"
Index: trunk/src/hid_helper.c
===================================================================
--- trunk/src/hid_helper.c	(revision 1845)
+++ trunk/src/hid_helper.c	(revision 1846)
@@ -26,7 +26,6 @@
  */
 
 #include "config.h"
-#include "global.h"
 #include "data.h"
 #include "misc.h"
 #include "hid_helper.h"
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 1845)
+++ trunk/src/hid_init.c	(revision 1846)
@@ -26,18 +26,13 @@
 /* for dlopen() and friends on windows */
 #include "compat_dl.h"
 
-#include "error.h"
 #include "global.h"
 #include "misc.h"
-#include "pcb-printf.h"
 #include "plugins.h"
 #include "hid_attrib.h"
 #include "hid_flags.h"
 
-/* for MKDIR() */
-#include "compat_fs.h"
 
-
 RCSID("$Id$");
 
 HID **hid_list = 0;
Index: trunk/src/insert.c
===================================================================
--- trunk/src/insert.c	(revision 1845)
+++ trunk/src/insert.c	(revision 1846)
@@ -33,17 +33,12 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
-
-#include "copy.h"
 #include "create.h"
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
-#include "insert.h"
 #include "line.h"
 #include "misc.h"
-#include "move.h"
 #include "polygon.h"
 #include "rtree.h"
 #include "search.h"
Index: trunk/src/intersect.c
===================================================================
--- trunk/src/intersect.c	(revision 1845)
+++ trunk/src/intersect.c	(revision 1846)
@@ -36,15 +36,10 @@
 
 #include "config.h"
 
-#include "global.h"
-
 #include <assert.h>
 
-#include "data.h"
 #include "intersect.h"
-#include "mymem.h"
 
-
 RCSID("$Id$");
 
 
Index: trunk/src/line.c
===================================================================
--- trunk/src/line.c	(revision 1845)
+++ trunk/src/line.c	(revision 1846)
@@ -34,8 +34,6 @@
 #include <setjmp.h>
 #include <stdlib.h>
 
-
-#include "global.h"
 #include "data.h"
 #include "crosshair.h"
 #include "find.h"
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 1845)
+++ trunk/src/main.c	(revision 1846)
@@ -42,7 +42,6 @@
 #include <time.h>								/* Seed for srand() */
 #include <locale.h>
 
-#include "global.h"
 #include "data.h"
 #include "buffer.h"
 #include "create.h"
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 1845)
+++ trunk/src/main_act.c	(revision 1846)
@@ -27,11 +27,10 @@
 
 #include "config.h"
 
-#include "global.h"
-#include "error.h"
 #include "action_helper.h"
 #include "hid_actions.h"
 #include "hid_attrib.h"
+#include "hid_init.h"
 #include "hid.h"
 #include "data.h"
 
Index: trunk/src/mirror.c
===================================================================
--- trunk/src/mirror.c	(revision 1845)
+++ trunk/src/mirror.c	(revision 1846)
@@ -37,18 +37,11 @@
 
 #include <stdlib.h>
 
-#include "global.h"
-
 #include "data.h"
-#include "draw.h"
 #include "mirror.h"
 #include "misc.h"
 #include "polygon.h"
-#include "search.h"
-#include "select.h"
-#include "set.h"
 
-
 RCSID("$Id$");
 
 
Index: trunk/src/misc.c
===================================================================
--- trunk/src/misc.c	(revision 1845)
+++ trunk/src/misc.c	(revision 1846)
@@ -50,29 +50,19 @@
 #include <unistd.h>
 #endif
 
-#include "global.h"
-
 #include "box.h"
 #include "crosshair.h"
-#include "create.h"
 #include "data.h"
-#include "draw.h"
 #include "plug_io.h"
 #include "error.h"
-#include "mymem.h"
 #include "misc.h"
 #include "move.h"
-#include "pcb-printf.h"
 #include "polygon.h"
-#include "remove.h"
 #include "rtree.h"
 #include "rotate.h"
 #include "rubberband.h"
-#include "search.h"
 #include "set.h"
 #include "undo.h"
-#include "action_helper.h"
-#include "compat_fs.h"
 #include "compat_misc.h"
 #include "hid_actions.h"
 #include "hid_init.h"
Index: trunk/src/move.c
===================================================================
--- trunk/src/move.c	(revision 1845)
+++ trunk/src/move.c	(revision 1846)
@@ -36,21 +36,16 @@
 #include <setjmp.h>
 #include <stdlib.h>
 
-#include "global.h"
-
 #include "create.h"
-#include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
 #include "misc.h"
 #include "move.h"
-#include "mymem.h"
 #include "polygon.h"
 #include "rtree.h"
 #include "search.h"
 #include "select.h"
-#include "thermal.h"
 #include "undo.h"
 #include "hid_actions.h"
 
Index: trunk/src/mymem.c
===================================================================
--- trunk/src/mymem.c	(revision 1845)
+++ trunk/src/mymem.c	(revision 1846)
@@ -32,15 +32,10 @@
 
 #include "config.h"
 
-#include "global.h"
-
 #include <memory.h>
 
 #include "data.h"
-#include "error.h"
 #include "mymem.h"
-#include "misc.h"
-#include "rats.h"
 #include "rtree.h"
 #include "rats_patch.h"
 
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 1845)
+++ trunk/src/netlist.c	(revision 1846)
@@ -41,17 +41,13 @@
 #include <regex.h>
 #endif
 
-#include "global.h"
 #include "action_helper.h"
-#include "buffer.h"
 #include "data.h"
 #include "error.h"
 #include "plug_io.h"
 #include "find.h"
 #include "mymem.h"
-#include "misc.h"
 #include "rats.h"
-#include "set.h"
 #include "create.h"
 #include "rats_patch.h"
 #include "hid_actions.h"
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 1845)
+++ trunk/src/object_act.c	(revision 1846)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
 #include "change.h"
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 1845)
+++ trunk/src/plug_footprint.c	(revision 1846)
@@ -25,12 +25,7 @@
  */
 
 #include "config.h"
-#include "global.h"
 
-#include "data.h"
-#include "plug_io.h"
-#include "mymem.h"
-#include "paths.h"
 #include "plug_footprint.h"
 #include "plugins.h"
 
Index: trunk/src/plug_footprint_host.c
===================================================================
--- trunk/src/plug_footprint_host.c	(revision 1845)
+++ trunk/src/plug_footprint_host.c	(revision 1846)
@@ -34,9 +34,6 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
-#include "data.h"
-#include "plug_io.h"
 #include "plug_footprint.h"
 #include "plugins.h"
 #include "error.h"
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 1845)
+++ trunk/src/plug_io.c	(revision 1846)
@@ -85,21 +85,12 @@
 #include "buffer.h"
 #include "change.h"
 #include "create.h"
-#include "crosshair.h"
 #include "data.h"
 #include "error.h"
 #include "plug_io.h"
-#include "hid.h"
 #include "misc.h"
-#include "move.h"
-#include "mymem.h"
-#include "pcb-printf.h"
-#include "polygon.h"
-#include "rats.h"
 #include "remove.h"
 #include "set.h"
-#include "strflags.h"
-#include "compat_fs.h"
 #include "paths.h"
 #include "rats_patch.h"
 #include "stub_edif.h"
@@ -106,7 +97,6 @@
 #include "hid_actions.h"
 #include "hid_flags.h"
 #include "plugins.h"
-#include "plug_io.h"
 
 plug_io_t *plug_io_chain = NULL;
 
Index: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	(revision 1845)
+++ trunk/src/plugins.c	(revision 1846)
@@ -30,10 +30,8 @@
 #include "plugins.h"
 
 /* for the action */
+#include "global.h"
 #include "config.h"
-#include "global.h"
-#include "data.h"
-#include "action_helper.h"
 #include "genvector/gds_char.h"
 
 plugin_info_t *plugins = NULL;
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 1845)
+++ trunk/src/polygon.c	(revision 1846)
@@ -79,7 +79,6 @@
 #include <memory.h>
 #include <setjmp.h>
 
-#include "global.h"
 #include "box.h"
 #include "create.h"
 #include "crosshair.h"
@@ -86,10 +85,6 @@
 #include "data.h"
 #include "draw.h"
 #include "error.h"
-#include "find.h"
-#include "misc.h"
-#include "move.h"
-#include "pcb-printf.h"
 #include "polygon.h"
 #include "remove.h"
 #include "rtree.h"
Index: trunk/src/polygon1.c
===================================================================
--- trunk/src/polygon1.c	(revision 1845)
+++ trunk/src/polygon1.c	(revision 1846)
@@ -46,7 +46,6 @@
 #include	<math.h>
 #include	<string.h>
 
-#include "global.h"
 #include "rtree.h"
 #include "heap.h"
 
Index: trunk/src/polygon_act.c
===================================================================
--- trunk/src/polygon_act.c	(revision 1845)
+++ trunk/src/polygon_act.c	(revision 1846)
@@ -27,11 +27,8 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
-#include "error.h"
 #include "undo.h"
 #include "funchash_core.h"
 
Index: trunk/src/print.c
===================================================================
--- trunk/src/print.c	(revision 1845)
+++ trunk/src/print.c	(revision 1846)
@@ -37,8 +37,6 @@
  */
 #include "config.h"
 
-#include "global.h"
-
 #include <time.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -49,18 +47,11 @@
 #include "data.h"
 #include "draw.h"
 #include "drill.h"
-#include "plug_io.h"
-#include "find.h"
-#include "error.h"
 #include "misc.h"
 #include "print.h"
 #include "polygon.h"
-#include "rtree.h"
-#include "search.h"
 
-#include "hid.h"
 
-
 RCSID("$Id$");
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 1845)
+++ trunk/src/rats.c	(revision 1846)
@@ -41,20 +41,15 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "global.h"
-
 #include "create.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
-#include "plug_io.h"
 #include "find.h"
 #include "misc.h"
-#include "mymem.h"
 #include "polygon.h"
 #include "rats.h"
 #include "search.h"
-#include "set.h"
 #include "undo.h"
 #include "stub_mincut.h"
 
Index: trunk/src/rats_act.c
===================================================================
--- trunk/src/rats_act.c	(revision 1845)
+++ trunk/src/rats_act.c	(revision 1846)
@@ -27,10 +27,8 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
 #include "error.h"
 #include "undo.h"
 #include "set.h"
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 1845)
+++ trunk/src/rats_patch.c	(revision 1846)
@@ -30,11 +30,8 @@
 #include "genht/hash.h"
 #include "create.h"
 
-/* for the actions */
 #include "config.h"
-#include "global.h"
 #include "data.h"
-#include "action_helper.h"
 #include "error.h"
 #include "buffer.h"
 #include "remove.h"
Index: trunk/src/remove.c
===================================================================
--- trunk/src/remove.c	(revision 1845)
+++ trunk/src/remove.c	(revision 1846)
@@ -36,21 +36,14 @@
 #include <setjmp.h>
 #include <memory.h>
 
-#include "global.h"
-
 #include "data.h"
 #include "draw.h"
-#include "error.h"
 #include "misc.h"
 #include "move.h"
-#include "mymem.h"
 #include "polygon.h"
-#include "rats.h"
 #include "remove.h"
 #include "rtree.h"
-#include "search.h"
 #include "select.h"
-#include "set.h"
 #include "undo.h"
 
 
Index: trunk/src/remove_act.c
===================================================================
--- trunk/src/remove_act.c	(revision 1845)
+++ trunk/src/remove_act.c	(revision 1846)
@@ -25,12 +25,8 @@
  *
  */
 #include "config.h"
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
-#include "error.h"
-#include "undo.h"
 #include "set.h"
 #include "remove.h"
 #include "funchash_core.h"
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 1845)
+++ trunk/src/rotate.c	(revision 1846)
@@ -34,9 +34,6 @@
 
 #include <stdlib.h>
 
-#include "global.h"
-
-#include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
Index: trunk/src/rtree.c
===================================================================
--- trunk/src/rtree.c	(revision 1845)
+++ trunk/src/rtree.c	(revision 1846)
@@ -38,13 +38,9 @@
  */
 #include "config.h"
 
-#include "global.h"
-
 #include <assert.h>
 #include <setjmp.h>
 
-#include "mymem.h"
-
 #include "rtree.h"
 
 
Index: trunk/src/rubberband.c
===================================================================
--- trunk/src/rubberband.c	(revision 1845)
+++ trunk/src/rubberband.c	(revision 1846)
@@ -42,16 +42,12 @@
 #include <unistd.h>
 #endif
 
-#include "global.h"
-
 #include "create.h"
 #include "data.h"
 #include "error.h"
 #include "misc.h"
 #include "polygon.h"
-#include "rubberband.h"
 #include "rtree.h"
-#include "search.h"
 
 
 RCSID("$Id$");
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 1845)
+++ trunk/src/search.c	(revision 1846)
@@ -37,14 +37,10 @@
 #include <math.h>
 #include <setjmp.h>
 
-#include "global.h"
-
 #include "box.h"
 #include "data.h"
-#include "draw.h"
 #include "error.h"
 #include "find.h"
-#include "misc.h"
 #include "polygon.h"
 #include "rtree.h"
 #include "search.h"
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 1845)
+++ trunk/src/select.c	(revision 1846)
@@ -33,8 +33,6 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
-
 #include "data.h"
 #include "draw.h"
 #include "error.h"
Index: trunk/src/select_act.c
===================================================================
--- trunk/src/select_act.c	(revision 1845)
+++ trunk/src/select_act.c	(revision 1846)
@@ -27,15 +27,12 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
 #include "error.h"
 #include "undo.h"
 #include "funchash_core.h"
 
-#include "search.h"
 #include "select.h"
 #include "crosshair.h"
 #include "set.h"
Index: trunk/src/set.c
===================================================================
--- trunk/src/set.c	(revision 1845)
+++ trunk/src/set.c	(revision 1846)
@@ -41,17 +41,13 @@
 #include <string.h>
 #endif
 
-#include "global.h"
-
 #include "action_helper.h"
 #include "buffer.h"
-#include "compat_misc.h"
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
 #include "find.h"
-#include "misc.h"
 #include "set.h"
 #include "undo.h"
 #include "hid_actions.h"
Index: trunk/src/strflags.c
===================================================================
--- trunk/src/strflags.c	(revision 1845)
+++ trunk/src/strflags.c	(revision 1846)
@@ -36,10 +36,7 @@
 #include <string.h>
 #endif
 
-#include "globalconst.h"
 #include "global.h"
-#include "compat_misc.h"
-#include "const.h"
 #include "strflags.h"
 
 
Index: trunk/src/stub_mincut.c
===================================================================
--- trunk/src/stub_mincut.c	(revision 1845)
+++ trunk/src/stub_mincut.c	(revision 1846)
@@ -22,8 +22,6 @@
 
 #include "config.h"
 #include "global.h"
-#include "error.h"
-#include "data.h"
 #include "stub_mincut.h"
 
 static void stub_rat_proc_shorts_dummy(void)
Index: trunk/src/thermal.c
===================================================================
--- trunk/src/thermal.c	(revision 1845)
+++ trunk/src/thermal.c	(revision 1846)
@@ -56,18 +56,9 @@
 #include <pwd.h>
 #endif
 
-#include "global.h"
-
-#include "create.h"
-#include "data.h"
-#include "draw.h"
-#include "error.h"
 #include "misc.h"
-#include "move.h"
 #include "polygon.h"
-#include "rtree.h"
 #include "thermal.h"
-#include "undo.h"
 
 
 RCSID("$Id$");
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 1845)
+++ trunk/src/undo.c	(revision 1846)
@@ -46,7 +46,6 @@
 
 #include <assert.h>
 #include <memory.h>
-#include "global.h"
 
 #include "buffer.h"
 #include "change.h"
@@ -58,7 +57,6 @@
 #include "misc.h"
 #include "mirror.h"
 #include "move.h"
-#include "mymem.h"
 #include "polygon.h"
 #include "remove.h"
 #include "rotate.h"
Index: trunk/src/undo_act.c
===================================================================
--- trunk/src/undo_act.c	(revision 1845)
+++ trunk/src/undo_act.c	(revision 1846)
@@ -27,10 +27,8 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "global.h"
 #include "data.h"
 #include "action_helper.h"
-#include "change.h"
 #include "error.h"
 #include "funchash_core.h"