diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
index 1f2a88ab8134b..f2729c98b2772 100644
--- a/src/activity_handlers.cpp
+++ b/src/activity_handlers.cpp
@@ -72,7 +72,6 @@
 #include "messages.h"
 #include "mongroup.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "npc.h"
 #include "omdata.h"
diff --git a/src/addiction.cpp b/src/addiction.cpp
index ef0c3dd333b03..75434387d41e7 100644
--- a/src/addiction.cpp
+++ b/src/addiction.cpp
@@ -21,7 +21,6 @@
 #include "generic_factory.h"
 #include "init.h"
 #include "json_error.h"
-#include "morale_types.h"
 #include "rng.h"
 #include "talker.h"
 #include "text_snippets.h"
diff --git a/src/avatar.cpp b/src/avatar.cpp
index f890d60c9c1e3..fea4e7ef7e0d0 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -55,7 +55,6 @@
 #include "messages.h"
 #include "mission.h"
 #include "morale.h"
-#include "morale_types.h"
 #include "move_mode.h"
 #include "mutation.h"
 #include "npc.h"
diff --git a/src/bionics.cpp b/src/bionics.cpp
index 6aa17b0c6979d..883b31d80dcbf 100644
--- a/src/bionics.cpp
+++ b/src/bionics.cpp
@@ -67,7 +67,6 @@
 #include "material.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mutation.h"
 #include "npc.h"
 #include "options.h"
diff --git a/src/character_body.cpp b/src/character_body.cpp
index 89d0744b6c5b4..f82d84cb0050b 100644
--- a/src/character_body.cpp
+++ b/src/character_body.cpp
@@ -30,7 +30,6 @@
 #include "map.h"
 #include "mapdata.h"
 #include "messages.h"
-#include "morale_types.h"
 #include "output.h"
 #include "overmapbuffer.h"
 #include "pimpl.h"
diff --git a/src/character_morale.cpp b/src/character_morale.cpp
index 87c08c874b4e2..5cdecf5227979 100644
--- a/src/character_morale.cpp
+++ b/src/character_morale.cpp
@@ -17,7 +17,6 @@
 #include "map_iterator.h"
 #include "messages.h"
 #include "morale.h"
-#include "morale_types.h"
 #include "pimpl.h"
 #include "type_id.h"
 #include "units.h"
diff --git a/src/construction.cpp b/src/construction.cpp
index 34cc7b64d0306..be0970bf56227 100644
--- a/src/construction.cpp
+++ b/src/construction.cpp
@@ -46,7 +46,6 @@
 #include "mapdata.h"
 #include "memory_fast.h"
 #include "messages.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "npc.h"
 #include "options.h"
diff --git a/src/consumption.cpp b/src/consumption.cpp
index b557ae48a15f9..5c71bbd673238 100644
--- a/src/consumption.cpp
+++ b/src/consumption.cpp
@@ -48,7 +48,6 @@
 #include "material.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mutation.h"
 #include "npc.h"
 #include "options.h"
diff --git a/src/crafting.cpp b/src/crafting.cpp
index ac77e45a57475..7a689c9d91b5f 100644
--- a/src/crafting.cpp
+++ b/src/crafting.cpp
@@ -56,7 +56,6 @@
 #include "map_selector.h"
 #include "mapdata.h"
 #include "messages.h"
-#include "morale_types.h"
 #include "mutation.h"
 #include "npc.h"
 #include "options.h"
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
index f85cefbe89200..16c31785804b0 100644
--- a/src/debug_menu.cpp
+++ b/src/debug_menu.cpp
@@ -85,7 +85,6 @@
 #include "mission.h"
 #include "mongroup.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "mutation.h"
 #include "npc.h"
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index d5ed5bbf91eb4..4be4a4cb234c5 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -62,7 +62,6 @@
 #include "mapdata.h"
 #include "messages.h"
 #include "mission_companion.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "mutation.h"
 #include "npc.h"
diff --git a/src/iuse.cpp b/src/iuse.cpp
index 7231833b786db..5920ac1b96681 100644
--- a/src/iuse.cpp
+++ b/src/iuse.cpp
@@ -76,7 +76,6 @@
 #include "messages.h"
 #include "mongroup.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "music.h"
 #include "mutation.h"
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 314054936f3eb..47e76b4a674d0 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -62,7 +62,6 @@
 #include "memory_fast.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "music.h"
 #include "mutation.h"
diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp
index 96a56a45baa53..a8fa94bba92cd 100644
--- a/src/magic_spell_effect.cpp
+++ b/src/magic_spell_effect.cpp
@@ -49,7 +49,6 @@
 #include "monster.h"
 #include "monstergenerator.h"
 #include "morale.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "npc.h"
 #include "overmapbuffer.h"
diff --git a/src/monattack.cpp b/src/monattack.cpp
index 3e3eba721e43d..07ef4aeb17344 100644
--- a/src/monattack.cpp
+++ b/src/monattack.cpp
@@ -65,7 +65,6 @@
 #include "mondefense.h"
 #include "monfaction.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "npc.h"
 #include "output.h"
diff --git a/src/mondeath.cpp b/src/mondeath.cpp
index d0133a57f8deb..0c3437aaf7f63 100644
--- a/src/mondeath.cpp
+++ b/src/mondeath.cpp
@@ -35,7 +35,6 @@
 #include "mattack_common.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "point.h"
 #include "rng.h"
diff --git a/src/monster.cpp b/src/monster.cpp
index 4b9ceb608133b..857d8001f7136 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -48,7 +48,6 @@
 #include "mondefense.h"
 #include "monfaction.h"
 #include "mongroup.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "mutation.h"
 #include "npc.h"
diff --git a/src/morale.h b/src/morale.h
index 1e4be94bda88d..0dc43461ab4ac 100644
--- a/src/morale.h
+++ b/src/morale.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "calendar.h"
-#include "morale_types.h"
 #include "type_id.h"
 
 class JsonObject;
diff --git a/src/npc.cpp b/src/npc.cpp
index aaf521ad6505c..6e4df598cd79e 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -51,7 +51,6 @@
 #include "messages.h"
 #include "mission.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "mutation.h"
 #include "npc_class.h"
diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
index e1d2da56ee20c..099bcc2fb4b5e 100644
--- a/src/npctalk_funcs.cpp
+++ b/src/npctalk_funcs.cpp
@@ -44,7 +44,6 @@
 #include "messages.h"
 #include "mission.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mutation.h"
 #include "npc.h"
 #include "npctrade.h"
diff --git a/src/projectile.cpp b/src/projectile.cpp
index 6bc0f588c0b57..44c3af538ab4e 100644
--- a/src/projectile.cpp
+++ b/src/projectile.cpp
@@ -17,7 +17,6 @@
 #include "map_iterator.h"
 #include "mapdata.h"
 #include "messages.h"
-#include "morale_types.h"
 #include "rng.h"
 #include "translations.h"
 #include "type_id.h"
diff --git a/src/ranged.cpp b/src/ranged.cpp
index 4dfaf3bbdf377..7feefc827a885 100644
--- a/src/ranged.cpp
+++ b/src/ranged.cpp
@@ -49,7 +49,6 @@
 #include "memory_fast.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "npc.h"
 #include "options.h"
diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
index 1a488f0ef837b..415cd605f1f60 100644
--- a/src/savegame_json.cpp
+++ b/src/savegame_json.cpp
@@ -93,7 +93,6 @@
 #include "mission.h"
 #include "monster.h"
 #include "morale.h"
-#include "morale_types.h"
 #include "mtype.h"
 #include "mutation.h"
 #include "npc.h"
diff --git a/src/timed_event.cpp b/src/timed_event.cpp
index 5403bf49fb663..5019fda18df48 100644
--- a/src/timed_event.cpp
+++ b/src/timed_event.cpp
@@ -29,7 +29,6 @@
 #include "memorial_logger.h"
 #include "messages.h"
 #include "monster.h"
-#include "morale_types.h"
 #include "options.h"
 #include "rng.h"
 #include "sounds.h"
diff --git a/tests/iuse_test.cpp b/tests/iuse_test.cpp
index be9e002e3290e..6499b7435aa58 100644
--- a/tests/iuse_test.cpp
+++ b/tests/iuse_test.cpp
@@ -9,7 +9,6 @@
 #include "flag.h"
 #include "item.h"
 #include "itype.h"
-#include "morale_types.h"
 #include "player_helpers.h"
 #include "type_id.h"
 #include "value_ptr.h"
diff --git a/tests/mission_test.cpp b/tests/mission_test.cpp
index bc669565eac37..c57a80ad7a2b2 100644
--- a/tests/mission_test.cpp
+++ b/tests/mission_test.cpp
@@ -5,7 +5,6 @@
 #include "player_helpers.h"
 #include "map_helpers.h"
 #include "mission.h"
-#include "morale_types.h"
 #include "npc.h"
 
 static const itype_id itype_test_rock( "test_rock" );
diff --git a/tests/modify_morale_test.cpp b/tests/modify_morale_test.cpp
index fa7a990bf266c..acf5ccbfce225 100644
--- a/tests/modify_morale_test.cpp
+++ b/tests/modify_morale_test.cpp
@@ -11,7 +11,6 @@
 #include "item.h"
 #include "map.h"
 #include "map_helpers.h"
-#include "morale_types.h"
 #include "point.h"
 #include "type_id.h"
 
diff --git a/tests/morale_test.cpp b/tests/morale_test.cpp
index 67f1fd83f7f40..8e7bd4225e46e 100644
--- a/tests/morale_test.cpp
+++ b/tests/morale_test.cpp
@@ -7,7 +7,6 @@
 #include "character.h"
 #include "item.h"
 #include "morale.h"
-#include "morale_types.h"
 #include "npc.h"
 #include "player_helpers.h"
 #include "calendar.h"
diff --git a/tests/npc_talk_test.cpp b/tests/npc_talk_test.cpp
index 751317b9d3d09..dabb3f32e8626 100644
--- a/tests/npc_talk_test.cpp
+++ b/tests/npc_talk_test.cpp
@@ -23,7 +23,6 @@
 #include "map.h"
 #include "map_helpers.h"
 #include "mission.h"
-#include "morale_types.h"
 #include "npc.h"
 #include "npctalk.h"
 #include "overmapbuffer.h"
diff --git a/tests/reading_test.cpp b/tests/reading_test.cpp
index e93a6d8c200ac..247663b0e25c3 100644
--- a/tests/reading_test.cpp
+++ b/tests/reading_test.cpp
@@ -12,7 +12,6 @@
 #include "item.h"
 #include "itype.h"
 #include "map_helpers.h"
-#include "morale_types.h"
 #include "player_helpers.h"
 #include "skill.h"
 #include "type_id.h"