--- a/pmc/include/cube.h
+++ b/pmc/include/cube.h
@@ -6,16 +6,19 @@
 #ifndef _CUBE_H
 #define _CUBE_H
 
-#include <pmc.h>
+#include <surface.h>
+#include <vector.h>
+#include <rectangle.h>
 
-using namespace pmc;
-
-class Cube:public Vector {
-  public:
+class Cube:public Drawable {
+  private:
     Vector * P[8];
     int height;
 
-    Cube (Vector p1, Vector p2, Vector p3, Vector p4, int h);
+  public:
+    Cube (Surface *, Vector, Vector, Vector, Vector, int);
+    Cube (Surface *);
+
     virtual ~ Cube ();
     void show ();
     void move (Vector);