diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h
index e084d18566..b14f20b69c 100644
--- a/libs/canvas/canvas/canvas.h
+++ b/libs/canvas/canvas/canvas.h
@@ -40,8 +40,8 @@
 
 namespace ArdourCanvas
 {
+struct Rect;
 
-class Rect;
 class Item;
 class ScrollGroup;
 
diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h
index 85beedc6b3..9b058ab83a 100644
--- a/libs/canvas/canvas/item.h
+++ b/libs/canvas/canvas/item.h
@@ -36,9 +36,9 @@
 
 namespace ArdourCanvas
 {
+struct Rect;	
 
 class Canvas;
-class Rect;	
 class ScrollGroup;
 
 /** The parent class for anything that goes on the canvas.
diff --git a/libs/canvas/canvas/types.h b/libs/canvas/canvas/types.h
index 2800ccc91b..6d952794c9 100644
--- a/libs/canvas/canvas/types.h
+++ b/libs/canvas/canvas/types.h
@@ -30,7 +30,7 @@
 #include "canvas/visibility.h"
 
 namespace Cairo {
-	struct Context;
+ 	class Context;
 }
 
 namespace ArdourCanvas