no more configuration.hh

[chaz/openbox] / otk / otk.hh

diff --git a/otk/otk.hh b/otk/otk.hh
index 2ec4f2b080e38aa34814466538135547deb1aff4..7c41caf400cd6414fb26ae343e5ff784eb89ff1c 100644 (file)
--- a/otk/otk.hh
+++ b/otk/otk.hh
@@ -1,6 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __otk_hh
 #define __otk_hh
 
+#include "../config.h"
+
 #include "eventdispatcher.hh"
 #include "eventhandler.hh"
 #include "widget.hh"
@@ -9,25 +12,24 @@
 #include "appwidget.hh"
 #include "application.hh"
 #include "assassin.hh"
+#include "label.hh"
 #include "button.hh"
-#include "color.hh"
-#include "configuration.hh"
+#include "rendercolor.hh"
 #include "display.hh"
 #include "font.hh"
-#include "gccache.hh"
-#include "image.hh"
-#include "label.hh"
+//#include "gccache.hh"
+#include "rendercontrol.hh"
 #include "point.hh"
 #include "property.hh"
 #include "rect.hh"
 #include "screeninfo.hh"
 #include "strut.hh"
-#include "style.hh"
-#include "texture.hh"
+#include "renderstyle.hh"
+#include "surface.hh"
+#include "rendertexture.hh"
 #include "timer.hh"
-#include "timerqueue.hh"
-#include "timerqueuemanager.hh"
 #include "util.hh"
+#include "ustring.hh"
 #include "widget.hh"
 
 #endif // __otk_hh