6 files changed, 16 insertions, 18 deletions

diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index c8cfb46..251d4d4 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -43,6 +43,7 @@
 #endif // SHAPE
 
 #include <algorithm>
+#include <vector>
 
 using std::min;
 
@@ -92,9 +93,17 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
     return pm.release();
 }
 
+struct CornerPixmaps {
+    FbPixmap topleft;
+    FbPixmap topright;
+    FbPixmap botleft;
+    FbPixmap botright;
 };
 
-std::vector<Shape::CornerPixmaps> Shape::s_corners;
+// unfortunately, we need a separate pixmap per screen
+std::vector<CornerPixmaps> s_corners;
+
+}; // end of anonymous namespace
 
 Shape::Shape(FbWindow &win, int shapeplaces):
     m_win(&win),
@@ -134,7 +143,7 @@ Shape::~Shape() {
 void Shape::initCorners(int screen_num) {
     if (s_corners.size() == 0)
         s_corners.resize(ScreenCount(App::instance()->display()));
- 
+
     static const unsigned char left_bits[] = { 0xc0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff };
     static const unsigned char right_bits[] = { 0x03, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff};
     static const unsigned char bottom_left_bits[] = { 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xc0 };
diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh
index 04382cf..3539959 100644
--- a/src/FbTk/Shape.hh
+++ b/src/FbTk/Shape.hh
@@ -24,8 +24,6 @@
 
 #include "FbPixmap.hh"
 
-#include <vector>
-
 namespace FbTk {
 class FbWindow;
 
@@ -67,17 +65,8 @@ private:
 
     void initCorners(int screen_num);
 
-    struct CornerPixmaps {
-        FbPixmap topleft;
-        FbPixmap topright;
-        FbPixmap botleft;
-        FbPixmap botright;
-    };
 
-    // unfortunately, we need a separate pixmap per screen
-    static std::vector<CornerPixmaps> s_corners;
     int m_shapeplaces; ///< places to shape
-
 };
 
 }; // end namespace FbTk
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 5431532..82a8d13 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -20,7 +20,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbWinFrameTheme.hh"
-#include "App.hh"
+#include "FbTk/App.hh"
 
 #include "IconbarTheme.hh"
 
diff --git a/src/Slit.cc b/src/Slit.cc
index e8b6ee0..ecd8280 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -40,11 +40,11 @@
 #include "FbTk/SimpleCommand.hh"
 #include "FbTk/Theme.hh"
 #include "FbTk/Transparent.hh"
-#include "MacroCommand.hh"
+#include "FbTk/MacroCommand.hh"
 #include "FbCommands.hh"
 #include "Layer.hh"
 #include "LayerMenu.hh"
-#include "XLayer.hh"
+#include "FbTk/XLayer.hh"
 #include "RootTheme.hh"
 #include "FbMenu.hh"
 
diff --git a/src/SlitClient.hh b/src/SlitClient.hh
index 0362d3d..f1ecab3 100644
--- a/src/SlitClient.hh
+++ b/src/SlitClient.hh
@@ -22,7 +22,7 @@
 #ifndef SLITCLIENT_HH
 #define SLITCLIENT_HH
 
-#include "NotCopyable.hh"
+#include "FbTk/NotCopyable.hh"
 
 #include <X11/Xlib.h>
 #include <string>
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 68e5600..b6df606 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -29,7 +29,7 @@
 
 #include "Xutil.hh"
 
-#include "EventManager.hh"
+#include "FbTk/EventManager.hh"
 #include "FbTk/MultLayers.hh"
 
 #include <iostream>