[Scummvm-git-logs] scummvm master -> c62b0f381842d61f580c4b2bdd97005738f052c2

[OMGPizzaGuy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
c62b0f3818 ULTIMA8: JANITORIAL: Clean up includes


Commit: c62b0f381842d61f580c4b2bdd97005738f052c2
    https://github.com/scummvm/scummvm/commit/c62b0f381842d61f580c4b2bdd97005738f052c2
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2026-02-08T11:58:56-06:00

Commit Message:
ULTIMA8: JANITORIAL: Clean up includes

Changed paths:
    engines/ultima/ultima8/audio/audio_channel.cpp
    engines/ultima/ultima8/audio/audio_process.cpp
    engines/ultima/ultima8/audio/audio_sample.cpp
    engines/ultima/ultima8/audio/audio_sample.h
    engines/ultima/ultima8/audio/music_process.h
    engines/ultima/ultima8/audio/raw_audio_sample.cpp
    engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
    engines/ultima/ultima8/audio/sonarc_audio_sample.h
    engines/ultima/ultima8/audio/sound_flex.cpp
    engines/ultima/ultima8/audio/sound_flex.h
    engines/ultima/ultima8/audio/speech_flex.cpp
    engines/ultima/ultima8/audio/speech_flex.h
    engines/ultima/ultima8/conf/config_file_manager.cpp
    engines/ultima/ultima8/conf/config_file_manager.h
    engines/ultima/ultima8/convert/convert_shape.cpp
    engines/ultima/ultima8/debugtools.cpp
    engines/ultima/ultima8/filesys/archive.cpp
    engines/ultima/ultima8/filesys/archive.h
    engines/ultima/ultima8/filesys/savegame.h
    engines/ultima/ultima8/filesys/u8_save_file.h
    engines/ultima/ultima8/games/game.cpp
    engines/ultima/ultima8/games/game.h
    engines/ultima/ultima8/games/game_data.cpp
    engines/ultima/ultima8/games/game_data.h
    engines/ultima/ultima8/games/game_info.cpp
    engines/ultima/ultima8/games/game_info.h
    engines/ultima/ultima8/games/treasure_loader.h
    engines/ultima/ultima8/games/u8_game.cpp
    engines/ultima/ultima8/gfx/anim_dat.h
    engines/ultima/ultima8/gfx/cycle_process.cpp
    engines/ultima/ultima8/gfx/cycle_process.h
    engines/ultima/ultima8/gfx/fonts/font.cpp
    engines/ultima/ultima8/gfx/fonts/font.h
    engines/ultima/ultima8/gfx/fonts/font_manager.cpp
    engines/ultima/ultima8/gfx/fonts/font_manager.h
    engines/ultima/ultima8/gfx/fonts/jp_font.cpp
    engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
    engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
    engines/ultima/ultima8/gfx/fonts/rendered_text.h
    engines/ultima/ultima8/gfx/fonts/shape_font.cpp
    engines/ultima/ultima8/gfx/fonts/tt_font.cpp
    engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
    engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
    engines/ultima/ultima8/gfx/palette.cpp
    engines/ultima/ultima8/gfx/palette_manager.cpp
    engines/ultima/ultima8/gfx/palette_manager.h
    engines/ultima/ultima8/gfx/shape.h
    engines/ultima/ultima8/gfx/shape_info.cpp
    engines/ultima/ultima8/gfx/skf_player.cpp
    engines/ultima/ultima8/gfx/skf_player.h
    engines/ultima/ultima8/gfx/type_flags.h
    engines/ultima/ultima8/gumps/computer_gump.cpp
    engines/ultima/ultima8/gumps/cru_credits_gump.cpp
    engines/ultima/ultima8/gumps/cru_demo_gump.cpp
    engines/ultima/ultima8/gumps/cru_energy_gump.cpp
    engines/ultima/ultima8/gumps/cru_health_gump.cpp
    engines/ultima/ultima8/gumps/cru_menu_gump.cpp
    engines/ultima/ultima8/gumps/gump.h
    engines/ultima/ultima8/gumps/message_box_gump.h
    engines/ultima/ultima8/gumps/mini_stats_gump.cpp
    engines/ultima/ultima8/gumps/minimap_gump.cpp
    engines/ultima/ultima8/gumps/paperdoll_gump.h
    engines/ultima/ultima8/gumps/shape_viewer_gump.h
    engines/ultima/ultima8/gumps/slider_gump.cpp
    engines/ultima/ultima8/gumps/u8_save_gump.cpp
    engines/ultima/ultima8/gumps/weasel_dat.h
    engines/ultima/ultima8/gumps/weasel_gump.h
    engines/ultima/ultima8/gumps/widgets/button_widget.h
    engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
    engines/ultima/ultima8/gumps/widgets/text_widget.cpp
    engines/ultima/ultima8/kernel/delay_process.cpp
    engines/ultima/ultima8/kernel/kernel.h
    engines/ultima/ultima8/kernel/mouse.cpp
    engines/ultima/ultima8/kernel/mouse.h
    engines/ultima/ultima8/kernel/object.cpp
    engines/ultima/ultima8/kernel/object.h
    engines/ultima/ultima8/kernel/object_manager.h
    engines/ultima/ultima8/kernel/process.h
    engines/ultima/ultima8/metaengine.cpp
    engines/ultima/ultima8/misc/debugger.cpp
    engines/ultima/ultima8/misc/debugger.h
    engines/ultima/ultima8/misc/id_man.cpp
    engines/ultima/ultima8/misc/id_man.h
    engines/ultima/ultima8/misc/point3.h
    engines/ultima/ultima8/misc/util.h
    engines/ultima/ultima8/ultima8.cpp
    engines/ultima/ultima8/ultima8.h
    engines/ultima/ultima8/usecode/bit_set.cpp
    engines/ultima/ultima8/usecode/byte_set.cpp
    engines/ultima/ultima8/usecode/global_storage.h
    engines/ultima/ultima8/usecode/regret_intrinsics.h
    engines/ultima/ultima8/usecode/remorse_intrinsics.h
    engines/ultima/ultima8/usecode/uc_list.cpp
    engines/ultima/ultima8/usecode/uc_list.h
    engines/ultima/ultima8/usecode/uc_machine.h
    engines/ultima/ultima8/usecode/uc_process.h
    engines/ultima/ultima8/usecode/uc_stack.cpp
    engines/ultima/ultima8/usecode/uc_stack.h
    engines/ultima/ultima8/usecode/usecode.cpp
    engines/ultima/ultima8/usecode/usecode.h
    engines/ultima/ultima8/world/actors/actor_anim.h
    engines/ultima/ultima8/world/actors/actor_anim_process.cpp
    engines/ultima/ultima8/world/actors/anim_action.h
    engines/ultima/ultima8/world/actors/animation_tracker.h
    engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
    engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
    engines/ultima/ultima8/world/actors/avatar_mover_process.h
    engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
    engines/ultima/ultima8/world/actors/main_actor.cpp
    engines/ultima/ultima8/world/actors/pathfinder.cpp
    engines/ultima/ultima8/world/actors/pathfinder.h
    engines/ultima/ultima8/world/actors/treasure_info.h
    engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
    engines/ultima/ultima8/world/actors/weapon_overlay.h
    engines/ultima/ultima8/world/container.h
    engines/ultima/ultima8/world/current_map.cpp
    engines/ultima/ultima8/world/current_map.h
    engines/ultima/ultima8/world/damage_info.cpp
    engines/ultima/ultima8/world/damage_info.h
    engines/ultima/ultima8/world/egg_hatcher_process.h
    engines/ultima/ultima8/world/fire_type_table.cpp
    engines/ultima/ultima8/world/fire_type_table.h
    engines/ultima/ultima8/world/get_object.cpp
    engines/ultima/ultima8/world/get_object.h
    engines/ultima/ultima8/world/item_factory.cpp
    engines/ultima/ultima8/world/item_factory.h
    engines/ultima/ultima8/world/map.cpp
    engines/ultima/ultima8/world/map.h
    engines/ultima/ultima8/world/map_glob.cpp
    engines/ultima/ultima8/world/map_glob.h
    engines/ultima/ultima8/world/missile_tracker.cpp
    engines/ultima/ultima8/world/missile_tracker.h
    engines/ultima/ultima8/world/sort_item.h
    engines/ultima/ultima8/world/split_item_process.cpp
    engines/ultima/ultima8/world/sprite_process.cpp
    engines/ultima/ultima8/world/super_sprite_process.cpp
    engines/ultima/ultima8/world/world.h


diff --git a/engines/ultima/ultima8/audio/audio_channel.cpp b/engines/ultima/ultima8/audio/audio_channel.cpp
index 8503c4a1023..8e0865d32fb 100644
--- a/engines/ultima/ultima8/audio/audio_channel.cpp
+++ b/engines/ultima/ultima8/audio/audio_channel.cpp
@@ -19,13 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/audio/audio_channel.h"
+
+#include "audio/audiostream.h"
 #include "ultima/ultima8/audio/audio_process.h"
 #include "ultima/ultima8/audio/audio_sample.h"
-#include "common/memstream.h"
-#include "audio/audiostream.h"
-#include "audio/decoders/raw.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 64065763eb3..61aba953689 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -20,6 +20,8 @@
  */
 
 #include "ultima/ultima8/audio/audio_process.h"
+
+#include "common/debug.h"
 #include "ultima/ultima8/usecode/uc_machine.h"
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/audio/speech_flex.h"
diff --git a/engines/ultima/ultima8/audio/audio_sample.cpp b/engines/ultima/ultima8/audio/audio_sample.cpp
index 25aaa1cb281..76c58fd53e3 100644
--- a/engines/ultima/ultima8/audio/audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/audio_sample.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/audio/audio_sample.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/audio/audio_sample.h b/engines/ultima/ultima8/audio/audio_sample.h
index 4bfd498e161..c5ed19e04af 100644
--- a/engines/ultima/ultima8/audio/audio_sample.h
+++ b/engines/ultima/ultima8/audio/audio_sample.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_AUDIO_AUDIOSAMPLE_H
 #define ULTIMA8_AUDIO_AUDIOSAMPLE_H
 
+#include "common/scummsys.h"
+
 namespace Audio {
 class SeekableAudioStream;
 }
diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h
index 729f485e8d8..3a791b8b727 100644
--- a/engines/ultima/ultima8/audio/music_process.h
+++ b/engines/ultima/ultima8/audio/music_process.h
@@ -25,7 +25,6 @@
 #include "ultima/ultima8/kernel/process.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
 #include "ultima/ultima8/misc/classtype.h"
-#include "audio/mididrv.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.cpp b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
index 38e7ad79f14..45871ccf4cf 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/audio/raw_audio_sample.h"
-#include "common/memstream.h"
+
 #include "audio/decoders/raw.h"
+#include "common/memstream.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
index 32d0ab40ba3..75c6ddf2be3 100644
--- a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/audio/sonarc_audio_sample.h"
-#include "common/memstream.h"
+
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
+#include "common/memstream.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/sonarc_audio_sample.h b/engines/ultima/ultima8/audio/sonarc_audio_sample.h
index 9578d8440d6..aa2910d78e5 100644
--- a/engines/ultima/ultima8/audio/sonarc_audio_sample.h
+++ b/engines/ultima/ultima8/audio/sonarc_audio_sample.h
@@ -22,6 +22,7 @@
 #ifndef ULTIMA8_AUDIO_SONARCAUDIOSAMPLE_H
 #define ULTIMA8_AUDIO_SONARCAUDIOSAMPLE_H
 
+#include "common/scummsys.h"
 #include "ultima/ultima8/audio/audio_sample.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/audio/sound_flex.cpp b/engines/ultima/ultima8/audio/sound_flex.cpp
index b5006bb0f91..1a6ec6759af 100644
--- a/engines/ultima/ultima8/audio/sound_flex.cpp
+++ b/engines/ultima/ultima8/audio/sound_flex.cpp
@@ -19,13 +19,12 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/audio/sound_flex.h"
-#include "ultima/ultima8/audio/sonarc_audio_sample.h"
-#include "ultima/ultima8/audio/raw_audio_sample.h"
 
+#include "common/debug.h"
 #include "common/memstream.h"
+#include "ultima/ultima8/audio/sonarc_audio_sample.h"
+#include "ultima/ultima8/audio/raw_audio_sample.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index 812ef8cf11b..99b94e1478a 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -22,6 +22,7 @@
 #ifndef ULTIMA8_AUDIO_SOUNDFLEX_H
 #define ULTIMA8_AUDIO_SOUNDFLEX_H
 
+#include "common/array.h"
 #include "common/str.h"
 #include "ultima/ultima8/filesys/archive.h"
 
diff --git a/engines/ultima/ultima8/audio/speech_flex.cpp b/engines/ultima/ultima8/audio/speech_flex.cpp
index bd354be7b95..04cff8cc30a 100644
--- a/engines/ultima/ultima8/audio/speech_flex.cpp
+++ b/engines/ultima/ultima8/audio/speech_flex.cpp
@@ -19,10 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/audio/speech_flex.h"
+
+#include "common/debug.h"
 #include "ultima/ultima8/audio/audio_sample.h"
+#include "ultima/ultima8/misc/debugger.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/speech_flex.h b/engines/ultima/ultima8/audio/speech_flex.h
index b30a7a42cf5..022f85a7e49 100644
--- a/engines/ultima/ultima8/audio/speech_flex.h
+++ b/engines/ultima/ultima8/audio/speech_flex.h
@@ -23,7 +23,6 @@
 #define ULTIMA8_AUDIO_SPEECHFLEX_H
 
 #include "ultima/ultima8/audio/sound_flex.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index cb259e6e677..51baacd483a 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "common/file.h"
-
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/conf/config_file_manager.h"
 
+#include "common/debug.h"
+#include "common/file.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/conf/config_file_manager.h b/engines/ultima/ultima8/conf/config_file_manager.h
index eee7b7d79c4..9e10b77bc39 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.h
+++ b/engines/ultima/ultima8/conf/config_file_manager.h
@@ -24,7 +24,6 @@
 
 #include "common/formats/ini-file.h"
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index a981a0b8c40..c59262e63ba 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -19,9 +19,11 @@
  *
  */
 
+#include "ultima/ultima8/convert/convert_shape.h"
+
+#include "common/debug.h"
 #include "common/memstream.h"
 #include "ultima/ultima.h"
-#include "ultima/ultima8/convert/convert_shape.h"
 #include "ultima/ultima8/misc/stream_util.h"
 #include "ultima/ultima8/misc/debugger.h"
 
diff --git a/engines/ultima/ultima8/debugtools.cpp b/engines/ultima/ultima8/debugtools.cpp
index 59814e51d83..680f4843a42 100644
--- a/engines/ultima/ultima8/debugtools.cpp
+++ b/engines/ultima/ultima8/debugtools.cpp
@@ -20,22 +20,21 @@
  */
 
 #include "ultima/ultima8/debugtools.h"
+
 #include "backends/imgui/imgui.h"
 #include "backends/imgui/imgui_utils.h"
 #include "ultima/ultima.h"
-#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gumps/game_map_gump.h"
 #include "ultima/ultima8/gumps/item_relative_gump.h"
 #include "ultima/ultima8/gumps/target_gump.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/usecode/usecode.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
 #include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/misc/debugger.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/archive.cpp b/engines/ultima/ultima8/filesys/archive.cpp
index 289dc20f286..36ca9fed601 100644
--- a/engines/ultima/ultima8/filesys/archive.cpp
+++ b/engines/ultima/ultima8/filesys/archive.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/filesys/archive.h"
+
+#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/filesys/flex_file.h"
-#include "ultima/ultima8/filesys/u8_save_file.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/archive.h b/engines/ultima/ultima8/filesys/archive.h
index 2af67287529..69476114d4a 100644
--- a/engines/ultima/ultima8/filesys/archive.h
+++ b/engines/ultima/ultima8/filesys/archive.h
@@ -22,8 +22,8 @@
 #ifndef ULTIMA8_FILESYS_ARCHIVE_H
 #define ULTIMA8_FILESYS_ARCHIVE_H
 
+#include "common/array.h"
 #include "common/scummsys.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Common {
 	class SeekableReadStream;
diff --git a/engines/ultima/ultima8/filesys/savegame.h b/engines/ultima/ultima8/filesys/savegame.h
index c2028993eef..e9de07b561c 100644
--- a/engines/ultima/ultima8/filesys/savegame.h
+++ b/engines/ultima/ultima8/filesys/savegame.h
@@ -22,10 +22,9 @@
 #ifndef ULTIMA8_FILESYS_SAVEGAME_H
 #define ULTIMA8_FILESYS_SAVEGAME_H
 
+#include "common/memstream.h"
 #include "common/str.h"
-#include "common/hashmap.h"
 #include "common/stream.h"
-#include "common/memstream.h"
 #include "engines/metaengine.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.h b/engines/ultima/ultima8/filesys/u8_save_file.h
index 153338874f6..ac3e6cd99c9 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.h
+++ b/engines/ultima/ultima8/filesys/u8_save_file.h
@@ -23,8 +23,6 @@
 #define ULTIMA8_FILESYS_U8SAVEFILE_H
 
 #include "common/archive.h"
-
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index b29374969f7..b2891228b51 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -19,8 +19,10 @@
  *
  */
 
-#include "common/config-manager.h"
+#include "ultima/ultima8/games/game.h"
 
+#include "common/config-manager.h"
+#include "common/stream.h"
 #include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/games/u8_game.h"
 #include "ultima/ultima8/games/cru_game.h"
diff --git a/engines/ultima/ultima8/games/game.h b/engines/ultima/ultima8/games/game.h
index 6aca3191ac7..0ee4617abb2 100644
--- a/engines/ultima/ultima8/games/game.h
+++ b/engines/ultima/ultima8/games/game.h
@@ -23,6 +23,7 @@
 #define ULTIMA8_GAMES_GAME_H
 
 #include "ultima/ultima8/games/game_info.h"
+#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 2b782c7f441..c638ba3008f 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -19,30 +19,29 @@
  *
  */
 
+#include "ultima/ultima8/games/game_data.h"
+
 #include "common/config-manager.h"
 #include "common/file.h"
-
-#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/misc/util.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/usecode/usecode_flex.h"
-#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/audio/music_flex.h"
+#include "ultima/ultima8/audio/speech_flex.h"
+#include "ultima/ultima8/conf/config_file_manager.h"
+#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
+#include "ultima/ultima8/games/game_info.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
 #include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
 #include "ultima/ultima8/gfx/gump_shape_archive.h"
-#include "ultima/ultima8/world/map_glob.h"
-#include "ultima/ultima8/world/fire_type_table.h"
-#include "ultima/ultima8/world/actors/npc_dat.h"
-#include "ultima/ultima8/world/actors/combat_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/shape.h"
 #include "ultima/ultima8/gfx/wpn_ovlay_dat.h"
-#include "ultima/ultima8/gfx/fonts/font_manager.h"
-#include "ultima/ultima8/games/game_info.h"
 #include "ultima/ultima8/gumps/weasel_dat.h"
-#include "ultima/ultima8/conf/config_file_manager.h"
-#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
-#include "ultima/ultima8/audio/music_flex.h"
-#include "ultima/ultima8/audio/speech_flex.h"
+#include "ultima/ultima8/misc/util.h"
+#include "ultima/ultima8/usecode/usecode_flex.h"
+#include "ultima/ultima8/world/actors/combat_dat.h"
+#include "ultima/ultima8/world/actors/npc_dat.h"
+#include "ultima/ultima8/world/fire_type_table.h"
+#include "ultima/ultima8/world/map_glob.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/game_data.h b/engines/ultima/ultima8/games/game_data.h
index 9cb0d10bc6c..8fff7106860 100644
--- a/engines/ultima/ultima8/games/game_data.h
+++ b/engines/ultima/ultima8/games/game_data.h
@@ -22,7 +22,7 @@
 #ifndef ULTIMA8_GAMES_GAMEDATA_H
 #define ULTIMA8_GAMES_GAMEDATA_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "common/str.h"
 #include "ultima/ultima8/gfx/frame_id.h"
 
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index a4d07ed4fdc..3af0565778b 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -19,9 +19,10 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/games/game_info.h"
+
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/misc/util.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/games/game_info.h b/engines/ultima/ultima8/games/game_info.h
index f24a7ed9662..797b4dd5dea 100644
--- a/engines/ultima/ultima8/games/game_info.h
+++ b/engines/ultima/ultima8/games/game_info.h
@@ -24,6 +24,11 @@
 
 #include "common/str.h"
 
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/games/treasure_loader.h b/engines/ultima/ultima8/games/treasure_loader.h
index 356414667c1..5dfc629037e 100644
--- a/engines/ultima/ultima8/games/treasure_loader.h
+++ b/engines/ultima/ultima8/games/treasure_loader.h
@@ -22,8 +22,9 @@
 #ifndef ULTIMA8_GAMES_TREASURELOADER_H
 #define ULTIMA8_GAMES_TREASURELOADER_H
 
+#include "common/hash-str.h"
+#include "common/hashmap.h"
 #include "ultima/ultima8/world/actors/treasure_info.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index ed2772412a1..2fc7659fc48 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -19,33 +19,29 @@
  *
  */
 
+#include "ultima/ultima8/games/u8_game.h"
+
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/memstream.h"
 #include "common/translation.h"
-
 #include "gui/error.h"
-
-#include "ultima/ultima8/misc/debugger.h"
-
-#include "ultima/ultima8/games/u8_game.h"
-
-#include "ultima/ultima8/gfx/palette_manager.h"
-#include "ultima/ultima8/gfx/fade_to_modal_process.h"
+#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/audio/music_process.h"
+#include "ultima/ultima8/filesys/u8_save_file.h"
 #include "ultima/ultima8/games/game_data.h"
+#include "ultima/ultima8/games/start_u8_process.h"
+#include "ultima/ultima8/gfx/fade_to_modal_process.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/xform_blend.h"
-#include "ultima/ultima8/filesys/u8_save_file.h"
-#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/movie_gump.h"
 #include "ultima/ultima8/gumps/credits_gump.h"
+#include "ultima/ultima8/gumps/movie_gump.h"
 #include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/games/start_u8_process.h"
+#include "ultima/ultima8/kernel/object_manager.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/get_object.h"
-#include "common/memstream.h"
+#include "ultima/ultima8/world/item_factory.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/anim_dat.h b/engines/ultima/ultima8/gfx/anim_dat.h
index 50dc7395810..218839073b6 100644
--- a/engines/ultima/ultima8/gfx/anim_dat.h
+++ b/engines/ultima/ultima8/gfx/anim_dat.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA8_GFX_ANIMDAT_H
 #define ULTIMA8_GFX_ANIMDAT_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/world/actors/animation.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/cycle_process.cpp b/engines/ultima/ultima8/gfx/cycle_process.cpp
index d1728ae787d..7fa845491fb 100644
--- a/engines/ultima/ultima8/gfx/cycle_process.cpp
+++ b/engines/ultima/ultima8/gfx/cycle_process.cpp
@@ -20,7 +20,9 @@
  */
 
 #include "ultima/ultima8/gfx/cycle_process.h"
+
 #include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/cycle_process.h b/engines/ultima/ultima8/gfx/cycle_process.h
index acee17e59c2..3c9cdf6c845 100644
--- a/engines/ultima/ultima8/gfx/cycle_process.h
+++ b/engines/ultima/ultima8/gfx/cycle_process.h
@@ -23,7 +23,6 @@
 #define ULTIMA8_GFX_CYCLEPROCESS_H
 
 #include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/misc/classtype.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/fonts/font.cpp b/engines/ultima/ultima8/gfx/fonts/font.cpp
index 367cbe59fef..d1ee32b408c 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font.cpp
@@ -19,10 +19,10 @@
  *
  */
 
+#include "ultima/ultima8/gfx/fonts/font.h"
+
 #include "ultima/ultima.h"
 #include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/gfx/fonts/font.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/fonts/font.h b/engines/ultima/ultima8/gfx/fonts/font.h
index 6bf8f759d06..e840a7b2688 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.h
+++ b/engines/ultima/ultima8/gfx/fonts/font.h
@@ -22,9 +22,8 @@
 #ifndef ULTIMA8_GFX_FONTS_FONT_H
 #define ULTIMA8_GFX_FONTS_FONT_H
 
+#include "common/list.h"
 #include "common/rect.h"
-
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 #include "ultima/ultima8/misc/encoding.h"
 
diff --git a/engines/ultima/ultima8/gfx/fonts/font_manager.cpp b/engines/ultima/ultima8/gfx/fonts/font_manager.cpp
index e81e939ed33..2bce6bafd6e 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.cpp
@@ -19,14 +19,12 @@
  *
  */
 
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+
 #include "common/config-manager.h"
 #include "common/file.h"
-
+#include "graphics/fonts/ttf.h"
 #include "ultima/ultima.h"
-#include "ultima/ultima8/misc/common_types.h"
-
-#include "ultima/ultima8/gfx/fonts/font_manager.h"
-
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/fonts/shape_font.h"
 #include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
@@ -35,8 +33,6 @@
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 
-#include "graphics/fonts/ttf.h"
-
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/gfx/fonts/font_manager.h b/engines/ultima/ultima8/gfx/fonts/font_manager.h
index d1555a45298..8aa7e0d604a 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_manager.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.h
@@ -22,8 +22,7 @@
 #ifndef ULTIMA8_GFX_FONTS_FONTMANAGER_H
 #define ULTIMA8_GFX_FONTS_FONTMANAGER_H
 
-#include "ultima/shared/std/containers.h"
-#include "common/str.h"
+#include "common/hashmap.h"
 #include "common/path.h"
 #include "graphics/font.h"
 
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
index 810268c80ee..17e07c8908a 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
@@ -19,12 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/gfx/fonts/jp_font.h"
+
+#include "ultima/ultima8/gfx/fonts/jp_rendered_text.h"
 #include "ultima/ultima8/gfx/fonts/shape_font.h"
 #include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/gfx/fonts/jp_rendered_text.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
index f181bda9b8c..b71139ed41e 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/gfx/fonts/jp_rendered_text.h"
+
 #include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/render_surface.h"
 #include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/misc/debugger.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
index f6b84d7ed3e..358734fd0e5 100644
--- a/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/gfx/fonts/rendered_text.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/fonts/rendered_text.h b/engines/ultima/ultima8/gfx/fonts/rendered_text.h
index 72e14858cfb..f125e8dd0e4 100644
--- a/engines/ultima/ultima8/gfx/fonts/rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/rendered_text.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_GFX_FONTS_RENDEREDTEXT_H
 #define ULTIMA8_GFX_FONTS_RENDEREDTEXT_H
 
+#include "common/scummsys.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
index 0a666be481d..e33d40317fc 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/gfx/fonts/shape_font.h"
-#include "ultima/ultima8/gfx/shape_frame.h"
+
 #include "ultima/ultima8/gfx/fonts/shape_rendered_text.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
index 9e5cc207f8c..d17973315e5 100644
--- a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
@@ -19,13 +19,12 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/gfx/fonts/tt_font.h"
-#include "ultima/ultima8/gfx/fonts/ttf_rendered_text.h"
-#include "ultima/ultima8/gfx/texture.h"
 
+#include "ultima/ultima8/misc/common_types.h"
+#include "ultima/ultima8/gfx/fonts/ttf_rendered_text.h"
 
-//include iomanip
+// include iomanip
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
index 3319cb8141a..58f90a8bed4 100644
--- a/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/gfx/fonts/ttf_rendered_text.h"
+
 #include "ultima/ultima8/gfx/fonts/tt_font.h"
 #include "ultima/ultima8/gfx/render_surface.h"
 
diff --git a/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
index 3e65329b101..7e156e6895e 100644
--- a/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
@@ -22,9 +22,8 @@
 #ifndef ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
 #define ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
 
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
-#include "ultima/ultima8/gfx/fonts/font.h"
 #include "graphics/managed_surface.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/palette.cpp b/engines/ultima/ultima8/gfx/palette.cpp
index eba4d4dea6c..5bc0f72d48f 100644
--- a/engines/ultima/ultima8/gfx/palette.cpp
+++ b/engines/ultima/ultima8/gfx/palette.cpp
@@ -20,8 +20,9 @@
  */
 
 #include "ultima/ultima8/gfx/palette.h"
+
+#include "common/stream.h"
 #include "ultima/ultima8/gfx/texture.h"
-#include "ultima/ultima8/misc/debugger.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/palette_manager.cpp b/engines/ultima/ultima8/gfx/palette_manager.cpp
index 05d43a74b4f..c63d4fe5dd1 100644
--- a/engines/ultima/ultima8/gfx/palette_manager.cpp
+++ b/engines/ultima/ultima8/gfx/palette_manager.cpp
@@ -19,11 +19,13 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/gfx/palette_manager.h"
+
+#include "common/debug.h"
+#include "common/stream.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/misc/debugger.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/palette_manager.h b/engines/ultima/ultima8/gfx/palette_manager.h
index 870925c34ea..a2c119227e5 100644
--- a/engines/ultima/ultima8/gfx/palette_manager.h
+++ b/engines/ultima/ultima8/gfx/palette_manager.h
@@ -22,10 +22,15 @@
 #ifndef ULTIMA8_GFX_PALETTEMANAGER_H
 #define ULTIMA8_GFX_PALETTEMANAGER_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "graphics/pixelformat.h"
 #include "ultima/ultima8/gfx/pal_transforms.h"
 
+namespace Common {
+class WriteStream;
+class ReadStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/gfx/shape.h b/engines/ultima/ultima8/gfx/shape.h
index 122085cfafd..0607ba3dc26 100644
--- a/engines/ultima/ultima8/gfx/shape.h
+++ b/engines/ultima/ultima8/gfx/shape.h
@@ -22,8 +22,7 @@
 #ifndef ULTIMA8_GFX_SHAPE_H
 #define ULTIMA8_GFX_SHAPE_H
 
-#include "ultima/shared/std/containers.h"
-
+#include "common/array.h"
 #include "common/stream.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/shape_info.cpp b/engines/ultima/ultima8/gfx/shape_info.cpp
index bfbf583aa56..aa8669f3a87 100644
--- a/engines/ultima/ultima8/gfx/shape_info.cpp
+++ b/engines/ultima/ultima8/gfx/shape_info.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
-
 #include "ultima/ultima8/gfx/shape_info.h"
 #include "ultima/ultima8/ultima8.h"
 
diff --git a/engines/ultima/ultima8/gfx/skf_player.cpp b/engines/ultima/ultima8/gfx/skf_player.cpp
index 1e8f122bfa1..276a0c2f511 100644
--- a/engines/ultima/ultima8/gfx/skf_player.cpp
+++ b/engines/ultima/ultima8/gfx/skf_player.cpp
@@ -19,22 +19,22 @@
  *
  */
 
-#include "ultima/ultima.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/gfx/skf_player.h"
-#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
-#include "ultima/ultima8/gfx/shape.h"
-#include "ultima/ultima8/gfx/texture.h"
-#include "ultima/ultima8/audio/music_process.h"
+
+#include "common/config-manager.h"
+#include "common/system.h"
+#include "ultima/ultima.h"
 #include "ultima/ultima8/audio/audio_process.h"
+#include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/audio/raw_audio_sample.h"
+#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
+#include "ultima/ultima8/filesys/raw_archive.h"
 #include "ultima/ultima8/gfx/fonts/font.h"
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
 #include "ultima/ultima8/gfx/fonts/rendered_text.h"
-#include "common/config-manager.h"
-#include "common/system.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/skf_player.h b/engines/ultima/ultima8/gfx/skf_player.h
index cd6b06743b8..ef2fd4823ec 100644
--- a/engines/ultima/ultima8/gfx/skf_player.h
+++ b/engines/ultima/ultima8/gfx/skf_player.h
@@ -22,10 +22,13 @@
 #ifndef ULTIMA8_GFX_SKFPLAYER_H
 #define ULTIMA8_GFX_SKFPLAYER_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/gfx/movie_player.h"
-#include "ultima/ultima8/gfx/render_surface.h"
 #include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gfx/type_flags.h b/engines/ultima/ultima8/gfx/type_flags.h
index 05a1aebec8a..ecf949d6c82 100644
--- a/engines/ultima/ultima8/gfx/type_flags.h
+++ b/engines/ultima/ultima8/gfx/type_flags.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA8_GFX_TYPEFLAGS_H
 #define ULTIMA8_GFX_TYPEFLAGS_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/gfx/shape_info.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/computer_gump.cpp b/engines/ultima/ultima8/gumps/computer_gump.cpp
index 74cbaea40e0..e5d29a2bffa 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/computer_gump.cpp
@@ -19,19 +19,18 @@
  *
  */
 
-#include "common/keyboard.h"
+#include "ultima/ultima8/gumps/computer_gump.h"
 
+#include "common/keyboard.h"
 #include "common/str.h"
-#include "ultima/ultima8/gumps/computer_gump.h"
-#include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/gfx/shape.h"
-#include "ultima/ultima8/gfx/gump_shape_archive.h"
-#include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/fonts/font.h"
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
-#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
 #include "ultima/ultima8/usecode/uc_machine.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_credits_gump.cpp b/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
index ff5bc8400be..7d231c5760c 100644
--- a/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
@@ -19,21 +19,21 @@
  *
  */
 
-#include "common/config-manager.h"
-#include "image/bmp.h"
-
 #include "ultima/ultima8/gumps/cru_credits_gump.h"
 
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/palette_manager.h"
-#include "ultima/ultima8/gfx/texture.h"
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "common/config-manager.h"
+#include "common/stream.h"
+#include "image/bmp.h"
+#include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/gfx/fonts/font.h"
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
 #include "ultima/ultima8/gfx/fonts/shape_font.h"
-#include "ultima/ultima8/audio/music_process.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/kernel/mouse.h"
+#include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_demo_gump.cpp b/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
index 5b92bf65cea..ebeff19f476 100644
--- a/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "common/config-manager.h"
-#include "image/bmp.h"
-
 #include "ultima/ultima8/gumps/cru_demo_gump.h"
 
+#include "common/config-manager.h"
+#include "common/stack.h"
+#include "image/bmp.h"
 #include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/kernel/mouse.h"
 #include "ultima/ultima8/gfx/render_surface.h"
diff --git a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
index c1572bf4848..56a69eaa5fd 100644
--- a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
@@ -21,11 +21,10 @@
 
 #include "ultima/ultima8/gumps/cru_energy_gump.h"
 
-#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_health_gump.cpp b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
index e5bcfa5bafb..bdb93daa7f2 100644
--- a/engines/ultima/ultima8/gumps/cru_health_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
@@ -21,11 +21,10 @@
 
 #include "ultima/ultima8/gumps/cru_health_gump.h"
 
-#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
index 3851e16117e..0e4c2367c42 100644
--- a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
@@ -20,25 +20,22 @@
  */
 
 #include "ultima/ultima8/gumps/cru_menu_gump.h"
+
+#include "engines/dialogs.h"
+#include "ultima/ultima8/audio/music_process.h"
+#include "ultima/ultima8/games/cru_game.h"
+#include "ultima/ultima8/games/game.h"
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/shape.h"
 #include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/gumps/widgets/button_widget.h"
 #include "ultima/ultima8/gumps/quit_gump.h"
-#include "ultima/ultima8/gumps/difficulty_gump.h"
-#include "ultima/ultima8/games/cru_game.h"
-#include "ultima/ultima8/games/game.h"
+#include "ultima/ultima8/gumps/widgets/button_widget.h"
+#include "ultima/ultima8/kernel/mouse.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/gfx/palette_manager.h"
-#include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/metaengine.h"
-
-#include "engines/dialogs.h"
-#include "gui/saveload.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index 9d1f2595647..560e0c7f9a1 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -23,9 +23,8 @@
 #define ULTIMA8_GUMPS_GUMP_H
 
 #include "common/rect.h"
-#include "ultima/ultima8/kernel/object.h"
 #include "ultima/ultima8/gfx/frame_id.h"
-#include "ultima/shared/std/containers.h"
+#include "ultima/ultima8/kernel/object.h"
 #include "ultima/ultima8/misc/classtype.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index f94aae16a50..86f6a207b73 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -22,13 +22,11 @@
 #ifndef ULTIMA8_GUMPS_MESSAGEBOXGUMP_H
 #define ULTIMA8_GUMPS_MESSAGEBOXGUMP_H
 
-#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
-
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/classtype.h"
 #include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/gumps/modal_gump.h"
+#include "ultima/ultima8/misc/classtype.h"
+#include "ultima/ultima8/usecode/intrinsics.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
index d03177ab1ad..70fc4b42d6d 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
@@ -25,10 +25,9 @@
 #include "ultima/ultima8/gfx/gump_shape_archive.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/texture.h"
 #include "ultima/ultima8/kernel/mouse.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 0e114b149c1..f1716555197 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -20,16 +20,15 @@
  */
 
 #include "ultima/ultima8/gumps/minimap_gump.h"
-#include "ultima/ultima8/world/minimap.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/palette_manager.h"
 #include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/texture.h"
-#include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/kernel/mouse.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/world/current_map.h"
+#include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/minimap.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.h b/engines/ultima/ultima8/gumps/paperdoll_gump.h
index 8b8e29e68c5..1af3040cbc8 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.h
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA8_GUMPS_PAPERDOLLGUMP_H
 #define ULTIMA8_GUMPS_PAPERDOLLGUMP_H
 
-#include "common/str.h"
 #include "ultima/ultima8/gumps/container_gump.h"
 #include "ultima/ultima8/misc/classtype.h"
 
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.h b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
index 3ca67cda7d4..eeaf6479063 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.h
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
@@ -23,8 +23,6 @@
 #define ULTIMA8_GUMPS_SHAPEVIEWERGUMP_H
 
 #include "ultima/ultima8/gumps/modal_gump.h"
-
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/misc/classtype.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index af3a4a52d50..6ea46b41ded 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -21,16 +21,15 @@
 
 #include "ultima/ultima8/gumps/slider_gump.h"
 #include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/gfx/gump_shape_archive.h"
-#include "ultima/ultima8/gumps/widgets/sliding_widget.h"
 #include "ultima/ultima8/gfx/fonts/font.h"
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
 #include "ultima/ultima8/gumps/widgets/button_widget.h"
-#include "ultima/ultima8/usecode/uc_process.h"
+#include "ultima/ultima8/gumps/widgets/sliding_widget.h"
 #include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/mouse.h"
 #include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/usecode/uc_process.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 07320f12bb5..33fd8aaef37 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -20,21 +20,20 @@
  */
 
 #include "ultima/ultima8/gumps/u8_save_gump.h"
-#include "ultima/ultima8/gumps/widgets/edit_widget.h"
-#include "ultima/ultima8/gumps/widgets/text_widget.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/kernel/mouse.h"
+
+#include "common/config-manager.h"
+#include "common/savefile.h"
+#include "common/system.h"
+#include "gui/message.h"
+#include "ultima/ultima8/filesys/savegame.h"
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/shape.h"
 #include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/filesys/savegame.h"
 #include "ultima/ultima8/gumps/paged_gump.h"
-#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
-#include "common/config-manager.h"
-#include "common/savefile.h"
-#include "common/translation.h"
-#include "gui/message.h"
+#include "ultima/ultima8/gumps/widgets/edit_widget.h"
+#include "ultima/ultima8/gumps/widgets/text_widget.h"
+#include "ultima/ultima8/kernel/mouse.h"
+#include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/weasel_dat.h b/engines/ultima/ultima8/gumps/weasel_dat.h
index fd72ab0fcc5..e33934acfba 100644
--- a/engines/ultima/ultima8/gumps/weasel_dat.h
+++ b/engines/ultima/ultima8/gumps/weasel_dat.h
@@ -22,8 +22,8 @@
 #ifndef ULTIMA8_GUMPS_WEASELDAT_H
 #define ULTIMA8_GUMPS_WEASELDAT_H
 
+#include "common/array.h"
 #include "common/stream.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.h b/engines/ultima/ultima8/gumps/weasel_gump.h
index 3a020eb821e..8d9c3d15a32 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.h
+++ b/engines/ultima/ultima8/gumps/weasel_gump.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA8_GUMPS_REMORSEMENUGUMP_H
 #define ULTIMA8_GUMPS_REMORSEMENUGUMP_H
 
-#include "common/str.h"
 #include "ultima/ultima8/gumps/modal_gump.h"
 #include "ultima/ultima8/misc/classtype.h"
 
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index b9a23c95af0..22d991a75e1 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -22,9 +22,8 @@
 #ifndef ULTIMA8_GUMPS_WIDGETS_BUTTONWIDGET_H
 #define ULTIMA8_GUMPS_WIDGETS_BUTTONWIDGET_H
 
-#include "common/str.h"
-#include "ultima/ultima8/gumps/gump.h"
 #include "ultima/ultima8/gfx/frame_id.h"
+#include "ultima/ultima8/gumps/gump.h"
 #include "ultima/ultima8/misc/classtype.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index 85eaf7b14b0..b4d07d034cc 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -20,11 +20,11 @@
  */
 
 #include "ultima/ultima8/gumps/widgets/edit_widget.h"
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
-#include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/gfx/fonts/font_manager.h"
-#include "common/system.h"
+
 #include "common/events.h"
+#include "common/system.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index efc5fd9d1fb..54b6b39dac3 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -20,11 +20,11 @@
  */
 
 #include "ultima/ultima8/gumps/widgets/text_widget.h"
-#include "ultima/ultima8/gfx/fonts/rendered_text.h"
-#include "ultima/ultima8/gfx/render_surface.h"
+
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
-#include "ultima/ultima8/gumps/bark_gump.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
 #include "ultima/ultima8/gumps/ask_gump.h"
+#include "ultima/ultima8/gumps/bark_gump.h"
 #include "ultima/ultima8/gumps/widgets/button_widget.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/kernel/delay_process.cpp b/engines/ultima/ultima8/kernel/delay_process.cpp
index 1afcc883aa9..6a5ec99aa5b 100644
--- a/engines/ultima/ultima8/kernel/delay_process.cpp
+++ b/engines/ultima/ultima8/kernel/delay_process.cpp
@@ -21,6 +21,8 @@
 
 #include "ultima/ultima8/kernel/delay_process.h"
 
+#include "common/stream.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/kernel/kernel.h b/engines/ultima/ultima8/kernel/kernel.h
index dc6d8e42bab..511424bf491 100644
--- a/engines/ultima/ultima8/kernel/kernel.h
+++ b/engines/ultima/ultima8/kernel/kernel.h
@@ -22,10 +22,14 @@
 #ifndef ULTIMA8_KERNEL_KERNEL_H
 #define ULTIMA8_KERNEL_KERNEL_H
 
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
+#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
 
+namespace Common {
+class ReadStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 2c027d82fdd..204e334724d 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -19,21 +19,23 @@
  *
  */
 
+#include "ultima/ultima8/kernel/mouse.h"
+
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "graphics/cursorman.h"
 #include "ultima/ultima.h"
-#include "ultima/ultima8/kernel/mouse.h"
 #include "ultima/ultima8/games/game_data.h"
+#include "ultima/ultima8/gfx/palette.h"
 #include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
 #include "ultima/ultima8/gumps/gump.h"
 #include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/world/actors/avatar_mover_process.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/gfx/shape.h"
-#include "ultima/ultima8/gfx/shape_frame.h"
-#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/kernel/mouse.h b/engines/ultima/ultima8/kernel/mouse.h
index 3d49e989def..712fb688b38 100644
--- a/engines/ultima/ultima8/kernel/mouse.h
+++ b/engines/ultima/ultima8/kernel/mouse.h
@@ -22,8 +22,10 @@
 #ifndef ULTIMA8_KERNEL_MOUSE_H
 #define ULTIMA8_KERNEL_MOUSE_H
 
-#include "common/system.h"
 #include "common/rect.h"
+#include "common/stack.h"
+#include "common/scummsys.h"
+
 #include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/misc/direction.h"
 
diff --git a/engines/ultima/ultima8/kernel/object.cpp b/engines/ultima/ultima8/kernel/object.cpp
index 2247be2d580..bffd418d714 100644
--- a/engines/ultima/ultima8/kernel/object.cpp
+++ b/engines/ultima/ultima8/kernel/object.cpp
@@ -20,6 +20,8 @@
  */
 
 #include "ultima/ultima8/kernel/object.h"
+
+#include "common/stream.h"
 #include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/kernel/object_manager.h"
 #include "ultima/ultima8/usecode/uc_process.h"
diff --git a/engines/ultima/ultima8/kernel/object.h b/engines/ultima/ultima8/kernel/object.h
index 58868e92a11..7f70c8e721e 100644
--- a/engines/ultima/ultima8/kernel/object.h
+++ b/engines/ultima/ultima8/kernel/object.h
@@ -23,8 +23,13 @@
 #define ULTIMA8_KERNEL_OBJECT_H
 
 #include "ultima/ultima8/misc/classtype.h"
+#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/misc/debugger.h"
 
+namespace Common {
+class ReadStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/kernel/object_manager.h b/engines/ultima/ultima8/kernel/object_manager.h
index 6b4ee97b9e2..935f9fcfe38 100644
--- a/engines/ultima/ultima8/kernel/object_manager.h
+++ b/engines/ultima/ultima8/kernel/object_manager.h
@@ -22,10 +22,14 @@
 #ifndef ULTIMA8_KERNEL_OBJECTMANAGER_H
 #define ULTIMA8_KERNEL_OBJECTMANAGER_H
 
-#include "common/str.h"
-#include "ultima/shared/std/containers.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
 #include "ultima/ultima8/misc/common_types.h"
 
+namespace Common {
+class ReadStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/kernel/process.h b/engines/ultima/ultima8/kernel/process.h
index 2ed659202bf..ae8736166c4 100644
--- a/engines/ultima/ultima8/kernel/process.h
+++ b/engines/ultima/ultima8/kernel/process.h
@@ -22,10 +22,14 @@
 #ifndef ULTIMA8_KERNEL_USECODE_PROCESS_H
 #define ULTIMA8_KERNEL_USECODE_PROCESS_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/misc/classtype.h"
+#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/misc/debugger.h"
 
+namespace Common {
+class ReadStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/metaengine.cpp b/engines/ultima/ultima8/metaengine.cpp
index 7e27043dc65..5dba1f0596d 100644
--- a/engines/ultima/ultima8/metaengine.cpp
+++ b/engines/ultima/ultima8/metaengine.cpp
@@ -20,14 +20,13 @@
  */
 
 #include "ultima/ultima8/metaengine.h"
-#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/filesys/savegame.h"
+
+#include "backends/keymapper/action.h"
+#include "backends/keymapper/standard-actions.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/translation.h"
-#include "backends/keymapper/action.h"
-#include "backends/keymapper/standard-actions.h"
+#include "ultima/ultima8/filesys/savegame.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 9faa62f2bcc..2e5db7e0b0b 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -19,12 +19,13 @@
  *
  */
 
+#include "ultima/ultima8/misc/debugger.h"
+
 #include "common/config-manager.h"
 #include "common/file.h"
-#include "common/tokenizer.h"
-#include "image/png.h"
+#include "common/system.h"
 #include "image/bmp.h"
-#include "ultima/ultima8/ultima8.h"
+#include "image/png.h"
 #include "ultima/ultima8/audio/audio_process.h"
 #include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/games/game_data.h"
@@ -34,28 +35,28 @@
 #include "ultima/ultima8/gfx/texture.h"
 #include "ultima/ultima8/gumps/fast_area_vis_gump.h"
 #include "ultima/ultima8/gumps/game_map_gump.h"
+#include "ultima/ultima8/gumps/menu_gump.h"
 #include "ultima/ultima8/gumps/minimap_gump.h"
 #include "ultima/ultima8/gumps/movie_gump.h"
 #include "ultima/ultima8/gumps/quit_gump.h"
 #include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/gumps/menu_gump.h"
 #include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/kernel/object_manager.h"
 #include "ultima/ultima8/misc/id_man.h"
-#include "ultima/ultima8/misc/util.h"
-#include "ultima/ultima8/usecode/uc_machine.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/usecode/bit_set.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/world.h"
+#include "ultima/ultima8/usecode/uc_machine.h"
+#include "ultima/ultima8/world/actors/avatar_mover_process.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/world/actors/pathfinder.h"
+#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
 #include "ultima/ultima8/world/camera_process.h"
+#include "ultima/ultima8/world/current_map.h"
 #include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/pathfinder.h"
-#include "ultima/ultima8/world/target_reticle_process.h"
 #include "ultima/ultima8/world/item_selection_process.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/world/target_reticle_process.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/debugger.h b/engines/ultima/ultima8/misc/debugger.h
index ab5c60d94b0..bdaac28c093 100644
--- a/engines/ultima/ultima8/misc/debugger.h
+++ b/engines/ultima/ultima8/misc/debugger.h
@@ -22,10 +22,6 @@
 #ifndef ULTIMA_ULTIMA8_ENGINE_DEBUGGER_H
 #define ULTIMA_ULTIMA8_ENGINE_DEBUGGER_H
 
-#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/shared/std/containers.h"
-#include "common/debug.h"
-#include "common/stream.h"
 #include "gui/debugger.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/misc/id_man.cpp b/engines/ultima/ultima8/misc/id_man.cpp
index 14ea88ba29c..a0c67dde0aa 100644
--- a/engines/ultima/ultima8/misc/id_man.cpp
+++ b/engines/ultima/ultima8/misc/id_man.cpp
@@ -19,9 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/misc/id_man.h"
 
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/misc/id_man.h b/engines/ultima/ultima8/misc/id_man.h
index 081f50e93c8..b2969115834 100644
--- a/engines/ultima/ultima8/misc/id_man.h
+++ b/engines/ultima/ultima8/misc/id_man.h
@@ -22,7 +22,12 @@
 #ifndef ULTIMA8_MISC_IDMAN_H
 #define ULTIMA8_MISC_IDMAN_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
+
+namespace Common {
+class ReadStream;
+class WriteStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/point3.h b/engines/ultima/ultima8/misc/point3.h
index 4651dd901cd..462ee0e067f 100644
--- a/engines/ultima/ultima8/misc/point3.h
+++ b/engines/ultima/ultima8/misc/point3.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_MISC_POINT3_H
 #define ULTIMA8_MISC_POINT3_H
 
+#include "common/stream.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/misc/util.h b/engines/ultima/ultima8/misc/util.h
index 4db20697423..d59e81afbb1 100644
--- a/engines/ultima/ultima8/misc/util.h
+++ b/engines/ultima/ultima8/misc/util.h
@@ -22,7 +22,7 @@
 #ifndef ULTIMA8_MISC_UTIL_H
 #define ULTIMA8_MISC_UTIL_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 72f24fa6fbf..6ec949cd8e9 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -19,85 +19,73 @@
  *
  */
 
+#include "ultima/ultima8/ultima8.h"
+
 #include "common/file.h"
 #include "common/rational.h"
 #include "common/translation.h"
 #include "common/compression/unzip.h"
-#include "gui/saveload.h"
-#include "image/png.h"
 #include "engines/dialogs.h"
 #include "engines/util.h"
+#include "image/png.h"
 #include "ultima/ultima.h"
-
-// TODO: !! a lot of these includes are just for some hacks... clean up sometime
+#include "ultima/ultima8/audio/audio_mixer.h"
+#include "ultima/ultima8/audio/cru_music_process.h"
+#include "ultima/ultima8/audio/midi_player.h"
+#include "ultima/ultima8/audio/u8_music_process.h"
 #include "ultima/ultima8/conf/config_file_manager.h"
-#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/games/start_u8_process.h"
-#include "ultima/ultima8/games/start_crusader_process.h"
+#include "ultima/ultima8/filesys/savegame.h"
+#include "ultima/ultima8/games/game_data.h"
+#include "ultima/ultima8/gfx/cycle_process.h"
 #include "ultima/ultima8/gfx/fonts/font_manager.h"
 #include "ultima/ultima8/gfx/render_surface.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/filesys/savegame.h"
 #include "ultima/ultima8/gumps/game_map_gump.h"
 #include "ultima/ultima8/gumps/inverter_gump.h"
 #include "ultima/ultima8/gumps/menu_gump.h"
-#include "ultima/ultima8/gumps/minimap_gump.h"
-#include "ultima/ultima8/gumps/cru_status_gump.h"
-#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/gumps/weasel_gump.h"
-
-// For gump positioning... perhaps shouldn't do it this way....
 #include "ultima/ultima8/gumps/message_box_gump.h"
-#include "ultima/ultima8/gumps/keypad_gump.h"
-#include "ultima/ultima8/gumps/computer_gump.h"
-#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/battery_charger_process.h"
-#include "ultima/ultima8/world/actors/cru_healer_process.h"
-#include "ultima/ultima8/world/actors/targeted_anim_process.h"
-#include "ultima/ultima8/usecode/u8_intrinsics.h"
-#include "ultima/ultima8/usecode/remorse_intrinsics.h"
-#include "ultima/ultima8/usecode/regret_intrinsics.h"
-
-#include "ultima/ultima8/gfx/cycle_process.h"
-#include "ultima/ultima8/world/actors/scheduler_process.h"
-#include "ultima/ultima8/world/egg_hatcher_process.h" // for a hack
-#include "ultima/ultima8/usecode/uc_process.h" // more hacking
-#include "ultima/ultima8/world/actors/actor_bark_notify_process.h" // guess
+#include "ultima/ultima8/gumps/minimap_gump.h"
+#include "ultima/ultima8/gumps/shape_viewer_gump.h"
 #include "ultima/ultima8/kernel/delay_process.h"
+#include "ultima/ultima8/kernel/object_manager.h"
+#include "ultima/ultima8/usecode/regret_intrinsics.h"
+#include "ultima/ultima8/usecode/remorse_intrinsics.h"
+#include "ultima/ultima8/usecode/u8_intrinsics.h"
+#include "ultima/ultima8/usecode/uc_process.h"
+#include "ultima/ultima8/world/actors/actor_bark_notify_process.h"
+#include "ultima/ultima8/world/actors/ambush_process.h"
+#include "ultima/ultima8/world/actors/attack_process.h"
+#include "ultima/ultima8/world/actors/auto_firer_process.h"
+#include "ultima/ultima8/world/actors/avatar_death_process.h"
 #include "ultima/ultima8/world/actors/avatar_gravity_process.h"
-#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
-#include "ultima/ultima8/world/item_selection_process.h"
-#include "ultima/ultima8/world/split_item_process.h"
-#include "ultima/ultima8/world/target_reticle_process.h"
-#include "ultima/ultima8/world/snap_process.h"
-#include "ultima/ultima8/world/crosshair_process.h"
-#include "ultima/ultima8/world/actors/pathfinder_process.h"
-#include "ultima/ultima8/world/actors/u8_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/cru_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/cru_pathfinder_process.h"
-#include "ultima/ultima8/world/actors/resurrection_process.h"
+#include "ultima/ultima8/world/actors/battery_charger_process.h"
 #include "ultima/ultima8/world/actors/clear_feign_death_process.h"
-#include "ultima/ultima8/world/actors/loiter_process.h"
-#include "ultima/ultima8/world/actors/avatar_death_process.h"
-#include "ultima/ultima8/world/actors/surrender_process.h"
 #include "ultima/ultima8/world/actors/combat_process.h"
+#include "ultima/ultima8/world/actors/cru_avatar_mover_process.h"
+#include "ultima/ultima8/world/actors/cru_healer_process.h"
+#include "ultima/ultima8/world/actors/cru_pathfinder_process.h"
 #include "ultima/ultima8/world/actors/guard_process.h"
-#include "ultima/ultima8/world/actors/attack_process.h"
-#include "ultima/ultima8/world/actors/auto_firer_process.h"
+#include "ultima/ultima8/world/actors/loiter_process.h"
 #include "ultima/ultima8/world/actors/pace_process.h"
+#include "ultima/ultima8/world/actors/pathfinder_process.h"
+#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
+#include "ultima/ultima8/world/actors/resurrection_process.h"
 #include "ultima/ultima8/world/actors/rolling_thunder_process.h"
+#include "ultima/ultima8/world/actors/scheduler_process.h"
+#include "ultima/ultima8/world/actors/surrender_process.h"
+#include "ultima/ultima8/world/actors/targeted_anim_process.h"
+#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
+#include "ultima/ultima8/world/actors/u8_avatar_mover_process.h"
 #include "ultima/ultima8/world/bobo_boomer_process.h"
-#include "ultima/ultima8/world/super_sprite_process.h"
+#include "ultima/ultima8/world/crosshair_process.h"
 #include "ultima/ultima8/world/destroy_item_process.h"
-#include "ultima/ultima8/world/actors/ambush_process.h"
-#include "ultima/ultima8/audio/audio_mixer.h"
-#include "ultima/ultima8/audio/u8_music_process.h"
-#include "ultima/ultima8/audio/cru_music_process.h"
-#include "ultima/ultima8/audio/midi_player.h"
-#include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/metaengine.h"
+#include "ultima/ultima8/world/egg_hatcher_process.h"
+#include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/item_selection_process.h"
+#include "ultima/ultima8/world/snap_process.h"
+#include "ultima/ultima8/world/split_item_process.h"
+#include "ultima/ultima8/world/super_sprite_process.h"
+#include "ultima/ultima8/world/target_reticle_process.h"
+
 #ifdef USE_IMGUI
 #include "ultima/ultima8/debugtools.h"
 #endif
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 3f24c6d284f..2ef562322d1 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -23,17 +23,14 @@
 #ifndef ULTIMA8_ULTIMA8
 #define ULTIMA8_ULTIMA8
 
-#include "common/events.h"
 #include "common/random.h"
 #include "common/stream.h"
 #include "graphics/screen.h"
-#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/common_types.h"
+#include "ultima/detection.h"
 #include "ultima/ultima8/games/game_info.h"
 #include "ultima/ultima8/gfx/render_surface.h"
 #include "ultima/ultima8/metaengine.h"
-#include "ultima/detection.h"
+#include "ultima/ultima8/usecode/intrinsics.h"
 
 namespace Ultima {
 namespace Ultima8 {
@@ -57,7 +54,6 @@ class AvatarMoverProcess;
 class Texture;
 class AudioMixer;
 class ConfigFileManager;
-struct GameInfo;
 
 #define GAME_IS_U8 (Ultima8Engine::get_instance()->getGameInfo()->_type == GameInfo::GAME_U8)
 #define GAME_IS_REMORSE (Ultima8Engine::get_instance()->getGameInfo()->_type == GameInfo::GAME_REMORSE)
diff --git a/engines/ultima/ultima8/usecode/bit_set.cpp b/engines/ultima/ultima8/usecode/bit_set.cpp
index f1ca170b2e8..264cb7c4a7a 100644
--- a/engines/ultima/ultima8/usecode/bit_set.cpp
+++ b/engines/ultima/ultima8/usecode/bit_set.cpp
@@ -19,9 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/usecode/bit_set.h"
 
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/usecode/byte_set.cpp b/engines/ultima/ultima8/usecode/byte_set.cpp
index 275441cd1f6..a1e31e328b1 100644
--- a/engines/ultima/ultima8/usecode/byte_set.cpp
+++ b/engines/ultima/ultima8/usecode/byte_set.cpp
@@ -19,9 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/usecode/byte_set.h"
 
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/usecode/global_storage.h b/engines/ultima/ultima8/usecode/global_storage.h
index f866a0efab6..f84957b6b1b 100644
--- a/engines/ultima/ultima8/usecode/global_storage.h
+++ b/engines/ultima/ultima8/usecode/global_storage.h
@@ -22,6 +22,13 @@
 #ifndef ULTIMA8_USECODE_GLOBAL_STORAGE_H
 #define ULTIMA8_USECODE_GLOBAL_STORAGE_H
 
+#include "common/scummsys.h"
+
+namespace Common {
+class ReadStream;
+class WriteStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/usecode/regret_intrinsics.h b/engines/ultima/ultima8/usecode/regret_intrinsics.h
index f1623f065e8..8ef57804ac8 100644
--- a/engines/ultima/ultima8/usecode/regret_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/regret_intrinsics.h
@@ -22,8 +22,28 @@
 #ifndef ULTIMA8_USECODE_REGRETINTRINSICS_H
 #define ULTIMA8_USECODE_REGRETINTRINSICS_H
 
+#include "ultima/ultima8/audio/audio_process.h"
+#include "ultima/ultima8/audio/music_process.h"
+#include "ultima/ultima8/games/game.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/gumps/computer_gump.h"
+#include "ultima/ultima8/gumps/cru_status_gump.h"
+#include "ultima/ultima8/gumps/keypad_gump.h"
+#include "ultima/ultima8/gumps/movie_gump.h"
+#include "ultima/ultima8/kernel/kernel.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
+#include "ultima/ultima8/usecode/uc_machine.h"
+#include "ultima/ultima8/world/actors/actor.h"
+#include "ultima/ultima8/world/actors/battery_charger_process.h"
+#include "ultima/ultima8/world/actors/cru_healer_process.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/world/camera_process.h"
+#include "ultima/ultima8/world/current_map.h"
+#include "ultima/ultima8/world/egg.h"
 #include "ultima/ultima8/world/item.h"
+#include "ultima/ultima8/world/sprite_process.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/usecode/remorse_intrinsics.h b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
index 70947d142fd..d3b40954040 100644
--- a/engines/ultima/ultima8/usecode/remorse_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
@@ -22,6 +22,7 @@
 #ifndef ULTIMA8_USECODE_REMORSEINTRINSICS_H
 #define ULTIMA8_USECODE_REMORSEINTRINSICS_H
 
+#include "ultima/ultima8/gumps/weasel_gump.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
 #include "ultima/ultima8/world/item.h"
 
diff --git a/engines/ultima/ultima8/usecode/uc_list.cpp b/engines/ultima/ultima8/usecode/uc_list.cpp
index 9d0c57fc111..2c2393cbc9a 100644
--- a/engines/ultima/ultima8/usecode/uc_list.cpp
+++ b/engines/ultima/ultima8/usecode/uc_list.cpp
@@ -19,9 +19,10 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/usecode/uc_list.h"
+
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/usecode/uc_machine.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/usecode/uc_list.h b/engines/ultima/ultima8/usecode/uc_list.h
index e159d6c0f28..f75aa89cf51 100644
--- a/engines/ultima/ultima8/usecode/uc_list.h
+++ b/engines/ultima/ultima8/usecode/uc_list.h
@@ -22,8 +22,12 @@
 #ifndef ULTIMA8_USECODE_UCLIST_H
 #define ULTIMA8_USECODE_UCLIST_H
 
-#include "ultima/shared/std/containers.h"
-#include "common/str.h"
+#include "common/array.h"
+
+namespace Common {
+class ReadStream;
+class WriteStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/usecode/uc_machine.h b/engines/ultima/ultima8/usecode/uc_machine.h
index f65e8da5d95..a83d619e704 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.h
+++ b/engines/ultima/ultima8/usecode/uc_machine.h
@@ -22,10 +22,10 @@
 #ifndef ULTIMA8_USECODE_UCMACHINE_H
 #define ULTIMA8_USECODE_UCMACHINE_H
 
+#include "common/hashmap.h"
+#include "common/str.h"
 #include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/misc/set.h"
-#include "common/str.h"
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index c82da12a7f4..d1c9ba75fd6 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -21,7 +21,6 @@
 #ifndef ULTIMA8_USECODE_UCPROCESS_H
 #define ULTIMA8_USECODE_UCPROCESS_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima8/kernel/process.h"
 #include "ultima/ultima8/usecode/uc_stack.h"
 
diff --git a/engines/ultima/ultima8/usecode/uc_stack.cpp b/engines/ultima/ultima8/usecode/uc_stack.cpp
index 3460c77e6bb..8d2c051239f 100644
--- a/engines/ultima/ultima8/usecode/uc_stack.cpp
+++ b/engines/ultima/ultima8/usecode/uc_stack.cpp
@@ -19,9 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/usecode/uc_stack.h"
 
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/usecode/uc_stack.h b/engines/ultima/ultima8/usecode/uc_stack.h
index 917e127b754..169fb3ed7ba 100644
--- a/engines/ultima/ultima8/usecode/uc_stack.h
+++ b/engines/ultima/ultima8/usecode/uc_stack.h
@@ -24,6 +24,11 @@
 
 #include "common/scummsys.h"
 
+namespace Common {
+class ReadStream;
+class WriteStream;
+}
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/usecode/usecode.cpp b/engines/ultima/ultima8/usecode/usecode.cpp
index 6cbdccbc0ab..e32a4f2d0d3 100644
--- a/engines/ultima/ultima8/usecode/usecode.cpp
+++ b/engines/ultima/ultima8/usecode/usecode.cpp
@@ -19,9 +19,8 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
-
 #include "ultima/ultima8/usecode/usecode.h"
+
 #include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/usecode/usecode.h b/engines/ultima/ultima8/usecode/usecode.h
index 17d52e80882..5002f9128b1 100644
--- a/engines/ultima/ultima8/usecode/usecode.h
+++ b/engines/ultima/ultima8/usecode/usecode.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_USECODE_USECODE_H
 #define ULTIMA8_USECODE_USECODE_H
 
+#include  "common/scummsys.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/actors/actor_anim.h b/engines/ultima/ultima8/world/actors/actor_anim.h
index 151d3540644..d8369544a77 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim.h
@@ -22,7 +22,7 @@
 #ifndef WORLD_ACTORS_ACTORANIM_H
 #define WORLD_ACTORS_ACTORANIM_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "ultima/ultima8/world/actors/anim_action.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 46c6f833385..8a40de07aef 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -19,27 +19,25 @@
  *
  */
 
-#include "common/config-manager.h"
-
 #include "ultima/ultima8/world/actors/actor_anim_process.h"
-#include "ultima/ultima8/world/actors/anim_action.h"
-#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/world/world.h"
+
+#include "common/config-manager.h"
+#include "ultima/ultima8/audio/audio_process.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/kernel/delay_process.h"
 #include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/world/current_map.h"
+#include "ultima/ultima8/misc/direction_util.h"
+#include "ultima/ultima8/world/actors/anim_action.h"
 #include "ultima/ultima8/world/actors/animation_tracker.h"
-#include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/world/actors/combat_process.h"
 #include "ultima/ultima8/world/actors/auto_firer_process.h"
-#include "ultima/ultima8/world/sprite_process.h"
-#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/world/actors/combat_process.h"
+#include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/create_item_process.h"
+#include "ultima/ultima8/world/current_map.h"
 #include "ultima/ultima8/world/destroy_item_process.h"
-#include "ultima/ultima8/kernel/delay_process.h"
 #include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/sprite_process.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/anim_action.h b/engines/ultima/ultima8/world/actors/anim_action.h
index 48ccd366a40..34dc24e9817 100644
--- a/engines/ultima/ultima8/world/actors/anim_action.h
+++ b/engines/ultima/ultima8/world/actors/anim_action.h
@@ -22,7 +22,7 @@
 #ifndef WORLD_ACTORS_ANIMACTION_H
 #define WORLD_ACTORS_ANIMACTION_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "ultima/ultima8/misc/direction.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.h b/engines/ultima/ultima8/world/actors/animation_tracker.h
index 108ad02da6f..004df2dc5d6 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.h
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.h
@@ -22,9 +22,10 @@
 #ifndef WORLD_ACTORS_ANIMATIONTRACKER_H
 #define WORLD_ACTORS_ANIMATIONTRACKER_H
 
+#include "ultima/ultima8/misc/common_types.h"
+#include "ultima/ultima8/misc/point3.h"
 #include "ultima/ultima8/world/actors/animation.h"
 #include "ultima/ultima8/world/actors/pathfinder.h"
-#include "ultima/ultima8/misc/point3.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
index 267f995aab5..05c1683cd0d 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
@@ -20,10 +20,10 @@
  */
 
 #include "ultima/ultima8/world/actors/avatar_gravity_process.h"
+
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/world/actors/avatar_mover_process.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/kernel/mouse.h"
 #include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
index c978cfb0d1f..0fee548ec88 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
@@ -20,11 +20,13 @@
  */
 
 #include "ultima/ultima8/world/actors/avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/actor.h"
+
+#include "common/system.h"
 #include "ultima/ultima8/kernel/kernel.h"
+#include "ultima/ultima8/misc/direction_util.h"
+#include "ultima/ultima8/world/actors/actor.h"
 #include "ultima/ultima8/world/actors/targeted_anim_process.h"
 #include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/misc/direction_util.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.h b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
index 5c4c380d94c..432ae86e7b6 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
@@ -25,7 +25,6 @@
 #include "ultima/ultima8/metaengine.h"
 #include "ultima/ultima8/kernel/process.h"
 #include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/world/actors/animation.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
index 623dbd3b54e..c4d259c8aa5 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "ultima/ultima8/world/actors/cru_avatar_mover_process.h"
+
 #include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/world/actors/actor_anim_process.h"
@@ -28,7 +29,6 @@
 #include "ultima/ultima8/world/world.h"
 #include "ultima/ultima8/misc/direction_util.h"
 #include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/kernel/delay_process.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index e190c55473c..8d7985bac91 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -19,35 +19,34 @@
  *
  */
 
-#include "ultima/ultima.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/teleport_egg.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
-#include "ultima/ultima8/world/target_reticle_process.h"
-#include "ultima/ultima8/world/camera_process.h"
-#include "ultima/ultima8/gfx/shape_info.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/world/actors/avatar_death_process.h"
-#include "ultima/ultima8/kernel/delay_process.h"
+
+#include "ultima/ultima.h"
+#include "ultima/ultima8/audio/audio_process.h"
+#include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/anim_dat.h"
+#include "ultima/ultima8/gfx/shape_info.h"
 #include "ultima/ultima8/gfx/wpn_ovlay_dat.h"
-#include "ultima/ultima8/gfx/main_shape_archive.h"
 #include "ultima/ultima8/gumps/cru_pickup_area_gump.h"
-#include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/kernel/delay_process.h"
+#include "ultima/ultima8/kernel/kernel.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/usecode/uc_list.h"
 #include "ultima/ultima8/usecode/uc_machine.h"
-#include "ultima/ultima8/world/loop_script.h"
+#include "ultima/ultima8/world/actors/actor_anim_process.h"
+#include "ultima/ultima8/world/actors/avatar_death_process.h"
+#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
+#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
+#include "ultima/ultima8/world/camera_process.h"
+#include "ultima/ultima8/world/current_map.h"
 #include "ultima/ultima8/world/fire_type.h"
+#include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/loop_script.h"
 #include "ultima/ultima8/world/sprite_process.h"
-#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
-#include "ultima/ultima8/world/actors/actor_anim_process.h"
-#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/world/actors/anim_action.h"
+#include "ultima/ultima8/world/target_reticle_process.h"
+#include "ultima/ultima8/world/teleport_egg.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.cpp b/engines/ultima/ultima8/world/actors/pathfinder.cpp
index c8c73ead82b..b5ec7700f97 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder.cpp
@@ -19,6 +19,8 @@
  *
  */
 
+#include "ultima/ultima8/world/actors/pathfinder.h"
+
 #include "common/system.h"
 #include "ultima/ultima.h"
 #include "ultima/ultima8/misc/direction_util.h"
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.h b/engines/ultima/ultima8/world/actors/pathfinder.h
index 604a5d29322..51e1051f4f5 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder.h
@@ -22,7 +22,7 @@
 #ifndef ULTIMA8_WORLD_ACTORS_PATHFINDER_H
 #define ULTIMA8_WORLD_ACTORS_PATHFINDER_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "ultima/ultima8/misc/direction.h"
 #include "ultima/ultima8/misc/point3.h"
 #include "ultima/ultima8/misc/priority_queue.h"
diff --git a/engines/ultima/ultima8/world/actors/treasure_info.h b/engines/ultima/ultima8/world/actors/treasure_info.h
index 23627bc952e..b581cd52886 100644
--- a/engines/ultima/ultima8/world/actors/treasure_info.h
+++ b/engines/ultima/ultima8/world/actors/treasure_info.h
@@ -22,7 +22,7 @@
 #ifndef WORLD_ACTORS_TREASUREINFO_H
 #define WORLD_ACTORS_TREASUREINFO_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
index 6f82853fd89..32caf94f69c 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -19,9 +19,10 @@
  *
  */
 
-#include "common/config-manager.h"
-
 #include "ultima/ultima8/world/actors/u8_avatar_mover_process.h"
+
+#include "common/config-manager.h"
+#include "common/system.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/gumps/game_map_gump.h"
 #include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/world/actors/weapon_overlay.h b/engines/ultima/ultima8/world/actors/weapon_overlay.h
index a768eab1e3f..f5760054236 100644
--- a/engines/ultima/ultima8/world/actors/weapon_overlay.h
+++ b/engines/ultima/ultima8/world/actors/weapon_overlay.h
@@ -22,7 +22,7 @@
 #ifndef WORLD_ACTORS_WEAPONOVERLAY_H
 #define WORLD_ACTORS_WEAPONOVERLAY_H
 
-#include "ultima/shared/std/containers.h"
+#include  "common/array.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index e38c059f415..bcc9d3c21be 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -22,9 +22,8 @@
 #ifndef ULTIMA8_WORLD_CONTAINER_H
 #define ULTIMA8_WORLD_CONTAINER_H
 
+#include "common/list.h"
 #include "ultima/ultima8/world/item.h"
-#include "ultima/shared/std/containers.h"
-
 #include "ultima/ultima8/usecode/intrinsics.h"
 #include "ultima/ultima8/misc/classtype.h"
 
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 03daedeee35..8723893fbd7 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -19,9 +19,10 @@
  *
  */
 
-#include "ultima/ultima.h"
-#include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/world/current_map.h"
+
+#include "common/stream.h"
+#include "ultima/ultima.h"
 #include "ultima/ultima8/world/map.h"
 #include "ultima/ultima8/world/actors/actor.h"
 #include "ultima/ultima8/world/world.h"
diff --git a/engines/ultima/ultima8/world/current_map.h b/engines/ultima/ultima8/world/current_map.h
index c8b021ee6a8..f1fe4ac17e9 100644
--- a/engines/ultima/ultima8/world/current_map.h
+++ b/engines/ultima/ultima8/world/current_map.h
@@ -22,11 +22,12 @@
 #ifndef ULTIMA8_WORLD_CURRENTMAP_H
 #define ULTIMA8_WORLD_CURRENTMAP_H
 
-#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/world/position_info.h"
+#include "common/list.h"
+#include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/misc/direction.h"
 #include "ultima/ultima8/misc/point3.h"
+#include "ultima/ultima8/usecode/intrinsics.h"
+#include "ultima/ultima8/world/position_info.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/damage_info.cpp b/engines/ultima/ultima8/world/damage_info.cpp
index e18c6db1e20..7b38aea0bc8 100644
--- a/engines/ultima/ultima8/world/damage_info.cpp
+++ b/engines/ultima/ultima8/world/damage_info.cpp
@@ -19,11 +19,12 @@
  *
  */
 
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/item_factory.h"
+#include "ultima/ultima8/world/damage_info.h"
+
 #include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/world/item.h"
+#include "ultima/ultima8/world/item_factory.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/damage_info.h b/engines/ultima/ultima8/world/damage_info.h
index ec71c39eded..155e96ffba6 100644
--- a/engines/ultima/ultima8/world/damage_info.h
+++ b/engines/ultima/ultima8/world/damage_info.h
@@ -22,7 +22,7 @@
 #ifndef WORLD_DAMAGE_INFO_H
 #define WORLD_DAMAGE_INFO_H
 
-#include "common/str.h"
+#include "common/scummsys.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.h b/engines/ultima/ultima8/world/egg_hatcher_process.h
index cec160c3c17..aa4a7b180db 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.h
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.h
@@ -22,8 +22,8 @@
 #ifndef ULTIMA8_WORLD_EGGHATCHERPROCESS_H
 #define ULTIMA8_WORLD_EGGHATCHERPROCESS_H
 
+#include "common/array.h"
 #include "ultima/ultima8/kernel/process.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/fire_type_table.cpp b/engines/ultima/ultima8/world/fire_type_table.cpp
index b1bc05a7003..d10a876a387 100644
--- a/engines/ultima/ultima8/world/fire_type_table.cpp
+++ b/engines/ultima/ultima8/world/fire_type_table.cpp
@@ -19,11 +19,10 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
-
 #include "ultima/ultima8/world/fire_type_table.h"
-#include "ultima/ultima8/world/fire_type.h"
+
 #include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/world/fire_type.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/fire_type_table.h b/engines/ultima/ultima8/world/fire_type_table.h
index a73a3911121..81b5f9146ea 100644
--- a/engines/ultima/ultima8/world/fire_type_table.h
+++ b/engines/ultima/ultima8/world/fire_type_table.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_WORLD_FIRETYPETABLE_H
 #define ULTIMA8_WORLD_FIRETYPETABLE_H
 
+#include "common/scummsys.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/get_object.cpp b/engines/ultima/ultima8/world/get_object.cpp
index 7cc70240519..1adc9a45b4e 100644
--- a/engines/ultima/ultima8/world/get_object.cpp
+++ b/engines/ultima/ultima8/world/get_object.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
+#include "ultima/ultima8/world/get_object.h"
 
+#include "ultima/ultima8/gumps/gump.h"
 #include "ultima/ultima8/kernel/object_manager.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/gumps/gump.h"
 #include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima8/world/get_object.h b/engines/ultima/ultima8/world/get_object.h
index 764b0dd4ef4..92de3a53b2d 100644
--- a/engines/ultima/ultima8/world/get_object.h
+++ b/engines/ultima/ultima8/world/get_object.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_WORLD_GETOBJECT_H
 #define ULTIMA8_WORLD_GETOBJECT_H
 
+#include "ultima/ultima8/misc/common_types.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/item_factory.cpp b/engines/ultima/ultima8/world/item_factory.cpp
index 08bc0ad208b..3719689cf14 100644
--- a/engines/ultima/ultima8/world/item_factory.cpp
+++ b/engines/ultima/ultima8/world/item_factory.cpp
@@ -19,16 +19,15 @@
  *
  */
 
-#include "ultima/ultima8/misc/common_types.h"
-
 #include "ultima/ultima8/world/item_factory.h"
+
 #include "ultima/ultima8/games/game_data.h"
 #include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/world/actors/main_actor.h"
 #include "ultima/ultima8/world/glob_egg.h"
 #include "ultima/ultima8/world/monster_egg.h"
 #include "ultima/ultima8/world/teleport_egg.h"
-#include "ultima/ultima8/ultima8.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/item_factory.h b/engines/ultima/ultima8/world/item_factory.h
index ee08acf5122..f71301316ef 100644
--- a/engines/ultima/ultima8/world/item_factory.h
+++ b/engines/ultima/ultima8/world/item_factory.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_WORLD_ITEMFACTORY_H
 #define ULTIMA8_WORLD_ITEMFACTORY_H
 
+#include "common/scummsys.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index 0900931ecd5..563b61672cf 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -19,17 +19,17 @@
  *
  */
 
+#include "ultima/ultima8/world/map.h"
+
+#include "common/stack.h"
 #include "ultima/ultima.h"
-#include "ultima/ultima8/misc/debugger.h"
+#include "ultima/ultima8/games/game_data.h"
+#include "ultima/ultima8/kernel/object_manager.h"
 #include "ultima/ultima8/misc/point3.h"
-#include "ultima/ultima8/world/map.h"
-#include "ultima/ultima8/world/item_factory.h"
+#include "ultima/ultima8/ultima8.h"
 #include "ultima/ultima8/world/container.h"
 #include "ultima/ultima8/world/coord_utils.h"
-#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/world/item_factory.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/map.h b/engines/ultima/ultima8/world/map.h
index b0601f88196..3fa02c60f9e 100644
--- a/engines/ultima/ultima8/world/map.h
+++ b/engines/ultima/ultima8/world/map.h
@@ -22,7 +22,13 @@
 #ifndef ULTIMA8_WORLD_MAP_H
 #define ULTIMA8_WORLD_MAP_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/list.h"
+
+namespace Common {
+class ReadStream;
+class WriteStream;
+class SeekableReadStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/map_glob.cpp b/engines/ultima/ultima8/world/map_glob.cpp
index 6718511b88c..4c7745e21d3 100644
--- a/engines/ultima/ultima8/world/map_glob.cpp
+++ b/engines/ultima/ultima8/world/map_glob.cpp
@@ -19,10 +19,11 @@
  *
  */
 
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/world/map_glob.h"
 
+#include "common/stream.h"
+#include "ultima/ultima8/misc/debugger.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/map_glob.h b/engines/ultima/ultima8/world/map_glob.h
index 15cf741535b..88f40c51f51 100644
--- a/engines/ultima/ultima8/world/map_glob.h
+++ b/engines/ultima/ultima8/world/map_glob.h
@@ -22,7 +22,11 @@
 #ifndef ULTIMA8_WORLD_MAPGLOB_H
 #define ULTIMA8_WORLD_MAPGLOB_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/missile_tracker.cpp b/engines/ultima/ultima8/world/missile_tracker.cpp
index 651ae8a6557..21762f1be1b 100644
--- a/engines/ultima/ultima8/world/missile_tracker.cpp
+++ b/engines/ultima/ultima8/world/missile_tracker.cpp
@@ -19,15 +19,14 @@
  *
  */
 
-#include "ultima/ultima.h"
-#include "ultima/ultima8/misc/debugger.h"
-
 #include "ultima/ultima8/world/missile_tracker.h"
 
+#include "common/debug.h"
+#include "ultima/ultima.h"
 #include "ultima/ultima8/world/current_map.h"
+#include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/world/item.h"
 #include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/get_object.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/missile_tracker.h b/engines/ultima/ultima8/world/missile_tracker.h
index 6898ae3064b..a2bfef3cbfe 100644
--- a/engines/ultima/ultima8/world/missile_tracker.h
+++ b/engines/ultima/ultima8/world/missile_tracker.h
@@ -22,6 +22,8 @@
 #ifndef ULTIMA8_WORLD_MISSILETRACKER_H
 #define ULTIMA8_WORLD_MISSILETRACKER_H
 
+#include "ultima/ultima8/misc/common_types.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
diff --git a/engines/ultima/ultima8/world/sort_item.h b/engines/ultima/ultima8/world/sort_item.h
index 2659a3fa6dd..ae4f185bfbc 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -22,9 +22,8 @@
 #ifndef ULTIMA8_WORLD_SORTITEM_H
 #define ULTIMA8_WORLD_SORTITEM_H
 
-#include "common/str.h"
 #include "common/rect.h"
-#include "ultima/ultima8/misc/common_types.h"
+#include "common/str.h"
 #include "ultima/ultima8/misc/box.h"
 
 //#define SORTITEM_OCCLUSION_EXPERIMENTAL 1
diff --git a/engines/ultima/ultima8/world/split_item_process.cpp b/engines/ultima/ultima8/world/split_item_process.cpp
index 0b722b3ab6d..22c3697204a 100644
--- a/engines/ultima/ultima8/world/split_item_process.cpp
+++ b/engines/ultima/ultima8/world/split_item_process.cpp
@@ -19,10 +19,12 @@
  *
  */
 
-#include "ultima/ultima.h"
 #include "ultima/ultima8/world/split_item_process.h"
-#include "ultima/ultima8/world/item.h"
+
+#include "common/debug.h"
+#include "ultima/ultima.h"
 #include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/item.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/sprite_process.cpp b/engines/ultima/ultima8/world/sprite_process.cpp
index 2819aa688b9..16fbc067c81 100644
--- a/engines/ultima/ultima8/world/sprite_process.cpp
+++ b/engines/ultima/ultima8/world/sprite_process.cpp
@@ -20,12 +20,12 @@
  */
 
 #include "ultima/ultima8/world/sprite_process.h"
-#include "ultima/ultima8/world/coord_utils.h"
-#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/item.h"
+
 #include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/world/coord_utils.h"
 #include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/world/item.h"
+#include "ultima/ultima8/world/item_factory.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index 64631d13731..383620dd356 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -22,18 +22,16 @@
 #include "ultima/ultima8/world/super_sprite_process.h"
 
 #include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/kernel/delay_process.h"
+#include "ultima/ultima8/kernel/kernel.h"
 #include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/world/loop_script.h"
+#include "ultima/ultima8/world/actors/actor.h"
 #include "ultima/ultima8/world/current_map.h"
 #include "ultima/ultima8/world/fire_type.h"
 #include "ultima/ultima8/world/get_object.h"
 #include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/actors/actor.h"
 #include "ultima/ultima8/world/sprite_process.h"
+#include "ultima/ultima8/world/world.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/world.h b/engines/ultima/ultima8/world/world.h
index 39a823bf22e..a661720b333 100644
--- a/engines/ultima/ultima8/world/world.h
+++ b/engines/ultima/ultima8/world/world.h
@@ -57,7 +57,10 @@
 
 #include "ultima/ultima8/misc/common_types.h"
 #include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/shared/std/containers.h"
+
+namespace Common {
+class ReadStream;
+}
 
 namespace Ultima {
 namespace Ultima8 {