diff --git a/ChangeLog b/ChangeLog
index 7a19ddc393..c97d1c83c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Aug 15 19:30:42 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* Makefile.am boundary.h boundaryF.h by_color_select.h 
+	  file_new_dialog.c fileops.h floating_sel.h gdisplay.h
+	  gdisplayF.h ink.c interface.h layer.h layerF.h paint_core.h
+	  tools.h toolsF.h: header file tweaks.  Now changing tile.h
+	  doesn't force about_dialog to recompile! :)
+
 Sat Aug 15 16:53:45 CDT 1998  Larry Ewing  <lewing@gimp.org>
 
 	* app/airbrush.c: added a debug warning to a case that previously
diff --git a/app/Makefile.am b/app/Makefile.am
index ca3b171d0c..afe71f76be 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -30,6 +30,7 @@ gimp_SOURCES = \
 	blob.h                  \
 	boundary.c		\
 	boundary.h		\
+	boundaryF.h		\
 	brightness_contrast.c	\
 	brightness_contrast.h	\
 	brush_edit.c		\
@@ -134,6 +135,7 @@ gimp_SOURCES = \
 	gdisplay.c		\
 	gdisplay.h		\
 	gdisplayP.h		\
+	gdisplayF.h		\
 	gdisplay_cmds.c		\
 	gdisplay_cmds.h		\
 	gdisplay_ops.c		\
@@ -196,6 +198,7 @@ gimp_SOURCES = \
 	iscissors.h		\
 	layer.c			\
 	layer.h			\
+	layerF.h		\
 	layer_pvt.h		\
 	layer_cmds.c		\
 	layer_cmds.h		\
@@ -286,6 +289,7 @@ gimp_SOURCES = \
 	tips_dialog.h		\
 	tools.c			\
 	tools.h			\
+	toolsF.h		\
 	transform_core.c	\
 	transform_core.h	\
 	transform_tool.c	\
diff --git a/app/base/boundary.h b/app/base/boundary.h
index 95aa9aaaa3..d2c4472606 100644
--- a/app/base/boundary.h
+++ b/app/base/boundary.h
@@ -18,9 +18,9 @@
 #ifndef  __BOUNDARY_H__
 #define  __BOUNDARY_H__
 
-#include "paint_funcs.h"
+#include "boundaryF.h"
 
-typedef struct _BoundSeg BoundSeg;
+#include "paint_funcs.h"
 
 struct _BoundSeg
 {
@@ -30,12 +30,6 @@ struct _BoundSeg
   int visited;
 };
 
-typedef enum
-{
-  WithinBounds,
-  IgnoreBounds
-} BoundaryType;
-
 
 BoundSeg *  find_mask_boundary (PixelRegion *, int *, BoundaryType, int, int, int, int);
 BoundSeg *  sort_boundary (BoundSeg *, int, int *);
diff --git a/app/boundary.h b/app/boundary.h
index 95aa9aaaa3..d2c4472606 100644
--- a/app/boundary.h
+++ b/app/boundary.h
@@ -18,9 +18,9 @@
 #ifndef  __BOUNDARY_H__
 #define  __BOUNDARY_H__
 
-#include "paint_funcs.h"
+#include "boundaryF.h"
 
-typedef struct _BoundSeg BoundSeg;
+#include "paint_funcs.h"
 
 struct _BoundSeg
 {
@@ -30,12 +30,6 @@ struct _BoundSeg
   int visited;
 };
 
-typedef enum
-{
-  WithinBounds,
-  IgnoreBounds
-} BoundaryType;
-
 
 BoundSeg *  find_mask_boundary (PixelRegion *, int *, BoundaryType, int, int, int, int);
 BoundSeg *  sort_boundary (BoundSeg *, int, int *);
diff --git a/app/boundaryF.h b/app/boundaryF.h
new file mode 100644
index 0000000000..df3697eb29
--- /dev/null
+++ b/app/boundaryF.h
@@ -0,0 +1,12 @@
+#ifndef __BOUNDARY_F_H__
+#define __BOUNDARY_F_H__
+
+typedef struct _BoundSeg BoundSeg;
+
+typedef enum
+{
+  WithinBounds,
+  IgnoreBounds
+} BoundaryType;
+
+#endif
diff --git a/app/by_color_select.h b/app/by_color_select.h
index 1ade8b9a2c..2b939b8e15 100644
--- a/app/by_color_select.h
+++ b/app/by_color_select.h
@@ -20,6 +20,8 @@
 
 #include "tools.h"
 #include "procedural_db.h"
+#include "gdisplayF.h"
+#include "gimage.h"
 
 /*  by_color select functions  */
 Tool *        tools_new_by_color_select      (void);
diff --git a/app/core/gimplayer-floating-sel.h b/app/core/gimplayer-floating-sel.h
index 665106b20d..da53ba186d 100644
--- a/app/core/gimplayer-floating-sel.h
+++ b/app/core/gimplayer-floating-sel.h
@@ -18,7 +18,9 @@
 #ifndef __FLOATING_SEL_H__
 #define __FLOATING_SEL_H__
 
-#include "layer.h"
+#include "layerF.h"
+#include "boundaryF.h"
+#include "gimpdrawableF.h"
 
 /*  Functions  */
 
diff --git a/app/core/gimplayer.h b/app/core/gimplayer.h
index 6d22ff8d9d..4c6cfcb29d 100644
--- a/app/core/gimplayer.h
+++ b/app/core/gimplayer.h
@@ -28,13 +28,7 @@
 #define APPLY   0
 #define DISCARD 1
 
-typedef enum
-{
-  WhiteMask,
-  BlackMask,
-  AlphaMask
-} AddMaskType;
-
+#include "layerF.h"
 
 /* structure declarations */
 
@@ -50,21 +44,12 @@ typedef enum
 #define GIMP_IS_LAYER_MASK(obj)               (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
 #define GIMP_IS_LAYER_MASK_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
 
-typedef struct _GimpLayer      GimpLayer;
-typedef struct _GimpLayerClass GimpLayerClass;
-typedef struct _GimpLayerMask      GimpLayerMask;
-typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
-
-typedef GimpLayer Layer;		/* convenience */
-typedef GimpLayerMask LayerMask;	/* convenience */
 
 GtkType gimp_layer_get_type (void);
 GtkType gimp_layer_mask_get_type (void);
 
 /*  Special undo types  */
 
-typedef struct _layer_undo LayerUndo;
-
 struct _layer_undo
 {
   Layer * layer;     /*  the actual layer         */
@@ -74,8 +59,6 @@ struct _layer_undo
                      /*  or a remove layer undo?  */
 };
 
-typedef struct _layer_mask_undo LayerMaskUndo;
-
 struct _layer_mask_undo
 {
   Layer * layer;     /*  the layer                */
@@ -88,8 +71,6 @@ struct _layer_mask_undo
                      /*  or a remove layer mask   */
 };
 
-typedef struct _fs_to_layer_undo FStoLayerUndo;
-
 struct _fs_to_layer_undo
 {
   Layer * layer;     /*  the layer                */
diff --git a/app/core/gimpprojection.h b/app/core/gimpprojection.h
index c61e42080f..8366050c9d 100644
--- a/app/core/gimpprojection.h
+++ b/app/core/gimpprojection.h
@@ -22,6 +22,8 @@
 #include "info_dialog.h"
 #include "selection.h"
 
+#include "gdisplayF.h"
+
 /*
  *  Global variables
  *
@@ -38,16 +40,6 @@
 /* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
 
 
-typedef enum
-{
-  SelectionOff,
-  SelectionLayerOff,
-  SelectionOn,
-  SelectionPause,
-  SelectionResume
-} SelectionControl;
-
-typedef struct _GDisplay GDisplay;
 struct _GDisplay
 {
   int ID;                         /*  unique identifier for this gdisplay     */
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index b421764c5d..2838292ca3 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -12,6 +12,7 @@
 #include "interface.h"
 #include "plug_in.h"
 #include "tile_manager_pvt.h"
+#include "gdisplay.h"
 
 typedef struct {
   GtkWidget *dlg;
diff --git a/app/display/gimpdisplay.h b/app/display/gimpdisplay.h
index c61e42080f..8366050c9d 100644
--- a/app/display/gimpdisplay.h
+++ b/app/display/gimpdisplay.h
@@ -22,6 +22,8 @@
 #include "info_dialog.h"
 #include "selection.h"
 
+#include "gdisplayF.h"
+
 /*
  *  Global variables
  *
@@ -38,16 +40,6 @@
 /* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
 
 
-typedef enum
-{
-  SelectionOff,
-  SelectionLayerOff,
-  SelectionOn,
-  SelectionPause,
-  SelectionResume
-} SelectionControl;
-
-typedef struct _GDisplay GDisplay;
 struct _GDisplay
 {
   int ID;                         /*  unique identifier for this gdisplay     */
diff --git a/app/display/gimpdisplayshell-draw.h b/app/display/gimpdisplayshell-draw.h
index 5d1cd9301a..fef60f3a1e 100644
--- a/app/display/gimpdisplayshell-draw.h
+++ b/app/display/gimpdisplayshell-draw.h
@@ -18,8 +18,8 @@
 #ifndef __INTERFACE_H__
 #define __INTERFACE_H__
 
-#include "tools.h"
-#include "gdisplay.h"
+#include "toolsF.h"
+#include "gdisplayF.h"
 
 /* typedefs */
 typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
index 5d1cd9301a..fef60f3a1e 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -18,8 +18,8 @@
 #ifndef __INTERFACE_H__
 #define __INTERFACE_H__
 
-#include "tools.h"
-#include "gdisplay.h"
+#include "toolsF.h"
+#include "gdisplayF.h"
 
 /* typedefs */
 typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
diff --git a/app/file_new_dialog.c b/app/file_new_dialog.c
index b421764c5d..2838292ca3 100644
--- a/app/file_new_dialog.c
+++ b/app/file_new_dialog.c
@@ -12,6 +12,7 @@
 #include "interface.h"
 #include "plug_in.h"
 #include "tile_manager_pvt.h"
+#include "gdisplay.h"
 
 typedef struct {
   GtkWidget *dlg;
diff --git a/app/fileops.h b/app/fileops.h
index 4d3d679a5c..7d28b62aa4 100644
--- a/app/fileops.h
+++ b/app/fileops.h
@@ -21,6 +21,8 @@
 
 #include "gtk/gtk.h"
 
+#include "gimpimageF.h"
+
 
 void file_ops_pre_init               (void);
 void file_ops_post_init              (void);
diff --git a/app/floating_sel.h b/app/floating_sel.h
index 665106b20d..da53ba186d 100644
--- a/app/floating_sel.h
+++ b/app/floating_sel.h
@@ -18,7 +18,9 @@
 #ifndef __FLOATING_SEL_H__
 #define __FLOATING_SEL_H__
 
-#include "layer.h"
+#include "layerF.h"
+#include "boundaryF.h"
+#include "gimpdrawableF.h"
 
 /*  Functions  */
 
diff --git a/app/gdisplay.h b/app/gdisplay.h
index c61e42080f..8366050c9d 100644
--- a/app/gdisplay.h
+++ b/app/gdisplay.h
@@ -22,6 +22,8 @@
 #include "info_dialog.h"
 #include "selection.h"
 
+#include "gdisplayF.h"
+
 /*
  *  Global variables
  *
@@ -38,16 +40,6 @@
 /* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
 
 
-typedef enum
-{
-  SelectionOff,
-  SelectionLayerOff,
-  SelectionOn,
-  SelectionPause,
-  SelectionResume
-} SelectionControl;
-
-typedef struct _GDisplay GDisplay;
 struct _GDisplay
 {
   int ID;                         /*  unique identifier for this gdisplay     */
diff --git a/app/gdisplayF.h b/app/gdisplayF.h
new file mode 100644
index 0000000000..88cb4ca83b
--- /dev/null
+++ b/app/gdisplayF.h
@@ -0,0 +1,15 @@
+#ifndef __GDISPLAY_F_H__
+#define __GDISPLAY_F_H__
+
+typedef enum
+{
+  SelectionOff,
+  SelectionLayerOff,
+  SelectionOn,
+  SelectionPause,
+  SelectionResume
+} SelectionControl;
+
+typedef struct _GDisplay GDisplay;
+
+#endif
diff --git a/app/gimplayer.h b/app/gimplayer.h
index 6d22ff8d9d..4c6cfcb29d 100644
--- a/app/gimplayer.h
+++ b/app/gimplayer.h
@@ -28,13 +28,7 @@
 #define APPLY   0
 #define DISCARD 1
 
-typedef enum
-{
-  WhiteMask,
-  BlackMask,
-  AlphaMask
-} AddMaskType;
-
+#include "layerF.h"
 
 /* structure declarations */
 
@@ -50,21 +44,12 @@ typedef enum
 #define GIMP_IS_LAYER_MASK(obj)               (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
 #define GIMP_IS_LAYER_MASK_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
 
-typedef struct _GimpLayer      GimpLayer;
-typedef struct _GimpLayerClass GimpLayerClass;
-typedef struct _GimpLayerMask      GimpLayerMask;
-typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
-
-typedef GimpLayer Layer;		/* convenience */
-typedef GimpLayerMask LayerMask;	/* convenience */
 
 GtkType gimp_layer_get_type (void);
 GtkType gimp_layer_mask_get_type (void);
 
 /*  Special undo types  */
 
-typedef struct _layer_undo LayerUndo;
-
 struct _layer_undo
 {
   Layer * layer;     /*  the actual layer         */
@@ -74,8 +59,6 @@ struct _layer_undo
                      /*  or a remove layer undo?  */
 };
 
-typedef struct _layer_mask_undo LayerMaskUndo;
-
 struct _layer_mask_undo
 {
   Layer * layer;     /*  the layer                */
@@ -88,8 +71,6 @@ struct _layer_mask_undo
                      /*  or a remove layer mask   */
 };
 
-typedef struct _fs_to_layer_undo FStoLayerUndo;
-
 struct _fs_to_layer_undo
 {
   Layer * layer;     /*  the layer                */
diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c
index b421764c5d..2838292ca3 100644
--- a/app/gui/file-new-dialog.c
+++ b/app/gui/file-new-dialog.c
@@ -12,6 +12,7 @@
 #include "interface.h"
 #include "plug_in.h"
 #include "tile_manager_pvt.h"
+#include "gdisplay.h"
 
 typedef struct {
   GtkWidget *dlg;
diff --git a/app/ink.c b/app/ink.c
index a6396c7f60..ca21581ad8 100644
--- a/app/ink.c
+++ b/app/ink.c
@@ -25,6 +25,7 @@
 #include "tools.h"
 #include "undo.h"
 #include "blob.h"
+#include "gdisplay.h"
 
 #include "tile.h"			/* ick. */
 
diff --git a/app/interface.h b/app/interface.h
index 5d1cd9301a..fef60f3a1e 100644
--- a/app/interface.h
+++ b/app/interface.h
@@ -18,8 +18,8 @@
 #ifndef __INTERFACE_H__
 #define __INTERFACE_H__
 
-#include "tools.h"
-#include "gdisplay.h"
+#include "toolsF.h"
+#include "gdisplayF.h"
 
 /* typedefs */
 typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
diff --git a/app/layer.h b/app/layer.h
index 6d22ff8d9d..4c6cfcb29d 100644
--- a/app/layer.h
+++ b/app/layer.h
@@ -28,13 +28,7 @@
 #define APPLY   0
 #define DISCARD 1
 
-typedef enum
-{
-  WhiteMask,
-  BlackMask,
-  AlphaMask
-} AddMaskType;
-
+#include "layerF.h"
 
 /* structure declarations */
 
@@ -50,21 +44,12 @@ typedef enum
 #define GIMP_IS_LAYER_MASK(obj)               (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
 #define GIMP_IS_LAYER_MASK_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
 
-typedef struct _GimpLayer      GimpLayer;
-typedef struct _GimpLayerClass GimpLayerClass;
-typedef struct _GimpLayerMask      GimpLayerMask;
-typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
-
-typedef GimpLayer Layer;		/* convenience */
-typedef GimpLayerMask LayerMask;	/* convenience */
 
 GtkType gimp_layer_get_type (void);
 GtkType gimp_layer_mask_get_type (void);
 
 /*  Special undo types  */
 
-typedef struct _layer_undo LayerUndo;
-
 struct _layer_undo
 {
   Layer * layer;     /*  the actual layer         */
@@ -74,8 +59,6 @@ struct _layer_undo
                      /*  or a remove layer undo?  */
 };
 
-typedef struct _layer_mask_undo LayerMaskUndo;
-
 struct _layer_mask_undo
 {
   Layer * layer;     /*  the layer                */
@@ -88,8 +71,6 @@ struct _layer_mask_undo
                      /*  or a remove layer mask   */
 };
 
-typedef struct _fs_to_layer_undo FStoLayerUndo;
-
 struct _fs_to_layer_undo
 {
   Layer * layer;     /*  the layer                */
diff --git a/app/layerF.h b/app/layerF.h
new file mode 100644
index 0000000000..174b26693b
--- /dev/null
+++ b/app/layerF.h
@@ -0,0 +1,25 @@
+#ifndef __LAYER_F_H__
+#define __LAYER_F_H__
+
+typedef enum
+{
+  WhiteMask,
+  BlackMask,
+  AlphaMask
+} AddMaskType;
+
+typedef struct _GimpLayer      GimpLayer;
+typedef struct _GimpLayerClass GimpLayerClass;
+typedef struct _GimpLayerMask      GimpLayerMask;
+typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
+
+typedef GimpLayer Layer;		/* convenience */
+typedef GimpLayerMask LayerMask;	/* convenience */
+
+typedef struct _layer_undo LayerUndo;
+
+typedef struct _layer_mask_undo LayerMaskUndo;
+
+typedef struct _fs_to_layer_undo FStoLayerUndo;
+
+#endif
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index a6396c7f60..ca21581ad8 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -25,6 +25,7 @@
 #include "tools.h"
 #include "undo.h"
 #include "blob.h"
+#include "gdisplay.h"
 
 #include "tile.h"			/* ick. */
 
diff --git a/app/paint_core.h b/app/paint_core.h
index 4432ada472..3eb3945fa1 100644
--- a/app/paint_core.h
+++ b/app/paint_core.h
@@ -21,6 +21,7 @@
 #include "draw_core.h"
 #include "temp_buf.h"
 #include "gimpbrush.h"
+#include "gimpdrawableF.h"
 
 /* the different states that the painting function can be called with  */
 #define INIT_PAINT      0
diff --git a/app/tools.h b/app/tools.h
index c2c74ac9d9..353c02a4c3 100644
--- a/app/tools.h
+++ b/app/tools.h
@@ -18,8 +18,10 @@
 #ifndef __TOOLS_H__
 #define __TOOLS_H__
 
-#include "layer.h"
-#include "gdisplay.h"
+#include "layerF.h"
+#include "gdisplayF.h"
+
+#include "toolsF.h"
 
 /*  The possible states for tools  */
 #define  INACTIVE               0
@@ -41,67 +43,9 @@
 #define  SELECTION              (1 << 1)
 #define  NON_ACTIVE_LAYER       (1 << 2)
 
+#include "toolsF.h"
 
 /*  The types of tools...  */
-typedef enum
-{
-  FIRST_TOOLBOX_TOOL,
-  RECT_SELECT = FIRST_TOOLBOX_TOOL,
-  ELLIPSE_SELECT,
-  FREE_SELECT,
-  FUZZY_SELECT,
-  BEZIER_SELECT,
-  ISCISSORS,
-  MOVE,
-  MAGNIFY,
-  CROP,
-  ROTATE,
-  SCALE,
-  SHEAR,
-  PERSPECTIVE,
-  FLIP_HORZ,
-  FLIP_VERT,
-  TEXT,
-  COLOR_PICKER,
-  BUCKET_FILL,
-  BLEND,
-  PENCIL,
-  PAINTBRUSH,
-  ERASER,
-  AIRBRUSH,
-  CLONE,
-  CONVOLVE,
-  INK,
-  LAST_TOOLBOX_TOOL = INK,
-
-  /*  Non-toolbox tools  */
-  BY_COLOR_SELECT,
-  COLOR_BALANCE,
-  BRIGHTNESS_CONTRAST,
-  HUE_SATURATION,
-  POSTERIZE,
-  THRESHOLD,
-  CURVES,
-  LEVELS,
-  HISTOGRAM
-} ToolType;
-
-/*  Structure definitions  */
-
-typedef struct _tool Tool;
-typedef struct _ToolInfo ToolInfo;
-typedef void (* ButtonPressFunc)   (Tool *, GdkEventButton *, gpointer);
-typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
-typedef void (* MotionFunc)        (Tool *, GdkEventMotion *, gpointer);
-typedef void (* ArrowKeysFunc)     (Tool *, GdkEventKey *, gpointer);
-typedef void (* CursorUpdateFunc)  (Tool *, GdkEventMotion *, gpointer);
-typedef void (* ToolCtlFunc)       (Tool *, int, gpointer);
-
-/* ToolInfo function declarations */
-typedef Tool *(* ToolInfoNewFunc)  (void);
-typedef void  (* ToolInfoFreeFunc) (Tool *);
-typedef void  (* ToolInfoInitFunc) (GDisplay *);
-
 struct _tool
 {
   /*  Data  */
diff --git a/app/tools/by_color_select.h b/app/tools/by_color_select.h
index 1ade8b9a2c..2b939b8e15 100644
--- a/app/tools/by_color_select.h
+++ b/app/tools/by_color_select.h
@@ -20,6 +20,8 @@
 
 #include "tools.h"
 #include "procedural_db.h"
+#include "gdisplayF.h"
+#include "gimage.h"
 
 /*  by_color select functions  */
 Tool *        tools_new_by_color_select      (void);
diff --git a/app/tools/gimpbycolorselecttool.h b/app/tools/gimpbycolorselecttool.h
index 1ade8b9a2c..2b939b8e15 100644
--- a/app/tools/gimpbycolorselecttool.h
+++ b/app/tools/gimpbycolorselecttool.h
@@ -20,6 +20,8 @@
 
 #include "tools.h"
 #include "procedural_db.h"
+#include "gdisplayF.h"
+#include "gimage.h"
 
 /*  by_color select functions  */
 Tool *        tools_new_by_color_select      (void);
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index a6396c7f60..ca21581ad8 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -25,6 +25,7 @@
 #include "tools.h"
 #include "undo.h"
 #include "blob.h"
+#include "gdisplay.h"
 
 #include "tile.h"			/* ick. */
 
diff --git a/app/tools/ink.c b/app/tools/ink.c
index a6396c7f60..ca21581ad8 100644
--- a/app/tools/ink.c
+++ b/app/tools/ink.c
@@ -25,6 +25,7 @@
 #include "tools.h"
 #include "undo.h"
 #include "blob.h"
+#include "gdisplay.h"
 
 #include "tile.h"			/* ick. */
 
diff --git a/app/tools/paint_core.h b/app/tools/paint_core.h
index 4432ada472..3eb3945fa1 100644
--- a/app/tools/paint_core.h
+++ b/app/tools/paint_core.h
@@ -21,6 +21,7 @@
 #include "draw_core.h"
 #include "temp_buf.h"
 #include "gimpbrush.h"
+#include "gimpdrawableF.h"
 
 /* the different states that the painting function can be called with  */
 #define INIT_PAINT      0
diff --git a/app/tools/tools.h b/app/tools/tools.h
index c2c74ac9d9..353c02a4c3 100644
--- a/app/tools/tools.h
+++ b/app/tools/tools.h
@@ -18,8 +18,10 @@
 #ifndef __TOOLS_H__
 #define __TOOLS_H__
 
-#include "layer.h"
-#include "gdisplay.h"
+#include "layerF.h"
+#include "gdisplayF.h"
+
+#include "toolsF.h"
 
 /*  The possible states for tools  */
 #define  INACTIVE               0
@@ -41,67 +43,9 @@
 #define  SELECTION              (1 << 1)
 #define  NON_ACTIVE_LAYER       (1 << 2)
 
+#include "toolsF.h"
 
 /*  The types of tools...  */
-typedef enum
-{
-  FIRST_TOOLBOX_TOOL,
-  RECT_SELECT = FIRST_TOOLBOX_TOOL,
-  ELLIPSE_SELECT,
-  FREE_SELECT,
-  FUZZY_SELECT,
-  BEZIER_SELECT,
-  ISCISSORS,
-  MOVE,
-  MAGNIFY,
-  CROP,
-  ROTATE,
-  SCALE,
-  SHEAR,
-  PERSPECTIVE,
-  FLIP_HORZ,
-  FLIP_VERT,
-  TEXT,
-  COLOR_PICKER,
-  BUCKET_FILL,
-  BLEND,
-  PENCIL,
-  PAINTBRUSH,
-  ERASER,
-  AIRBRUSH,
-  CLONE,
-  CONVOLVE,
-  INK,
-  LAST_TOOLBOX_TOOL = INK,
-
-  /*  Non-toolbox tools  */
-  BY_COLOR_SELECT,
-  COLOR_BALANCE,
-  BRIGHTNESS_CONTRAST,
-  HUE_SATURATION,
-  POSTERIZE,
-  THRESHOLD,
-  CURVES,
-  LEVELS,
-  HISTOGRAM
-} ToolType;
-
-/*  Structure definitions  */
-
-typedef struct _tool Tool;
-typedef struct _ToolInfo ToolInfo;
-typedef void (* ButtonPressFunc)   (Tool *, GdkEventButton *, gpointer);
-typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
-typedef void (* MotionFunc)        (Tool *, GdkEventMotion *, gpointer);
-typedef void (* ArrowKeysFunc)     (Tool *, GdkEventKey *, gpointer);
-typedef void (* CursorUpdateFunc)  (Tool *, GdkEventMotion *, gpointer);
-typedef void (* ToolCtlFunc)       (Tool *, int, gpointer);
-
-/* ToolInfo function declarations */
-typedef Tool *(* ToolInfoNewFunc)  (void);
-typedef void  (* ToolInfoFreeFunc) (Tool *);
-typedef void  (* ToolInfoInitFunc) (GDisplay *);
-
 struct _tool
 {
   /*  Data  */
diff --git a/app/toolsF.h b/app/toolsF.h
new file mode 100644
index 0000000000..6e683ada50
--- /dev/null
+++ b/app/toolsF.h
@@ -0,0 +1,67 @@
+#ifndef __TOOLS_F_H__
+#define __TOOLS_F_H__
+
+#include "gdisplayF.h"
+
+typedef enum
+{
+  FIRST_TOOLBOX_TOOL,
+  RECT_SELECT = FIRST_TOOLBOX_TOOL,
+  ELLIPSE_SELECT,
+  FREE_SELECT,
+  FUZZY_SELECT,
+  BEZIER_SELECT,
+  ISCISSORS,
+  MOVE,
+  MAGNIFY,
+  CROP,
+  ROTATE,
+  SCALE,
+  SHEAR,
+  PERSPECTIVE,
+  FLIP_HORZ,
+  FLIP_VERT,
+  TEXT,
+  COLOR_PICKER,
+  BUCKET_FILL,
+  BLEND,
+  PENCIL,
+  PAINTBRUSH,
+  ERASER,
+  AIRBRUSH,
+  CLONE,
+  CONVOLVE,
+  INK,
+  LAST_TOOLBOX_TOOL = INK,
+
+  /*  Non-toolbox tools  */
+  BY_COLOR_SELECT,
+  COLOR_BALANCE,
+  BRIGHTNESS_CONTRAST,
+  HUE_SATURATION,
+  POSTERIZE,
+  THRESHOLD,
+  CURVES,
+  LEVELS,
+  HISTOGRAM
+} ToolType;
+
+/*  Structure definitions  */
+
+typedef struct _tool Tool;
+typedef struct _ToolInfo ToolInfo;
+typedef void (* ButtonPressFunc)   (Tool *, GdkEventButton *, gpointer);
+typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
+typedef void (* MotionFunc)        (Tool *, GdkEventMotion *, gpointer);
+typedef void (* ArrowKeysFunc)     (Tool *, GdkEventKey *, gpointer);
+typedef void (* CursorUpdateFunc)  (Tool *, GdkEventMotion *, gpointer);
+typedef void (* ToolCtlFunc)       (Tool *, int, gpointer);
+
+/* ToolInfo function declarations */
+typedef Tool *(* ToolInfoNewFunc)  (void);
+typedef void  (* ToolInfoFreeFunc) (Tool *);
+typedef void  (* ToolInfoInitFunc) (GDisplay *);
+
+
+
+#endif
diff --git a/app/xcf.c b/app/xcf.c
index 06124b6284..540d3d6c12 100644
--- a/app/xcf.c
+++ b/app/xcf.c
@@ -18,7 +18,7 @@
 #include "interface.h"
 #include "plug_in.h"
 #include "procedural_db.h"
-#include "tile_swap.h"
+/* #include "tile_swap.h"*/
 #include "xcf.h"
 #include "frac.h"
 
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
index 06124b6284..540d3d6c12 100644
--- a/app/xcf/xcf.c
+++ b/app/xcf/xcf.c
@@ -18,7 +18,7 @@
 #include "interface.h"
 #include "plug_in.h"
 #include "procedural_db.h"
-#include "tile_swap.h"
+/* #include "tile_swap.h"*/
 #include "xcf.h"
 #include "frac.h"