diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 56c2c01b97d3..b60e5c2eeec0 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -231,8 +231,6 @@
 		<Unit filename="..\..\src\display.hpp" />
 		<Unit filename="..\..\src\display_context.cpp" />
 		<Unit filename="..\..\src\display_context.hpp" />
-		<Unit filename="..\..\src\drawable_unit.cpp" />
-		<Unit filename="..\..\src\drawable_unit.hpp" />
 		<Unit filename="..\..\src\editor\action\action.cpp" />
 		<Unit filename="..\..\src\editor\action\action.hpp" />
 		<Unit filename="..\..\src\editor\action\action_base.hpp" />
@@ -1035,6 +1033,8 @@
 		<Unit filename="..\..\src\unit_animation_component.hpp" />
 		<Unit filename="..\..\src\unit_display.cpp" />
 		<Unit filename="..\..\src\unit_display.hpp" />
+		<Unit filename="..\..\src\unit_drawer.cpp" />
+		<Unit filename="..\..\src\unit_drawer.hpp" />
 		<Unit filename="..\..\src\unit_formula_manager.cpp" />
 		<Unit filename="..\..\src\unit_formula_manager.hpp" />
 		<Unit filename="..\..\src\unit_frame.cpp" />
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 4d3cfab02df8..1a97351cff66 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -20116,14 +20116,6 @@
 			RelativePath="..\..\src\display_context.hpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\drawable_unit.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\drawable_unit.hpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\events.cpp"
 			>
@@ -21168,6 +21160,14 @@
 			RelativePath="..\..\src\unit_display.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\unit_drawer.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\unit_drawer.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\unit_formula_manager.cpp"
 			>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 429720777d64..19b5a9078139 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -700,7 +700,6 @@ set(wesnoth-main_SRC
 	controller_base.cpp
 	desktop_util.cpp
 	dialogs.cpp
-	drawable_unit.cpp
 	editor/action/action.cpp
 	editor/action/action_item.cpp
 	editor/action/action_label.cpp
@@ -894,6 +893,7 @@ set(wesnoth-main_SRC
 	unit_animation.cpp
 	unit_animation_component.cpp
 	unit_display.cpp
+	unit_drawer.cpp
 	unit_formula_manager.cpp
 	unit_frame.cpp
 	unit_helper.cpp
diff --git a/src/SConscript b/src/SConscript
index 313979427ef8..5ef6b9dad5ba 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -233,7 +233,6 @@ wesnoth_sources = Split("""
     controller_base.cpp
     desktop_util.cpp
     dialogs.cpp
-    drawable_unit.cpp
     editor/action/action.cpp
     editor/action/action_unit.cpp
     editor/action/action_label.cpp
@@ -527,6 +526,7 @@ wesnoth_sources = Split("""
     unit_animation.cpp
     unit_animation_component.cpp
     unit_display.cpp
+    unit_drawer.cpp
     unit_formula_manager.cpp
     unit_frame.cpp
     unit_helper.cpp
diff --git a/src/display.cpp b/src/display.cpp
index f60b505fd327..e5a6593bf845 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -19,7 +19,6 @@
 
 #include "arrow.hpp"
 #include "cursor.hpp"
-#include "drawable_unit.hpp"
 #include "display.hpp"
 #include "fake_unit_manager.hpp"
 #include "game_preferences.hpp"
@@ -44,6 +43,7 @@
 #include "tod_manager.hpp"
 #include "unit.hpp"
 #include "unit_animation_component.hpp"
+#include "unit_drawer.hpp"
 #include "whiteboard/manager.hpp"
 
 #include "SDL_image.h"
diff --git a/src/game_display.cpp b/src/game_display.cpp
index 631973d0c594..f3169414fb6f 100644
--- a/src/game_display.cpp
+++ b/src/game_display.cpp
@@ -34,7 +34,6 @@ Growl_Delegate growl_obj;
 #endif
 
 #include "cursor.hpp"
-#include "drawable_unit.hpp"
 #include "fake_unit_manager.hpp"
 #include "fake_unit_ptr.hpp"
 #include "game_board.hpp"
@@ -49,6 +48,7 @@ Growl_Delegate growl_obj;
 #include "tod_manager.hpp"
 #include "sound.hpp"
 #include "unit.hpp"
+#include "unit_drawer.hpp"
 #include "whiteboard/manager.hpp"
 #ifdef _WIN32
 #include "windows_tray_notification.hpp"
diff --git a/src/drawable_unit.cpp b/src/unit_drawer.cpp
similarity index 99%
rename from src/drawable_unit.cpp
rename to src/unit_drawer.cpp
index 76cdb1504f23..bcd195855c39 100644
--- a/src/drawable_unit.cpp
+++ b/src/unit_drawer.cpp
@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "drawable_unit.hpp"
+#include "unit_drawer.hpp"
 
 #include "display.hpp"
 #include "display_context.hpp"
diff --git a/src/drawable_unit.hpp b/src/unit_drawer.hpp
similarity index 100%
rename from src/drawable_unit.hpp
rename to src/unit_drawer.hpp