M src/Screen.hh → src/Screen.hh

@@ -41,6 +41,8 @@ #include "FbTk/NotCopyable.hh"
 #include "FbTk/Observer.hh"
 #include "FbTk/Signal.hh"
 
+#include "FocusControl.hh"
+
 #include <X11/Xresource.h>
 
 #ifdef HAVE_CSTDIO
@@ -64,7 +66,6 @@ class Strut;
 class Slit;
 class Toolbar;
 class HeadArea;
-class FocusControl;
 class ScreenPlacement;
 class TooltipWindow;
 class OSDWindow;

M src/Window.hh → src/Window.hh

@@ -36,6 +36,7 @@ 
 #include "FbWinFrame.hh"
 #include "Focusable.hh"
 #include "FocusableTheme.hh"
+#include "FocusControl.hh"
 #include "WinButton.hh"
 
 
@@ -48,7 +49,6 @@ 
 class WinClient;
 class FbWinFrameTheme;
 class BScreen;
-class FocusControl;
 class FbMenu;
 
 namespace FbTk {