M wrap/ob.i → wrap/ob.i

@@ -49,7 +49,6 @@ };
 
 %import "otk.i"
 
-%import "widgetbase.hh"
 %import "actions.hh"
 
 %include "openbox.hh"

M wrap/otk.i → wrap/otk.i

@@ -49,6 +49,7 @@ 
 %include "eventhandler.hh"
 %include "eventdispatcher.hh"
 %include "point.hh"
+%include "size.hh"
 %include "rect.hh"
 %include "rendercolor.hh"
 %include "rendertexture.hh"
@@ -56,8 +57,6 @@ %include "font.hh"
 %include "renderstyle.hh"
 %include "widget.hh"
 %include "label.hh"
-%include "focuswidget.hh"
-%include "focuslabel.hh"
 %include "appwidget.hh"
 %include "application.hh"
 %include "assassin.hh"
@@ -67,8 +66,6 @@ %include "rendercontrol.hh"
 %include "property.hh"
 %include "screeninfo.hh"
 %include "strut.hh"
-%include "timer.hh"
-%include "util.hh"
 
 // for Window etc
 %import "X11/X.h"
@@ -77,4 +74,8 @@ // globals
 %pythoncode %{
 display = cvar.display;
 atoms = cvar.Property_atoms;
+
+def style(screen):
+    return RenderStyle_style(screen)
+
 %}