From 4cc810b0d39917d37fa08034ac7dd509292c9ce3 Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Sat, 29 Dec 2007 22:44:11 -0800 Subject: remove some (hopefully) unneeded header includes --- src/ButtonTool.hh | 3 ++- src/ClientMenu.hh | 2 -- src/CommandDialog.hh | 3 +-- src/Ewmh.cc | 1 + src/Ewmh.hh | 5 ----- src/FbAtoms.hh | 1 - src/FbMenu.hh | 1 - src/FbTk/BoolMenuItem.hh | 3 ++- src/FbTk/Button.hh | 1 - src/FbTk/Color.hh | 2 -- src/FbTk/Container.hh | 1 - src/FbTk/EventManager.cc | 1 + src/FbTk/EventManager.hh | 3 ++- src/FbTk/Font.hh | 1 - src/FbTk/FontImp.hh | 6 ++---- src/FbTk/ImageControl.hh | 2 -- src/FbTk/IntMenuItem.hh | 3 ++- src/FbTk/KeyUtil.cc | 2 ++ src/FbTk/KeyUtil.hh | 1 - src/FbTk/Menu.cc | 1 + src/FbTk/Menu.hh | 5 ++--- src/FbTk/MenuTheme.hh | 1 - src/FbTk/MultLayers.cc | 1 + src/FbTk/MultiButtonMenuItem.cc | 1 + src/FbTk/Resource.hh | 4 ---- src/FbTk/SearchResult.cc | 2 +- src/FbTk/SearchResult.hh | 4 +++- src/FbTk/Shape.hh | 1 - src/FbTk/TextBox.hh | 2 -- src/FbTk/TextButton.hh | 1 - src/FbTk/TextureRender.cc | 2 ++ src/FbTk/TextureRender.hh | 4 ++-- src/FbTk/XLayer.cc | 2 ++ src/FbTk/XLayer.hh | 2 +- src/FbTk/XLayerItem.hh | 3 ++- src/FbTk/XrmDatabaseHelper.hh | 1 - src/FbWinFrame.hh | 3 --- src/FbWinFrameTheme.hh | 2 -- src/FocusModelMenuItem.hh | 5 ++++- src/GenericTool.cc | 1 + src/GenericTool.hh | 3 ++- src/IconbarTool.hh | 3 +-- src/MenuCreator.hh | 1 - src/PlacementStrategy.hh | 4 +--- src/RootTheme.hh | 1 - src/SendToMenu.hh | 2 -- src/SystemTray.cc | 1 + src/SystemTray.hh | 4 ++-- src/ToolTheme.hh | 1 - src/ToolbarTheme.hh | 1 - src/WinButtonTheme.hh | 2 +- src/WinClient.cc | 1 + src/Window.hh | 1 - src/WorkspaceCmd.hh | 1 - src/WorkspaceNameTheme.hh | 1 - 55 files changed, 47 insertions(+), 70 deletions(-) diff --git a/src/ButtonTool.hh b/src/ButtonTool.hh index 522de27..487d0f4 100644 --- a/src/ButtonTool.hh +++ b/src/ButtonTool.hh @@ -25,7 +25,8 @@ #define BUTTONTOOL_HH #include "GenericTool.hh" -#include "FbTk/Observer.hh" + +#include class ButtonTheme; diff --git a/src/ClientMenu.hh b/src/ClientMenu.hh index b6ea2e5..8833e88 100644 --- a/src/ClientMenu.hh +++ b/src/ClientMenu.hh @@ -24,8 +24,6 @@ #ifndef CLIENTMENU_HH #define CLIENTMENU_HH -#include - #include "FbMenu.hh" class BScreen; diff --git a/src/CommandDialog.hh b/src/CommandDialog.hh index 47d6687..0069932 100644 --- a/src/CommandDialog.hh +++ b/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 diff --git a/src/Ewmh.cc b/src/Ewmh.cc index 0091981..257b432 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc @@ -38,6 +38,7 @@ #include "FbTk/XLayerItem.hh" #include "FbTk/XLayer.hh" +#include #include #include #include diff --git a/src/Ewmh.hh b/src/Ewmh.hh index cc33eff..2744406 100644 --- a/src/Ewmh.hh +++ b/src/Ewmh.hh @@ -23,11 +23,6 @@ #include "AtomHandler.hh" #include "FbTk/FbString.hh" -#include "AttentionNoticeHandler.hh" - -#include -#include -#include /// Implementes Extended Window Manager Hints ( http://www.freedesktop.org/Standards/wm-spec ) class Ewmh:public AtomHandler { diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh index b657fe7..2d1e708 100644 --- a/src/FbAtoms.hh +++ b/src/FbAtoms.hh @@ -24,7 +24,6 @@ #define FBATOMS_HH #include -#include /// atom handler for basic X atoms class FbAtoms { diff --git a/src/FbMenu.hh b/src/FbMenu.hh index 9469311..63ab772 100644 --- a/src/FbMenu.hh +++ b/src/FbMenu.hh @@ -26,7 +26,6 @@ #include "Menu.hh" #include "XLayerItem.hh" -#include namespace FbTk { class MenuTheme; diff --git a/src/FbTk/BoolMenuItem.hh b/src/FbTk/BoolMenuItem.hh index 2e8b2c3..7390066 100644 --- a/src/FbTk/BoolMenuItem.hh +++ b/src/FbTk/BoolMenuItem.hh @@ -23,10 +23,11 @@ #define FBTK_BOOLMENUITEM_HH #include "MenuItem.hh" -#include "Accessor.hh" namespace FbTk { +class Accessor; + /// a bool menu item class BoolMenuItem: public FbTk::MenuItem { public: diff --git a/src/FbTk/Button.hh b/src/FbTk/Button.hh index 89a754c..4b2ef8b 100644 --- a/src/FbTk/Button.hh +++ b/src/FbTk/Button.hh @@ -33,7 +33,6 @@ #include "Text.hh" #include -#include namespace FbTk { diff --git a/src/FbTk/Color.hh b/src/FbTk/Color.hh index 2b72e97..efba705 100644 --- a/src/FbTk/Color.hh +++ b/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 diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh index 5fa13f3..954f929 100644 --- a/src/FbTk/Container.hh +++ b/src/FbTk/Container.hh @@ -29,7 +29,6 @@ #include "Text.hh" // for Orientation #include -#include namespace FbTk { diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc index fd26950..29f8962 100644 --- a/src/FbTk/EventManager.cc +++ b/src/FbTk/EventManager.cc @@ -22,6 +22,7 @@ // $Id$ #include "EventManager.hh" +#include "EventHandler.hh" #include "FbWindow.hh" #include "App.hh" diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh index 149649b..e39ad7d 100644 --- a/src/FbTk/EventManager.hh +++ b/src/FbTk/EventManager.hh @@ -21,12 +21,13 @@ // $Id$ -#include "EventHandler.hh" #include +#include namespace FbTk { class FbWindow; +class EventHandler; /** singleton mediator for EventHandlers diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 4806c43..13bf12b 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh @@ -25,7 +25,6 @@ #define FBTK_FONT_HH #include -#include #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh index 378c45f..83cb032 100644 --- a/src/FbTk/FontImp.hh +++ b/src/FbTk/FontImp.hh @@ -24,13 +24,11 @@ #ifndef FBTK_FONTIMP_HH #define FBTK_FONTIMP_HH -#include "Color.hh" -#include "Font.hh" +#include "Text.hh" +#include "FbString.hh" #include -#include - namespace FbTk { class FbDrawable; diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index a2c5e92..08a797f 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh @@ -34,9 +34,7 @@ #include "NotCopyable.hh" #include -#include #include -#include namespace FbTk { diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh index a1431fb..69d5409 100644 --- a/src/FbTk/IntMenuItem.hh +++ b/src/FbTk/IntMenuItem.hh @@ -23,12 +23,13 @@ #define FBTK_INTMENUITEM_HH #include "MenuItem.hh" -#include "Accessor.hh" #include namespace FbTk { +class Accessor; + /// Changes an resource integer value between min and max class IntMenuItem: public FbTk::MenuItem { public: diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index a6ca632..bd3bee1 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc @@ -24,6 +24,8 @@ #include "KeyUtil.hh" #include "App.hh" +#include + #include #ifdef HAVE_CSTRING #include diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh index 9311561..5044e86 100644 --- a/src/FbTk/KeyUtil.hh +++ b/src/FbTk/KeyUtil.hh @@ -25,7 +25,6 @@ #define FBTK_KEYUTIL_HH #include -#include #include diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 00dcc54..af2515a 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc @@ -45,6 +45,7 @@ #include "SimpleCommand.hh" #include "FbPixmap.hh" +#include #include #include diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 53b1375..45adb71 100644 --- a/src/FbTk/Menu.hh +++ b/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; /// Base class for menus class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer, diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index 1e82b6d..e829e80 100644 --- a/src/FbTk/MenuTheme.hh +++ b/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" diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc index 2980e41..af97cba 100644 --- a/src/FbTk/MultLayers.cc +++ b/src/FbTk/MultLayers.cc @@ -26,6 +26,7 @@ #include "XLayer.hh" #include "XLayerItem.hh" #include "App.hh" +#include "FbWindow.hh" using namespace FbTk; diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc index 591c13d..fff133b 100644 --- a/src/FbTk/MultiButtonMenuItem.cc +++ b/src/FbTk/MultiButtonMenuItem.cc @@ -24,6 +24,7 @@ #include "MultiButtonMenuItem.hh" #include "PixmapWithMask.hh" +#include "Command.hh" namespace FbTk { diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index 63137e7..29ab939 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh @@ -31,16 +31,12 @@ #include #include -#include -#include #include #include #include "XrmDatabaseHelper.hh" namespace FbTk { -class XrmDatabaseHelper; - class ResourceException: public std::exception { public: ResourceException(const std::string &err): diff --git a/src/FbTk/SearchResult.cc b/src/FbTk/SearchResult.cc index 3f36edc..68d9ecf 100644 --- a/src/FbTk/SearchResult.cc +++ b/src/FbTk/SearchResult.cc @@ -20,7 +20,7 @@ // DEALINGS IN THE SOFTWARE. #include "SearchResult.hh" -#include +#include "ITypeAheadable.hh" namespace FbTk { diff --git a/src/FbTk/SearchResult.hh b/src/FbTk/SearchResult.hh index 5e8852b..a28249c 100644 --- a/src/FbTk/SearchResult.hh +++ b/src/FbTk/SearchResult.hh @@ -23,10 +23,12 @@ #define FBTK_SEARCHRESULT_HH #include -#include "ITypeAheadable.hh" +#include namespace FbTk { +class ITypeAheadable; + class SearchResult { public: typedef std::vector < ITypeAheadable* > BaseItems; diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh index be49652..9d71e70 100644 --- a/src/FbTk/Shape.hh +++ b/src/FbTk/Shape.hh @@ -25,7 +25,6 @@ #include "FbPixmap.hh" #include -#include #include namespace FbTk { diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh index 78676a1..fbf533e 100644 --- a/src/FbTk/TextBox.hh +++ b/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 diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh index 1189448..7c2a96b 100644 --- a/src/FbTk/TextButton.hh +++ b/src/FbTk/TextButton.hh @@ -26,7 +26,6 @@ #include "Button.hh" #include "Text.hh" -#include "FbPixmap.hh" #include diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc index 5d9c7d5..0814a3a 100644 --- a/src/FbTk/TextureRender.cc +++ b/src/FbTk/TextureRender.cc @@ -32,6 +32,8 @@ #include "GContext.hh" #include "I18n.hh" +#include + #include #include #ifdef HAVE_CSTDIO diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh index 7f796b7..2c01ae0 100644 --- a/src/FbTk/TextureRender.hh +++ b/src/FbTk/TextureRender.hh @@ -27,15 +27,15 @@ #ifndef FBTK_TEXTURRENDER_HH #define FBTK_TEXTURRENDER_HH -#include "Texture.hh" #include "Text.hh" #include namespace FbTk { +class Color; class ImageControl; - +class Texture; /// Renders texture to pixmap /** diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc index 6c44ad9..bf09d1e 100644 --- a/src/FbTk/XLayer.cc +++ b/src/FbTk/XLayer.cc @@ -25,6 +25,8 @@ #include "XLayer.hh" #include "XLayerItem.hh" #include "App.hh" +#include "FbWindow.hh" +#include "MultLayers.hh" #include diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh index 238f698..25faa84 100644 --- a/src/FbTk/XLayer.hh +++ b/src/FbTk/XLayer.hh @@ -28,10 +28,10 @@ #include #include "Layer.hh" -#include "MultLayers.hh" namespace FbTk { +class MultLayers; class XLayerItem; class XLayer : public FbTk::Layer > { diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh index e17d162..c67d046 100644 --- a/src/FbTk/XLayerItem.hh +++ b/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 Windows; diff --git a/src/FbTk/XrmDatabaseHelper.hh b/src/FbTk/XrmDatabaseHelper.hh index 7ad512d..ac1a0e7 100644 --- a/src/FbTk/XrmDatabaseHelper.hh +++ b/src/FbTk/XrmDatabaseHelper.hh @@ -25,7 +25,6 @@ #ifndef FBTK_XRMDATABASEHELPER_HH #define FBTK_XRMDATABASEHELPER_HH -#include #include /** diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index 6db69a8..f1dc9ed 100644 --- a/src/FbWinFrame.hh +++ b/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; } diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh index 549ae74..89fcedf 100644 --- a/src/FbWinFrameTheme.hh +++ b/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" diff --git a/src/FocusModelMenuItem.hh b/src/FocusModelMenuItem.hh index 91657e9..7d41cb6 100644 --- a/src/FocusModelMenuItem.hh +++ b/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" diff --git a/src/GenericTool.cc b/src/GenericTool.cc index 809b9e4..dbc36fe 100644 --- a/src/GenericTool.cc +++ b/src/GenericTool.cc @@ -23,6 +23,7 @@ #include "GenericTool.hh" #include "FbTk/FbWindow.hh" +#include "ToolTheme.hh" #include diff --git a/src/GenericTool.hh b/src/GenericTool.hh index c44c9cc..52d82ac 100644 --- a/src/GenericTool.hh +++ b/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 +class ToolTheme; + namespace FbTk { class FbWindow; } diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh index 3111875..90bb790 100644 --- a/src/IconbarTool.hh +++ b/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 @@ -43,6 +41,7 @@ class IconbarTheme; class BScreen; class IconButton; class Focusable; +class FocusableList; class IconbarTool: public ToolbarItem, public FbTk::Observer { public: diff --git a/src/MenuCreator.hh b/src/MenuCreator.hh index 927b564..c5d85ad 100644 --- a/src/MenuCreator.hh +++ b/src/MenuCreator.hh @@ -25,7 +25,6 @@ #include "FbTk/FbString.hh" -#include #include namespace FbTk { diff --git a/src/PlacementStrategy.hh b/src/PlacementStrategy.hh index 5cd5c39..046f0ff 100644 --- a/src/PlacementStrategy.hh +++ b/src/PlacementStrategy.hh @@ -24,9 +24,7 @@ #ifndef PLACEMENTSTRATEGY_HH #define PLACEMENTSTRATEGY_HH -#include - -#include "Window.hh" +class FluxboxWindow; struct PlacementStrategy { /** diff --git a/src/RootTheme.hh b/src/RootTheme.hh index bcff938..ff2fdcd 100644 --- a/src/RootTheme.hh +++ b/src/RootTheme.hh @@ -26,7 +26,6 @@ #include "FbTk/Theme.hh" #include "FbTk/GContext.hh" -#include "FbTk/Texture.hh" #include diff --git a/src/SendToMenu.hh b/src/SendToMenu.hh index b47d745..1f8bc70 100644 --- a/src/SendToMenu.hh +++ b/src/SendToMenu.hh @@ -27,8 +27,6 @@ #include "FbMenu.hh" -#include "FbTk/Observer.hh" - class BScreen; class SendToMenu:public FbMenu { diff --git a/src/SystemTray.cc b/src/SystemTray.cc index eac0ea4..95e2527 100644 --- a/src/SystemTray.cc +++ b/src/SystemTray.cc @@ -30,6 +30,7 @@ #include "fluxbox.hh" #include "WinClient.hh" #include "Screen.hh" +#include "ButtonTheme.hh" #include #include diff --git a/src/SystemTray.hh b/src/SystemTray.hh index ff3c0f7..9b3ef2f 100644 --- a/src/SystemTray.hh +++ b/src/SystemTray.hh @@ -30,13 +30,13 @@ #include "FbTk/Observer.hh" #include "ToolbarItem.hh" -#include "ButtonTheme.hh" -#include "Screen.hh" #include #include +class BScreen; +class ButtonTheme; class TrayWindow; class AtomHandler; diff --git a/src/ToolTheme.hh b/src/ToolTheme.hh index 97d3d46..4224d62 100644 --- a/src/ToolTheme.hh +++ b/src/ToolTheme.hh @@ -30,7 +30,6 @@ #include "FbTk/BorderTheme.hh" #include "FbTk/Texture.hh" -#include #include /// Handles toolbar item theme for text and texture diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh index ba09858..d888959 100644 --- a/src/ToolbarTheme.hh +++ b/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 diff --git a/src/WinButtonTheme.hh b/src/WinButtonTheme.hh index 043f37f..f1c2eaf 100644 --- a/src/WinButtonTheme.hh +++ b/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; diff --git a/src/WinClient.cc b/src/WinClient.cc index 5a3c924..4ae5cad 100644 --- a/src/WinClient.cc +++ b/src/WinClient.cc @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef HAVE_CASSERT #include diff --git a/src/Window.hh b/src/Window.hh index 3ea5f55..c8e1509 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -38,7 +38,6 @@ #include "WinButton.hh" #include -#include #include #include diff --git a/src/WorkspaceCmd.hh b/src/WorkspaceCmd.hh index 13adec3..4169a49 100644 --- a/src/WorkspaceCmd.hh +++ b/src/WorkspaceCmd.hh @@ -27,7 +27,6 @@ #include "Command.hh" #include "ClientPattern.hh" -#include "CurrentWindowCmd.hh" #include "FocusControl.hh" #include "FbTk/RefCount.hh" diff --git a/src/WorkspaceNameTheme.hh b/src/WorkspaceNameTheme.hh index 69bba11..6db1f99 100644 --- a/src/WorkspaceNameTheme.hh +++ b/src/WorkspaceNameTheme.hh @@ -26,7 +26,6 @@ #define WORKSPACENAMETHEME_HH #include "ToolTheme.hh" -#include "FbTk/Theme.hh" class WorkspaceNameTheme:public ToolTheme { public: -- cgit v0.11.2