diff --git a/kandinsky/Makefile b/kandinsky/Makefile
index 7aaf9fca2..150d4ea13 100644
--- a/kandinsky/Makefile
+++ b/kandinsky/Makefile
@@ -2,7 +2,6 @@ SFLAGS += -Ikandinsky/include
 
 kandinsky_src += $(addprefix kandinsky/src/,\
   color.cpp \
-  context.cpp \
   context_line.cpp \
   context_pixel.cpp \
   context_rect.cpp \
diff --git a/kandinsky/include/kandinsky/context.h b/kandinsky/include/kandinsky/context.h
index 684be6cf3..27bd7bbc0 100644
--- a/kandinsky/include/kandinsky/context.h
+++ b/kandinsky/include/kandinsky/context.h
@@ -7,8 +7,8 @@
 
 class KDContext {
 public:
-  void setOrigin(KDPoint origin);
-  void setClippingRect(KDRect clippingRect);
+  void setOrigin(KDPoint origin) { m_origin = origin; }
+  void setClippingRect(KDRect clippingRect) { m_clippingRect = clippingRect; }
 
   // Pixel manipulation
   void setPixel(KDPoint p, KDColor c);
@@ -29,7 +29,10 @@ public:
   void blendRectWithMask(KDRect rect, KDColor color, const uint8_t * mask, KDColor * workingBuffer);
   void strokeRect(KDRect rect, KDColor color);
 protected:
-  KDContext(KDPoint origin, KDRect clippingRect);
+  KDContext(KDPoint origin, KDRect clippingRect) :
+    m_origin(origin),
+    m_clippingRect(clippingRect)
+  {}
   virtual void pushRect(KDRect, const KDColor * pixels) = 0;
   virtual void pushRectUniform(KDRect rect, KDColor color) = 0;
   virtual void pullRect(KDRect rect, KDColor * pixels) = 0;
diff --git a/kandinsky/src/context.cpp b/kandinsky/src/context.cpp
deleted file mode 100644
index f29b84e6c..000000000
--- a/kandinsky/src/context.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <kandinsky/context.h>
-#include <assert.h>
-
-KDContext::KDContext(KDPoint origin, KDRect clippingRect) :
-  m_origin(origin),
-  m_clippingRect(clippingRect)
-{
-}
-
-void KDContext::setOrigin(KDPoint origin) {
-  m_origin = origin;
-}
-
-void KDContext::setClippingRect(KDRect clippingRect) {
-  m_clippingRect = clippingRect;
-}