#include "appwidget.hh"
#include "application.hh"
#include "assassin.hh"
+#include "label.hh"
#include "button.hh"
-#include "color.hh"
+#include "rendercolor.hh"
#include "configuration.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 "util.hh"
#include "ustring.hh"