8 files changed, 7 insertions, 8 deletions
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 4432ec8553..4a418138b2 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -29,7 +29,7 @@
 #include "common/serializer.h"
 #include "common/str.h"
 #include "common/str-array.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/objects.h"
 
 namespace Sherlock {
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index babd0c49a0..630c4faf32 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -9,7 +9,6 @@ MODULE_OBJS = \
 	debugger.o \
 	detection.o \
 	events.o \
-	graphics.o \
 	inventory.o \
 	journal.o \
 	map.o \
@@ -22,6 +21,7 @@ MODULE_OBJS = \
 	settings.o \
 	sherlock.o \
 	sound.o \
+	surface.o \
 	talk.o \
 	user_interface.o
 
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index a78b89b00c..b9ac3e79d6 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "sherlock/saveload.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/sherlock.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 501506f8ec..1f3c23748f 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -26,8 +26,7 @@
 #include "common/list.h"
 #include "common/rect.h"
 #include "common/serializer.h"
-#include "graphics/surface.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 2a5d9ec627..a9a17a99f8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "sherlock/sherlock.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "common/scummsys.h"
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/surface.cpp
index 234928156a..3e82f1dc5b 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/surface.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/sherlock.h"
 #include "common/system.h"
 #include "graphics/palette.h"
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/surface.h
index d4a1584968..d4a1584968 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/surface.h
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 79382a19fe..2ff60715e3 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/events.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/objects.h"
 #include "sherlock/resources.h"