move Rect and PointerAssassin into the toolkit

1 files changed, 3 insertions, 3 deletions

diff --git a/otk/image.hh b/otk/image.hh
index 88165606..eedd6512 100644
--- a/otk/image.hh
+++ b/otk/image.hh
@@ -9,9 +9,9 @@ extern "C" {
 
 #include <list>
 
-#include "timer.hh"
 #include "color.hh"
 #include "screeninfo.hh"
+#include "src/timer.hh"
 
 namespace otk {
 
@@ -66,7 +66,7 @@ public:
 };
 
 
-class BImageControl : public TimeoutHandler {
+class BImageControl : public ob::TimeoutHandler {
 public:
   struct CachedImage {
     Pixmap pixmap;
@@ -116,7 +116,7 @@ public:
 private:
   bool dither;
   const ScreenInfo *screeninfo;
-  BTimer *timer;
+  ob::BTimer *timer;
 
   Colormap colormap;