diff --git a/common/canvas_base.c b/common/canvas_base.c
index 7504c0b..a34cace 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -16,10 +16,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This file shouldn't be compiled directly"
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/common/canvas_base.h b/common/canvas_base.h
index 2039ccd..bdf12a1 100644
--- a/common/canvas_base.h
+++ b/common/canvas_base.h
@@ -19,10 +19,6 @@
 #ifndef _H_CANVAS_BASE
 #define _H_CANVAS_BASE
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This header shouldn't be included directly"
-#endif
-
 #include <spice/macros.h>
 
 #include "pixman_utils.h"
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c
index e1af10b..4c5daea 100644
--- a/common/gdi_canvas.c
+++ b/common/gdi_canvas.c
@@ -22,10 +22,6 @@
 #include <config.h>
 #endif
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This file shouldn't be compiled directly"
-#endif
-
 #include <windows.h>
 #include <wingdi.h>
 #include "gdi_canvas.h"
diff --git a/common/gdi_canvas.h b/common/gdi_canvas.h
index ccccdee..dc302dc 100644
--- a/common/gdi_canvas.h
+++ b/common/gdi_canvas.h
@@ -19,10 +19,6 @@
 #ifndef _H__GDI_CANVAS
 #define _H__GDI_CANVAS
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This header shouldn't be included directly"
-#endif
-
 #include <stdint.h>
 #include <spice/macros.h>
 
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index d30bf1b..a2ca9e1 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -19,10 +19,6 @@
 #include <config.h>
 #endif
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This file shouldn't be compiled directly"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/gl_canvas.h b/common/gl_canvas.h
index b565a9b..aab6039 100644
--- a/common/gl_canvas.h
+++ b/common/gl_canvas.h
@@ -22,10 +22,6 @@
 #include "canvas_base.h"
 #include "region.h"
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This header shouldn't be included directly"
-#endif
-
 #ifndef _H__GL_CANVAS
 #define _H__GL_CANVAS
 
diff --git a/common/sw_canvas.c b/common/sw_canvas.c
index c9c79c3..2c1782b 100644
--- a/common/sw_canvas.c
+++ b/common/sw_canvas.c
@@ -22,10 +22,6 @@
 #include <config.h>
 #endif
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This file shouldn't be compiled directly"
-#endif
-
 #include <math.h>
 #include "sw_canvas.h"
 #define CANVAS_USE_PIXMAN
diff --git a/common/sw_canvas.h b/common/sw_canvas.h
index fe0b99d..eb6c1f8 100644
--- a/common/sw_canvas.h
+++ b/common/sw_canvas.h
@@ -19,10 +19,6 @@
 #ifndef _H__CANVAS
 #define _H__CANVAS
 
-#ifndef SPICE_CANVAS_INTERNAL
-#error "This header shouldn't be included directly"
-#endif
-
 #include <stdint.h>
 #include <spice/macros.h>