M src/Screen.cc → src/Screen.cc

@@ -85,6 +85,7 @@ #include "Util.hh"
 #include "Window.hh"
 #include "Workspace.hh"
 #include "Workspacemenu.hh"
+#include "Util.hh"
 #include "XAtom.hh"
 
 #ifndef   FONT_ELEMENT_SIZE

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

@@ -57,6 +57,7 @@ 
 class Slit; // forward reference
 class BFont;
 class XAtom;
+struct Strut;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
@@ -94,12 +95,6 @@ BFont *t_font, *f_font;
 
   TextJustify t_justify, f_justify;
   int bullet, bullet_pos;
-};
-
-struct Strut {
-  unsigned int top, bottom, left, right;
-
-  Strut(void): top(0), bottom(0), left(0), right(0) {}
 };
 
 class BScreen : public ScreenInfo {

M src/Util.hh → src/Util.hh

@@ -76,6 +76,12 @@ private:
   int _x1, _y1, _x2, _y2;
 };
 
+struct Strut {
+  unsigned int top, bottom, left, right;
+
+  Strut(void): top(0), bottom(0), left(0), right(0) {}
+};
+
 /* XXX: this needs autoconf help */
 const unsigned int BSENTINEL = 65535;