3 files changed, 6 insertions, 2 deletions
diff --git a/graphics/fonts/scummfont.cpp b/graphics/fonts/scummfont.cpp
index 3b1d30d1a2..3331b72c47 100644
--- a/graphics/fonts/scummfont.cpp
+++ b/graphics/fonts/scummfont.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "graphics/font.h"
+#include "graphics/surface.h"
 
 namespace Graphics {
 
diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp
index a01c93afac..7db9a233f6 100644
--- a/graphics/fonts/winfont.cpp
+++ b/graphics/fonts/winfont.cpp
@@ -24,8 +24,11 @@
 
 #include "common/file.h"
 #include "common/str.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
 #include "common/winexe_ne.h"
 #include "common/winexe_pe.h"
+#include "graphics/surface.h"
 #include "graphics/fonts/winfont.h"
 
 namespace Graphics {
diff --git a/graphics/fonts/winfont.h b/graphics/fonts/winfont.h
index fbe4a778e2..c31d45e2ce 100644
--- a/graphics/fonts/winfont.h
+++ b/graphics/fonts/winfont.h
@@ -25,11 +25,11 @@
 #ifndef GRAPHICS_WINFONT_H
 #define GRAPHICS_WINFONT_H
 
+#include "common/str.h"
 #include "graphics/font.h"
 
 namespace Common {
-	class SeekableReadStream;
-	class String;
+class SeekableReadStream;
 }
 
 namespace Graphics {