diff --git a/kandinsky/Makefile b/kandinsky/Makefile
index 8f5c8db29..fa735cb8c 100644
--- a/kandinsky/Makefile
+++ b/kandinsky/Makefile
@@ -12,7 +12,6 @@ objs += $(addprefix kandinsky/src/,\
   ion_context.o\
   point.o\
   rect.o\
-  size.o\
   text.o\
 )
 tests += $(addprefix kandinsky/test/,\
diff --git a/kandinsky/include/kandinsky/point.h b/kandinsky/include/kandinsky/point.h
index 7b78bd0e6..651925fdb 100644
--- a/kandinsky/include/kandinsky/point.h
+++ b/kandinsky/include/kandinsky/point.h
@@ -3,11 +3,12 @@
 
 #include <kandinsky/coordinate.h>
 
-struct KDPoint {
+class KDPoint {
+public:
   constexpr KDPoint(KDCoordinate x, KDCoordinate y) :
     m_x(x), m_y(y) {}
-  KDCoordinate x() const;
-  KDCoordinate y() const;
+  KDCoordinate x() const { return m_x; }
+  KDCoordinate y() const { return m_y; }
   KDPoint translatedBy(KDPoint other) const;
   KDPoint opposite() const;
 private:
diff --git a/kandinsky/include/kandinsky/size.h b/kandinsky/include/kandinsky/size.h
index c82ec1b7a..f9cc4a0a7 100644
--- a/kandinsky/include/kandinsky/size.h
+++ b/kandinsky/include/kandinsky/size.h
@@ -3,11 +3,12 @@
 
 #include <kandinsky/coordinate.h>
 
-struct KDSize {
+class KDSize {
+public:
   constexpr KDSize(KDCoordinate width, KDCoordinate height) :
     m_width(width), m_height(height) {}
-  KDCoordinate width() const;
-  KDCoordinate height() const;
+  KDCoordinate width() const { return m_width; }
+  KDCoordinate height() const { return m_height; }
 private:
   KDCoordinate m_width;
   KDCoordinate m_height;
diff --git a/kandinsky/src/point.cpp b/kandinsky/src/point.cpp
index a7f85e6ab..4fe0a7afb 100644
--- a/kandinsky/src/point.cpp
+++ b/kandinsky/src/point.cpp
@@ -1,8 +1,5 @@
 #include <kandinsky/point.h>
 
-KDCoordinate KDPoint::x() const { return m_x; }
-KDCoordinate KDPoint::y() const { return m_y; }
-
 KDPoint KDPoint::translatedBy(KDPoint other) const {
   return KDPoint(m_x+other.x(), m_y+other.y());
 }
diff --git a/kandinsky/src/size.cpp b/kandinsky/src/size.cpp
deleted file mode 100644
index 9b681f88b..000000000
--- a/kandinsky/src/size.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <kandinsky/size.h>
-
-KDCoordinate KDSize::width() const { return m_width; }
-KDCoordinate KDSize::height() const { return m_height; }