diff --git a/src/lib/ector/ector_buffer.h b/src/lib/ector/ector_buffer.h
index 8a893f00c8..e19c7fe4a6 100644
--- a/src/lib/ector/ector_buffer.h
+++ b/src/lib/ector/ector_buffer.h
@@ -3,14 +3,18 @@
 
 #include <Ector.h>
 
-#include "ector_buffer.eo.h"
-#include "software/ector_software_buffer_base.eo.h"
-
 /**
  * @typedef Ector_Buffer
  * A generic pixel buffer type (2D). May be readable or writeable or both.
  */
-typedef Ector_Buffer Ector_Buffer;
+typedef Eo Ector_Buffer;
+
+/* Avoid type redefinition */
+#define _ECTOR_BUFFER_EO_CLASS_TYPE
+
+#include "ector_buffer.eo.h"
+#include "software/ector_software_buffer_base.eo.h"
+
 
 typedef struct _Ector_Buffer_Data Ector_Buffer_Data;
 typedef struct _Ector_Software_Buffer_Base_Data Ector_Software_Buffer_Base_Data;