remove some (hopefully) unneeded header includes

src/ButtonTool.hh

@@ -25,7 +25,8 @@
 #define BUTTONTOOL_HH
 
 #include "GenericTool.hh"
-#include "FbTk/Observer.hh"
+
+#include <X11/Xlib.h>
 
 class ButtonTheme;
 

src/ClientMenu.hh

@@ -24,8 +24,6 @@
 #ifndef CLIENTMENU_HH
 #define CLIENTMENU_HH
 
-#include <list>
-
 #include "FbMenu.hh"
 
 class BScreen;

src/CommandDialog.hh

@@ -27,12 +27,11 @@
 
 #include "FbTk/TextBox.hh"
 #include "FbTk/TextButton.hh"
-#include "FbTk/Font.hh"
 #include "FbTk/GContext.hh"
-#include "FbTk/Command.hh"
 #include "FbTk/RefCount.hh"
 
 class BScreen;
+class Command;
 
 /**
  * Displays a fluxbox command dialog which executes fluxbox

src/Ewmh.cc

@@ -38,6 +38,7 @@
 #include "FbTk/XLayerItem.hh"
 #include "FbTk/XLayer.hh"
 
+#include <X11/Xatom.h>
 #include <iostream>
 #include <algorithm>
 #include <new>

src/Ewmh.hh

@@ -23,11 +23,6 @@
 
 #include "AtomHandler.hh"
 #include "FbTk/FbString.hh"
-#include "AttentionNoticeHandler.hh"
-
-#include <X11/Xatom.h>
-#include <vector>
-#include <map>
 
 /// Implementes Extended Window Manager Hints ( http://www.freedesktop.org/Standards/wm-spec )
 class Ewmh:public AtomHandler {

src/FbAtoms.hh

@@ -24,7 +24,6 @@
 #define FBATOMS_HH
 
 #include <X11/Xlib.h>
-#include <X11/Xatom.h>
 
 /// atom handler for basic X atoms
 class FbAtoms {

src/FbMenu.hh

@@ -26,7 +26,6 @@
 
 #include "Menu.hh"
 #include "XLayerItem.hh"
-#include <memory>
 
 namespace FbTk {
 class MenuTheme;

src/FbTk/BoolMenuItem.hh

@@ -23,10 +23,11 @@
 #define FBTK_BOOLMENUITEM_HH
 
 #include "MenuItem.hh"
-#include "Accessor.hh"
 
 namespace FbTk {
 
+class Accessor<class T>;
+
 /// a bool menu item
 class BoolMenuItem: public FbTk::MenuItem {
 public:

src/FbTk/Button.hh

@@ -33,7 +33,6 @@
 #include "Text.hh"
 
 #include <X11/Xlib.h>
-#include <memory>
 
 namespace FbTk {
 

src/FbTk/Color.hh

@@ -27,8 +27,6 @@
 #ifndef FBTK_COLOR_HH
 #define FBTK_COLOR_HH
 
-#include "NotCopyable.hh"
-
 namespace FbTk {
 
 /// Allocates rgb color and pixel value

src/FbTk/Container.hh

@@ -29,7 +29,6 @@
 #include "Text.hh" // for Orientation
 
 #include <list>
-#include <functional>
 
 namespace FbTk {
 

src/FbTk/EventManager.cc

@@ -22,6 +22,7 @@
 // $Id$
 
 #include "EventManager.hh"
+#include "EventHandler.hh"
 #include "FbWindow.hh"
 #include "App.hh"
 

src/FbTk/EventManager.hh

@@ -21,12 +21,13 @@
 
 // $Id$
 
-#include "EventHandler.hh"
 #include <map>
+#include <X11/Xlib.h>
 
 namespace FbTk {
 
 class FbWindow;
+class EventHandler;
 
 /**
    singleton mediator for EventHandlers

src/FbTk/Font.hh

@@ -25,7 +25,6 @@
 #define FBTK_FONT_HH
 
 #include <X11/Xlib.h>
-#include <X11/Xresource.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/FbTk/FontImp.hh

@@ -24,13 +24,11 @@
 #ifndef FBTK_FONTIMP_HH
 #define FBTK_FONTIMP_HH
 
-#include "Color.hh"
+#include "Text.hh"
-#include "Font.hh"
+#include "FbString.hh"
 
 #include <X11/Xlib.h>
 
-#include <string>
-
 namespace FbTk {
 
 class FbDrawable;

src/FbTk/ImageControl.hh

@@ -34,9 +34,7 @@
 #include "NotCopyable.hh"
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <list>
-#include <set>
 
 namespace FbTk {
 

src/FbTk/IntMenuItem.hh

@@ -23,12 +23,13 @@
 #define FBTK_INTMENUITEM_HH
 
 #include "MenuItem.hh"
-#include "Accessor.hh"
 
 #include <string>
 
 namespace FbTk {
 
+class Accessor<class T>;
+
 /// Changes an resource integer value between min and max
 class IntMenuItem: public FbTk::MenuItem {
 public:

src/FbTk/KeyUtil.cc

@@ -24,6 +24,8 @@
 #include "KeyUtil.hh"
 #include "App.hh"
 
+#include <X11/keysym.h>
+
 #include <string>
 #ifdef HAVE_CSTRING
   #include <cstring>

src/FbTk/KeyUtil.hh

@@ -25,7 +25,6 @@
 #define FBTK_KEYUTIL_HH
 
 #include <X11/Xlib.h>
-#include <X11/keysym.h>
 
 #include <memory>
 

src/FbTk/Menu.cc

@@ -45,6 +45,7 @@
 #include "SimpleCommand.hh"
 #include "FbPixmap.hh"
 
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 

src/FbTk/Menu.hh

@@ -34,10 +34,7 @@
 
 #include "FbWindow.hh"
 #include "EventHandler.hh"
-#include "RefCount.hh"
-#include "Command.hh"
 #include "Observer.hh"
-#include "FbPixmap.hh"
 #include "MenuTheme.hh"
 #include "Timer.hh"
 #include "FbString.hh"
@@ -45,8 +42,10 @@
 
 namespace FbTk {
 
+class Command;
 class MenuItem;
 class ImageControl;
+class RefCount<class T>;
 
 ///   Base class for menus
 class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer,

src/FbTk/MenuTheme.hh

@@ -30,7 +30,6 @@
 #include "Shape.hh"
 #include "Texture.hh"
 #include "Text.hh"
-#include "Subject.hh"
 #include "PixmapWithMask.hh"
 #include "GContext.hh"
 

src/FbTk/MultLayers.cc

@@ -26,6 +26,7 @@
 #include "XLayer.hh"
 #include "XLayerItem.hh"
 #include "App.hh"
+#include "FbWindow.hh"
 
 using namespace FbTk;
 

src/FbTk/MultiButtonMenuItem.cc

@@ -24,6 +24,7 @@
 
 #include "MultiButtonMenuItem.hh"
 #include "PixmapWithMask.hh"
+#include "Command.hh"
 
 namespace FbTk {
 

src/FbTk/Resource.hh

@@ -31,16 +31,12 @@
 #include <list>
 #include <iostream>
 
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
 #include <exception>
 #include <typeinfo>
 #include "XrmDatabaseHelper.hh"
 
 namespace FbTk {
 
-class XrmDatabaseHelper;
-
 class ResourceException: public std::exception {
 public:
     ResourceException(const std::string &err):

src/FbTk/SearchResult.cc

@@ -20,7 +20,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "SearchResult.hh"
-#include <vector>
+#include "ITypeAheadable.hh"
 
 namespace FbTk {
 

src/FbTk/SearchResult.hh

@@ -23,10 +23,12 @@
 #define FBTK_SEARCHRESULT_HH
 
 #include <vector>
-#include "ITypeAheadable.hh"
+#include <string>
 
 namespace FbTk {
 
+class ITypeAheadable;
+
 class SearchResult {
 public:
     typedef std::vector < ITypeAheadable* > BaseItems;

src/FbTk/Shape.hh

@@ -25,7 +25,6 @@
 #include "FbPixmap.hh"
 
 #include <X11/Xlib.h>
-#include <memory>
 #include <vector>
 
 namespace FbTk {

src/FbTk/TextBox.hh

@@ -25,8 +25,6 @@
 #define FBTK_TEXTBOX_HH
 
 #include "FbWindow.hh"
-#include "Color.hh"
-#include "Text.hh"
 #include "EventHandler.hh"
 
 #include <string>

src/FbTk/TextButton.hh

@@ -26,7 +26,6 @@
 
 #include "Button.hh"
 #include "Text.hh"
-#include "FbPixmap.hh"
 
 #include <string>
 

src/FbTk/TextureRender.cc

@@ -32,6 +32,8 @@
 #include "GContext.hh"
 #include "I18n.hh"
 
+#include <X11/Xutil.h>
+
 #include <iostream>
 #include <string>
 #ifdef HAVE_CSTDIO

src/FbTk/TextureRender.hh

@@ -27,15 +27,15 @@
 #ifndef FBTK_TEXTURRENDER_HH
 #define FBTK_TEXTURRENDER_HH
 
-#include "Texture.hh"
 #include "Text.hh"
 
 #include <X11/Xlib.h>
 
 namespace FbTk {
 
+class Color;
 class ImageControl;
-
+class Texture;
 
 /// Renders texture to pixmap
 /**

src/FbTk/XLayer.cc

@@ -25,6 +25,8 @@
 #include "XLayer.hh"
 #include "XLayerItem.hh"
 #include "App.hh"
+#include "FbWindow.hh"
+#include "MultLayers.hh"
 
 #include <iostream>
 

src/FbTk/XLayer.hh

@@ -28,10 +28,10 @@
 
 #include <list>
 #include "Layer.hh"
-#include "MultLayers.hh"
 
 namespace FbTk {
 
+class MultLayers;
 class XLayerItem;
 
 class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > {

src/FbTk/XLayerItem.hh

@@ -28,10 +28,11 @@
 #include "LayerItem.hh"
 #include "XLayer.hh"
 #include "NotCopyable.hh"
-#include "FbWindow.hh"
 
 namespace FbTk {
 
+class FbWindow;
+
 class XLayerItem : public LayerItem, private NotCopyable {
 public:
     typedef std::list<FbWindow *> Windows;

src/FbTk/XrmDatabaseHelper.hh

@@ -25,7 +25,6 @@
 #ifndef FBTK_XRMDATABASEHELPER_HH
 #define FBTK_XRMDATABASEHELPER_HH
 
-#include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
 /**

src/FbWinFrame.hh

@@ -29,7 +29,6 @@
 #include "FbTk/RefCount.hh"
 #include "FbTk/Observer.hh"
 #include "FbTk/Color.hh"
-#include "FbTk/FbPixmap.hh"
 #include "FbTk/XLayerItem.hh"
 #include "FbTk/TextButton.hh"
 #include "FbTk/DefaultValue.hh"
@@ -47,10 +46,8 @@ class IconButton;
 class Focusable;
 
 namespace FbTk {
-class TextButton;
 class ImageControl;
 class Command;
-class Button;
 class Texture;
 class XLayer;
 }

src/FbWinFrameTheme.hh

@@ -26,11 +26,9 @@
 
 #include "FbTk/Font.hh"
 #include "FbTk/Texture.hh"
-#include "FbTk/Text.hh"
 #include "FbTk/Color.hh"
 #include "FbTk/Theme.hh"
 #include "FbTk/BorderTheme.hh"
-#include "FbTk/Subject.hh"
 #include "FbTk/GContext.hh"
 #include "FbTk/Shape.hh"
 

src/FocusModelMenuItem.hh

@@ -28,7 +28,10 @@
 
 #include "FbTk/MenuItem.hh"
 #include "FbTk/RefCount.hh"
-#include "FbTk/Command.hh"
+
+namespace FbTk {
+class Command;
+}
 
 #include "FocusControl.hh"
 

src/GenericTool.cc

@@ -23,6 +23,7 @@
 
 #include "GenericTool.hh"
 #include "FbTk/FbWindow.hh"
+#include "ToolTheme.hh"
 
 #include <string>
 

src/GenericTool.hh

@@ -25,13 +25,14 @@
 #define GENERICTOOL_HH
 
 #include "ToolbarItem.hh"
-#include "ToolTheme.hh"
 
 #include "FbTk/NotCopyable.hh"
 #include "FbTk/Observer.hh"
 
 #include <memory>
 
+class ToolTheme;
+
 namespace FbTk {
 class FbWindow;
 }

src/IconbarTool.hh

@@ -27,13 +27,11 @@
 
 #include "ToolbarItem.hh"
 #include "FbMenu.hh"
-#include "FocusableList.hh"
 
 #include "FbTk/Container.hh"
 #include "FbTk/CachedPixmap.hh"
 #include "FbTk/Observer.hh"
 #include "FbTk/Resource.hh"
-#include "FbTk/Menu.hh"
 
 #include <X11/Xlib.h>
 
@@ -43,6 +41,7 @@ class IconbarTheme;
 class BScreen;
 class IconButton;
 class Focusable;
+class FocusableList;
 
 class IconbarTool: public ToolbarItem, public FbTk::Observer {
 public:

src/MenuCreator.hh

@@ -25,7 +25,6 @@
 
 #include "FbTk/FbString.hh"
 
-#include <string>
 #include <list>
 
 namespace FbTk {

src/PlacementStrategy.hh

@@ -24,9 +24,7 @@
 #ifndef PLACEMENTSTRATEGY_HH
 #define PLACEMENTSTRATEGY_HH
 
-#include <list>
+class FluxboxWindow;
-
-#include "Window.hh"
 
 struct PlacementStrategy {
     /**

src/RootTheme.hh

@@ -26,7 +26,6 @@
 
 #include "FbTk/Theme.hh"
 #include "FbTk/GContext.hh"
-#include "FbTk/Texture.hh"
 
 #include <X11/Xlib.h>
 

src/SendToMenu.hh

@@ -27,8 +27,6 @@
 
 #include "FbMenu.hh"
 
-#include "FbTk/Observer.hh"
-
 class BScreen;
 
 class SendToMenu:public FbMenu {

src/SystemTray.cc

@@ -30,6 +30,7 @@
 #include "fluxbox.hh"
 #include "WinClient.hh"
 #include "Screen.hh"
+#include "ButtonTheme.hh"
 
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>

src/SystemTray.hh

@@ -30,13 +30,13 @@
 #include "FbTk/Observer.hh"
 
 #include "ToolbarItem.hh"
-#include "ButtonTheme.hh"
-#include "Screen.hh"
 
 #include <X11/Xlib.h>
 
 #include <list>
 
+class BScreen;
+class ButtonTheme;
 class TrayWindow;
 class AtomHandler;
 

src/ToolTheme.hh

@@ -30,7 +30,6 @@
 #include "FbTk/BorderTheme.hh"
 #include "FbTk/Texture.hh"
 
-#include <X11/Xlib.h>
 #include <string>
 
 /// Handles toolbar item theme for text and texture

src/ToolbarTheme.hh

@@ -26,7 +26,6 @@
 
 #include "FbTk/Theme.hh"
 #include "FbTk/Texture.hh"
-#include "FbTk/Color.hh"
 #include "FbTk/BorderTheme.hh"
 
 /// toolbar theme class container

src/WinButtonTheme.hh

@@ -24,7 +24,7 @@
 #ifndef WINBUTTONTHEME_HH
 #define WINBUTTONTHEME_HH
 
-#include "Theme.hh"
+#include "FbTk/Theme.hh"
 #include "FbTk/PixmapWithMask.hh"
 
 class FbWinFrameTheme;

src/WinClient.cc

@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <iterator>
 #include <memory>
+#include <X11/Xatom.h>
 
 #ifdef HAVE_CASSERT
   #include <cassert>

src/Window.hh

@@ -38,7 +38,6 @@
 #include "WinButton.hh"
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include <sys/time.h>
 #include <vector>

src/WorkspaceCmd.hh

@@ -27,7 +27,6 @@
 #include "Command.hh"
 
 #include "ClientPattern.hh"
-#include "CurrentWindowCmd.hh"
 #include "FocusControl.hh"
 
 #include "FbTk/RefCount.hh"

src/WorkspaceNameTheme.hh

@@ -26,7 +26,6 @@
 #define WORKSPACENAMETHEME_HH
 
 #include "ToolTheme.hh"
-#include "FbTk/Theme.hh"
 
 class WorkspaceNameTheme:public ToolTheme {
 public: