diff --git a/common/include/editor/meddraw.h b/common/include/editor/meddraw.h
index 5f1269ab6..df4bca6bb 100644
--- a/common/include/editor/meddraw.h
+++ b/common/include/editor/meddraw.h
@@ -27,8 +27,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #ifdef __cplusplus
 #include "fwd-segment.h"
+#include "fwd-gr.h"
 
-struct grs_canvas;
 struct editor_view;
 
 void meddraw_init_views( grs_canvas * canvas);
diff --git a/common/include/ui.h b/common/include/ui.h
index ce6ca358c..8d0ef1924 100644
--- a/common/include/ui.h
+++ b/common/include/ui.h
@@ -33,6 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef __cplusplus
 #include <cstdint>
 #include <string>
+#include "fwd-gr.h"
 #include "varutil.h"
 #include "window.h"
 #include "compiler-array.h"
@@ -40,7 +41,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ntstring.h"
 
 struct grs_bitmap;
-struct grs_canvas;
 struct grs_font;
 
 struct UI_KEYPAD {
diff --git a/common/main/screens.h b/common/main/screens.h
index e51bd19ba..9fed09a21 100644
--- a/common/main/screens.h
+++ b/common/main/screens.h
@@ -26,8 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #pragma once
 
 #ifdef __cplusplus
-
-struct grs_canvas;
+#include "fwd-gr.h"
 
 // What graphics modes the game & editor open