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

bluegr noreply at scummvm.org
Mon Aug 31 20:35:38 UTC 2026 

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:
e8175cd86d ULTIMA: Remove shared/std/containers.h


Commit: e8175cd86d20c295502babb05fea3765fdb0acde
    https://github.com/scummvm/scummvm/commit/e8175cd86d20c295502babb05fea3765fdb0acde
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-08-31T23:35:32+03:00

Commit Message:
ULTIMA: Remove shared/std/containers.h

Changed paths:
  R engines/ultima/shared/std/containers.h
    engines/ultima/nuvie/actors/actor.cpp
    engines/ultima/nuvie/actors/actor.h
    engines/ultima/nuvie/conf/configuration.h
    engines/ultima/nuvie/core/anim_manager.cpp
    engines/ultima/nuvie/core/converse.h
    engines/ultima/nuvie/core/converse_interpret.h
    engines/ultima/nuvie/core/converse_speech.h
    engines/ultima/nuvie/core/cursor.h
    engines/ultima/nuvie/core/effect_manager.h
    engines/ultima/nuvie/core/events.h
    engines/ultima/nuvie/core/game.h
    engines/ultima/nuvie/core/game_clock.h
    engines/ultima/nuvie/core/obj_manager.h
    engines/ultima/nuvie/files/u6_lib_n.h
    engines/ultima/nuvie/gui/widgets/converse_gump.h
    engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
    engines/ultima/nuvie/gui/widgets/map_window.h
    engines/ultima/nuvie/gui/widgets/msg_scroll.h
    engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
    engines/ultima/nuvie/keybinding/keys.h
    engines/ultima/nuvie/misc/actor_list.h
    engines/ultima/nuvie/misc/u6_misc.cpp
    engines/ultima/nuvie/pathfinder/astar_path.cpp
    engines/ultima/nuvie/pathfinder/party_path_finder.cpp
    engines/ultima/nuvie/pathfinder/seek_path.h
    engines/ultima/nuvie/script/script.h
    engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
    engines/ultima/nuvie/sound/sound.h
    engines/ultima/nuvie/views/scroll_widget_gump.h
    engines/ultima/ultima4/controllers/combat_controller.cpp
    engines/ultima/ultima4/conversation/conversation.h
    engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
    engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
    engines/ultima/ultima4/core/config.h
    engines/ultima/ultima4/core/observable.h
    engines/ultima/ultima4/core/utils.h
    engines/ultima/ultima4/events/event_handler.h
    engines/ultima/ultima4/filesys/u4file.h
    engines/ultima/ultima4/game/armor.h
    engines/ultima/ultima4/game/context.h
    engines/ultima/ultima4/game/moongate.cpp
    engines/ultima/ultima4/game/object.h
    engines/ultima/ultima4/game/script.h
    engines/ultima/ultima4/game/weapon.h
    engines/ultima/ultima4/gfx/image.cpp
    engines/ultima/ultima4/gfx/imagemgr.h
    engines/ultima/ultima4/map/city.h
    engines/ultima/ultima4/map/maploader.h
    engines/ultima/ultima4/map/tile.h
    engines/ultima/ultima4/map/tilemap.h
    engines/ultima/ultima4/map/xml_map.h
    engines/ultima/ultima4/sound/music.h
    engines/ultima/ultima4/sound/sound.h
    engines/ultima/ultima4/ultima4.h
    engines/ultima/ultima4/views/menu.h
    engines/ultima/ultima4/views/menuitem.h


diff --git a/engines/ultima/nuvie/actors/actor.cpp b/engines/ultima/nuvie/actors/actor.cpp
index ac7f0d33daa..c715dec0cab 100644
--- a/engines/ultima/nuvie/actors/actor.cpp
+++ b/engines/ultima/nuvie/actors/actor.cpp
@@ -38,7 +38,6 @@
 #include "ultima/nuvie/script/script.h"
 #include "ultima/nuvie/core/events.h"
 #include "ultima/nuvie/actors/u6_actor.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/actors/actor.h b/engines/ultima/nuvie/actors/actor.h
index 2ad63492e5b..79fb049fdfe 100644
--- a/engines/ultima/nuvie/actors/actor.h
+++ b/engines/ultima/nuvie/actors/actor.h
@@ -22,7 +22,7 @@
 #ifndef NUVIE_ACTORS_ACTOR_H
 #define NUVIE_ACTORS_ACTOR_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/hashmap.h"
 #include "common/str.h"
 #include "ultima/nuvie/misc/actor_list.h"
 #include "ultima/nuvie/core/map.h"
diff --git a/engines/ultima/nuvie/conf/configuration.h b/engines/ultima/nuvie/conf/configuration.h
index d13099fcb1e..fb2299ead66 100644
--- a/engines/ultima/nuvie/conf/configuration.h
+++ b/engines/ultima/nuvie/conf/configuration.h
@@ -23,7 +23,6 @@
 #define NUVIE_CONF_CONFIGURATION_H
 
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 #include "ultima/detection.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/core/anim_manager.cpp b/engines/ultima/nuvie/core/anim_manager.cpp
index ec96ad3c110..96bef933924 100644
--- a/engines/ultima/nuvie/core/anim_manager.cpp
+++ b/engines/ultima/nuvie/core/anim_manager.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
 #include "ultima/nuvie/misc/u6_misc.h"
 #include "ultima/nuvie/fonts/font.h"
diff --git a/engines/ultima/nuvie/core/converse.h b/engines/ultima/nuvie/core/converse.h
index 437ffbfe84a..a34d491a017 100644
--- a/engines/ultima/nuvie/core/converse.h
+++ b/engines/ultima/nuvie/core/converse.h
@@ -23,7 +23,6 @@
 #define NUVIE_CORE_CONVERSE_H
 
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/actors/actor.h"
 #include "ultima/nuvie/gui/widgets/msg_scroll.h"
 #include "ultima/nuvie/files/u6_lib_n.h"
diff --git a/engines/ultima/nuvie/core/converse_interpret.h b/engines/ultima/nuvie/core/converse_interpret.h
index 82861d5b94d..60ab55a3909 100644
--- a/engines/ultima/nuvie/core/converse_interpret.h
+++ b/engines/ultima/nuvie/core/converse_interpret.h
@@ -23,6 +23,7 @@
 #define NUVIE_CORE_CONVERSE_INTERPRET_H
 
 #include "ultima/nuvie/core/converse.h"
+#include "common/stack.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/core/converse_speech.h b/engines/ultima/nuvie/core/converse_speech.h
index 9217223295f..77497ee4aec 100644
--- a/engines/ultima/nuvie/core/converse_speech.h
+++ b/engines/ultima/nuvie/core/converse_speech.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_CORE_CONVERSE_SPEECH_H
 #define NUVIE_CORE_CONVERSE_SPEECH_H
 
-#include "ultima/shared/std/containers.h"
 #include "audio/mixer.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/core/cursor.h b/engines/ultima/nuvie/core/cursor.h
index 171622e7c08..867f26082a1 100644
--- a/engines/ultima/nuvie/core/cursor.h
+++ b/engines/ultima/nuvie/core/cursor.h
@@ -23,7 +23,6 @@
 #define NUVIE_CORE_CURSOR_H
 
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/core/effect_manager.h b/engines/ultima/nuvie/core/effect_manager.h
index b0a8c5fb69d..e2c41b1f001 100644
--- a/engines/ultima/nuvie/core/effect_manager.h
+++ b/engines/ultima/nuvie/core/effect_manager.h
@@ -22,7 +22,7 @@
 #ifndef NUVIE_CORE_EFFECT_MANAGER_H
 #define NUVIE_CORE_EFFECT_MANAGER_H
 
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/core/events.h b/engines/ultima/nuvie/core/events.h
index b837c3a955e..47399302599 100644
--- a/engines/ultima/nuvie/core/events.h
+++ b/engines/ultima/nuvie/core/events.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_CORE_EVENT_H
 #define NUVIE_CORE_EVENT_H
 
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 #include "ultima/nuvie/misc/call_back.h"
 #include "ultima/nuvie/keybinding/keys_enum.h"
diff --git a/engines/ultima/nuvie/core/game.h b/engines/ultima/nuvie/core/game.h
index 569bd155571..a0a304cba01 100644
--- a/engines/ultima/nuvie/core/game.h
+++ b/engines/ultima/nuvie/core/game.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_CORE_GAME_H
 #define NUVIE_CORE_GAME_H
 
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
 
diff --git a/engines/ultima/nuvie/core/game_clock.h b/engines/ultima/nuvie/core/game_clock.h
index 7b4a00a091e..154108b54c0 100644
--- a/engines/ultima/nuvie/core/game_clock.h
+++ b/engines/ultima/nuvie/core/game_clock.h
@@ -22,8 +22,6 @@
 #ifndef NUVIE_CORE_GAME_CLOCK_H
 #define NUVIE_CORE_GAME_CLOCK_H
 
-#include "ultima/shared/std/containers.h"
-
 #include "ultima/nuvie/core/nuvie_defs.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/core/obj_manager.h b/engines/ultima/nuvie/core/obj_manager.h
index c1a5534c3d2..fb5370686fd 100644
--- a/engines/ultima/nuvie/core/obj_manager.h
+++ b/engines/ultima/nuvie/core/obj_manager.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_CORE_OBJ_MANAGER_H
 #define NUVIE_CORE_OBJ_MANAGER_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/misc/iavl_tree.h"
 #include "ultima/nuvie/core/tile_manager.h"
 #include "ultima/nuvie/misc/u6_llist.h"
diff --git a/engines/ultima/nuvie/files/u6_lib_n.h b/engines/ultima/nuvie/files/u6_lib_n.h
index c876c1098b8..0303689def9 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.h
+++ b/engines/ultima/nuvie/files/u6_lib_n.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_FILES_U6LIB_N_H
 #define NUVIE_FILES_U6LIB_N_H
 
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 #include "common/stream.h"
 
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.h b/engines/ultima/nuvie/gui/widgets/converse_gump.h
index 2f5e1edbe16..60ea155a807 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.h
@@ -24,7 +24,6 @@
 
 #include "ultima/nuvie/misc/call_back.h"
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
index cdb2e16b92c..2a2bf429b7c 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
@@ -25,7 +25,6 @@
 #include "ultima/nuvie/misc/call_back.h"
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
 #include "ultima/nuvie/fonts/font.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.h b/engines/ultima/nuvie/gui/widgets/map_window.h
index fa3d29511b4..04605b31bef 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.h
+++ b/engines/ultima/nuvie/gui/widgets/map_window.h
@@ -22,9 +22,6 @@
 #ifndef NUVIE_CORE_MAP_WINDOW_H
 #define NUVIE_CORE_MAP_WINDOW_H
 
-#include "ultima/shared/std/containers.h"
-
-
 #include "ultima/nuvie/core/nuvie_defs.h"
 #include "ultima/nuvie/core/obj_manager.h"
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.h b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
index dae59fccd00..83ebc76a121 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
@@ -24,7 +24,6 @@
 
 #include "ultima/nuvie/misc/call_back.h"
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
-#include "ultima/shared/std/containers.h"
 
 #define MSGSCROLL_U6_WIDTH 17
 #define MSGSCROLL_U6_HEIGHT 10
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
index b795c673db8..63f5eabc3d3 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -24,7 +24,6 @@
 
 #include "ultima/nuvie/misc/call_back.h"
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/keybinding/keys.h b/engines/ultima/nuvie/keybinding/keys.h
index 2e230bf3713..be96c42ce14 100644
--- a/engines/ultima/nuvie/keybinding/keys.h
+++ b/engines/ultima/nuvie/keybinding/keys.h
@@ -24,7 +24,6 @@
 
 #include "ultima/nuvie/keybinding/keys_enum.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 #include "common/events.h"
 #include "common/hash-str.h"
diff --git a/engines/ultima/nuvie/misc/actor_list.h b/engines/ultima/nuvie/misc/actor_list.h
index b1348c9888e..acf704db3bc 100644
--- a/engines/ultima/nuvie/misc/actor_list.h
+++ b/engines/ultima/nuvie/misc/actor_list.h
@@ -22,8 +22,7 @@
 #ifndef NUVIE_MISC_ACTOR_LIST_H
 #define NUVIE_MISC_ACTOR_LIST_H
 
-// include this if using ActorList
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/misc/u6_misc.cpp b/engines/ultima/nuvie/misc/u6_misc.cpp
index ca9a0196e87..3b626b1759a 100644
--- a/engines/ultima/nuvie/misc/u6_misc.cpp
+++ b/engines/ultima/nuvie/misc/u6_misc.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
 #include "ultima/nuvie/misc/u6_misc.h"
 #include "ultima/nuvie/conf/configuration.h"
diff --git a/engines/ultima/nuvie/pathfinder/astar_path.cpp b/engines/ultima/nuvie/pathfinder/astar_path.cpp
index 5fd86c96afc..a71faf09d00 100644
--- a/engines/ultima/nuvie/pathfinder/astar_path.cpp
+++ b/engines/ultima/nuvie/pathfinder/astar_path.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
 #include "ultima/nuvie/pathfinder/dir_finder.h"
 #include "ultima/nuvie/pathfinder/astar_path.h"
diff --git a/engines/ultima/nuvie/pathfinder/party_path_finder.cpp b/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
index c3916cfc3fe..adb8b312866 100644
--- a/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
+++ b/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/misc/u6_misc.h"
 #include "ultima/nuvie/actors/actor.h"
 #include "ultima/nuvie/core/party.h"
diff --git a/engines/ultima/nuvie/pathfinder/seek_path.h b/engines/ultima/nuvie/pathfinder/seek_path.h
index b19197647b9..a5f3e35f8f9 100644
--- a/engines/ultima/nuvie/pathfinder/seek_path.h
+++ b/engines/ultima/nuvie/pathfinder/seek_path.h
@@ -22,7 +22,6 @@
 #ifndef NUVIE_PATHFINDER_SEEK_PATH_H
 #define NUVIE_PATHFINDER_SEEK_PATH_H
 
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/pathfinder/path.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/script/script.h b/engines/ultima/nuvie/script/script.h
index f1e2e8a5cfc..5d1d3e5602b 100644
--- a/engines/ultima/nuvie/script/script.h
+++ b/engines/ultima/nuvie/script/script.h
@@ -25,7 +25,6 @@
 #include "common/lua/lua.h"
 
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 #include "ultima/nuvie/gui/gui.h"
 #include "ultima/nuvie/misc/u6_misc.h"
 #include "ultima/nuvie/usecode/usecode.h"
diff --git a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
index 9b69a56d287..e8e336d5d0e 100644
--- a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
@@ -22,8 +22,8 @@
 #ifndef NUVIE_SOUND_MIXER_RANDOM_COLLECTION_AUDIO_STREAM_H
 #define NUVIE_SOUND_MIXER_RANDOM_COLLECTION_AUDIO_STREAM_H
 
-#include "ultima/shared/std/containers.h"
 #include "audio/audiostream.h"
+#include "common/array.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/sound/sound.h b/engines/ultima/nuvie/sound/sound.h
index cba7828a9ba..aa2b591e5d9 100644
--- a/engines/ultima/nuvie/sound/sound.h
+++ b/engines/ultima/nuvie/sound/sound.h
@@ -24,7 +24,6 @@
 
 #include "ultima/nuvie/core/game.h"
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Nuvie {
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index b2ebc4ab48f..8a95b111be6 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -26,7 +26,6 @@
 #include "ultima/nuvie/gui/widgets/gui_widget.h"
 #include "ultima/nuvie/gui/widgets/msg_scroll.h"
 #include "ultima/nuvie/fonts/font.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/shared/std/containers.h b/engines/ultima/shared/std/containers.h
deleted file mode 100644
index 975200e7595..00000000000
--- a/engines/ultima/shared/std/containers.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ULTIMA_STD_CONTAINERS_H
-#define ULTIMA_STD_CONTAINERS_H
-
-#include "common/algorithm.h"
-#include "common/array.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-#include "common/list.h"
-#include "common/queue.h"
-#include "common/stack.h"
-#include "common/util.h"
-
-#endif
diff --git a/engines/ultima/ultima4/controllers/combat_controller.cpp b/engines/ultima/ultima4/controllers/combat_controller.cpp
index 369d71f82c7..c3d0d56fb50 100644
--- a/engines/ultima/ultima4/controllers/combat_controller.cpp
+++ b/engines/ultima/ultima4/controllers/combat_controller.cpp
@@ -46,7 +46,6 @@
 #include "ultima/ultima4/views/stats.h"
 #include "ultima/ultima4/game/weapon.h"
 #include "ultima/ultima4/gfx/screen.h"
-#include "ultima/shared/std/containers.h"
 #include "ultima/ultima4/ultima4.h"
 #include "common/system.h"
 
diff --git a/engines/ultima/ultima4/conversation/conversation.h b/engines/ultima/ultima4/conversation/conversation.h
index dcfdb1d015d..db75e256e2d 100644
--- a/engines/ultima/ultima4/conversation/conversation.h
+++ b/engines/ultima/ultima4/conversation/conversation.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_CONVERSATION_CONVERSATION_H
 
 #include "ultima/ultima4/core/utils.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp b/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
index a38255dac1b..170469daa67 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
+++ b/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
@@ -27,7 +27,6 @@
 #include "ultima/ultima4/filesys/u4file.h"
 #include "ultima/ultima4/core/utils.h"
 #include "ultima/ultima4/ultima4.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp b/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
index d6580aaff02..dd6f157d01f 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
+++ b/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
@@ -21,7 +21,6 @@
 
 #include "ultima/ultima4/conversation/conversation.h"
 #include "ultima/ultima4/conversation/dialogueloader_tlk.h"
-#include "ultima/shared/std/containers.h"
 #include "common/stream.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima4/core/config.h b/engines/ultima/ultima4/core/config.h
index 1bc740edf48..d31b19dfff4 100644
--- a/engines/ultima/ultima4/core/config.h
+++ b/engines/ultima/ultima4/core/config.h
@@ -24,7 +24,6 @@
 
 #include "ultima/shared/conf/xml_tree.h"
 #include "ultima/shared/conf/xml_node.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/core/observable.h b/engines/ultima/ultima4/core/observable.h
index 3df7e7f216e..cb6223add4b 100644
--- a/engines/ultima/ultima4/core/observable.h
+++ b/engines/ultima/ultima4/core/observable.h
@@ -23,7 +23,7 @@
 #define ULTIMA4_CORE_OBSERVABLE_H
 
 #include "ultima/ultima4/core/observer.h"
-#include "ultima/shared/std/containers.h"
+#include "common/array.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/core/utils.h b/engines/ultima/ultima4/core/utils.h
index 261277f6bdc..745a9ba3a24 100644
--- a/engines/ultima/ultima4/core/utils.h
+++ b/engines/ultima/ultima4/core/utils.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_CORE_UTILS_H
 
 #include "ultima/ultima4/ultima4.h"
-#include "ultima/shared/std/containers.h"
 #include "common/savefile.h"
 #include "common/hash-str.h"
 
diff --git a/engines/ultima/ultima4/events/event_handler.h b/engines/ultima/ultima4/events/event_handler.h
index 0e8b3325779..081194145d6 100644
--- a/engines/ultima/ultima4/events/event_handler.h
+++ b/engines/ultima/ultima4/events/event_handler.h
@@ -26,7 +26,6 @@
 #include "ultima/ultima4/controllers/key_handler_controller.h"
 #include "ultima/ultima4/core/types.h"
 #include "ultima/ultima4/gfx/screen.h"
-#include "ultima/shared/std/containers.h"
 #include "common/events.h"
 #include "common/list.h"
 #include "common/rect.h"
diff --git a/engines/ultima/ultima4/filesys/u4file.h b/engines/ultima/ultima4/filesys/u4file.h
index bb0a78cf474..caff65045d8 100644
--- a/engines/ultima/ultima4/filesys/u4file.h
+++ b/engines/ultima/ultima4/filesys/u4file.h
@@ -22,8 +22,8 @@
 #ifndef ULTIMA4_FILE_H
 #define ULTIMA4_FILE_H
 
+#include "common/array.h"
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/armor.h b/engines/ultima/ultima4/game/armor.h
index 465b53c622f..25fbb363447 100644
--- a/engines/ultima/ultima4/game/armor.h
+++ b/engines/ultima/ultima4/game/armor.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_GAME_ARMOR_H
 
 #include "ultima/ultima4/filesys/savegame.h"
-#include "ultima/shared/std/containers.h"
 #include "common/str.h"
 
 namespace Ultima {
diff --git a/engines/ultima/ultima4/game/context.h b/engines/ultima/ultima4/game/context.h
index e72a73f1520..db66ddd5b3a 100644
--- a/engines/ultima/ultima4/game/context.h
+++ b/engines/ultima/ultima4/game/context.h
@@ -29,7 +29,6 @@
 #include "ultima/ultima4/game/script.h"
 #include "ultima/ultima4/core/types.h"
 #include "ultima/ultima4/filesys/savegame.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/moongate.cpp b/engines/ultima/ultima4/game/moongate.cpp
index 529f4861548..eb25a69d688 100644
--- a/engines/ultima/ultima4/game/moongate.cpp
+++ b/engines/ultima/ultima4/game/moongate.cpp
@@ -22,7 +22,6 @@
 #include "ultima/ultima4/core/coords.h"
 #include "ultima/ultima4/game/moongate.h"
 #include "ultima/ultima4/core/types.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/object.h b/engines/ultima/ultima4/game/object.h
index fb370335075..2cdca711fbe 100644
--- a/engines/ultima/ultima4/game/object.h
+++ b/engines/ultima/ultima4/game/object.h
@@ -24,6 +24,7 @@
 #include "ultima/ultima4/core/coords.h"
 #include "ultima/ultima4/map/map_tile.h"
 #include "ultima/ultima4/core/types.h"
+#include "common/list.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/script.h b/engines/ultima/ultima4/game/script.h
index ca19729fd56..3003c6bb898 100644
--- a/engines/ultima/ultima4/game/script.h
+++ b/engines/ultima/ultima4/game/script.h
@@ -24,7 +24,6 @@
 
 #include "ultima/ultima4/core/types.h"
 #include "ultima/shared/conf/xml_node.h"
-#include "ultima/shared/std/containers.h"
 #include "common/file.h"
 #include "common/list.h"
 
diff --git a/engines/ultima/ultima4/game/weapon.h b/engines/ultima/ultima4/game/weapon.h
index 1a3d1f085fe..dc41d456428 100644
--- a/engines/ultima/ultima4/game/weapon.h
+++ b/engines/ultima/ultima4/game/weapon.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_GAME_WEAPON_H
 
 #include "ultima/ultima4/filesys/savegame.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/gfx/image.cpp b/engines/ultima/ultima4/gfx/image.cpp
index b5155cd930f..5b61fc3b9e7 100644
--- a/engines/ultima/ultima4/gfx/image.cpp
+++ b/engines/ultima/ultima4/gfx/image.cpp
@@ -23,7 +23,6 @@
 #include "ultima/ultima4/gfx/screen.h"
 #include "ultima/ultima4/core/settings.h"
 #include "ultima/ultima4/core/utils.h"
-#include "ultima/shared/std/containers.h"
 #include "common/system.h"
 #include "common/list.h"
 #include "common/textconsole.h"
diff --git a/engines/ultima/ultima4/gfx/imagemgr.h b/engines/ultima/ultima4/gfx/imagemgr.h
index fecbda0b1ca..03c3420e001 100644
--- a/engines/ultima/ultima4/gfx/imagemgr.h
+++ b/engines/ultima/ultima4/gfx/imagemgr.h
@@ -24,7 +24,8 @@
 
 #include "ultima/ultima4/gfx/image.h"
 #include "ultima/ultima4/core/observer.h"
-#include "ultima/shared/std/containers.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
 
 namespace Common {
 class File;
diff --git a/engines/ultima/ultima4/map/city.h b/engines/ultima/ultima4/map/city.h
index 2832787544e..dcd8896840f 100644
--- a/engines/ultima/ultima4/map/city.h
+++ b/engines/ultima/ultima4/map/city.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_MAP_CITY_H
 
 #include "ultima/ultima4/map/map.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/map/maploader.h b/engines/ultima/ultima4/map/maploader.h
index 79c2cde9448..b2fb7075f28 100644
--- a/engines/ultima/ultima4/map/maploader.h
+++ b/engines/ultima/ultima4/map/maploader.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_MAP_MAPLOADER_H
 
 #include "ultima/ultima4/map/map.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/ultima/ultima4/map/tile.h b/engines/ultima/ultima4/map/tile.h
index 95ee8bbf8f5..03ab238442e 100644
--- a/engines/ultima/ultima4/map/tile.h
+++ b/engines/ultima/ultima4/map/tile.h
@@ -25,7 +25,6 @@
 #include "ultima/ultima4/map/direction.h"
 #include "ultima/ultima4/core/types.h"
 #include "ultima/ultima4/map/tileset.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/map/tilemap.h b/engines/ultima/ultima4/map/tilemap.h
index b0218b27fe6..cc850ff209d 100644
--- a/engines/ultima/ultima4/map/tilemap.h
+++ b/engines/ultima/ultima4/map/tilemap.h
@@ -24,7 +24,6 @@
 
 #include "ultima/ultima4/core/types.h"
 #include "ultima/ultima4/map/map_tile.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/map/xml_map.h b/engines/ultima/ultima4/map/xml_map.h
index 0425264a4f4..98a3117fab7 100644
--- a/engines/ultima/ultima4/map/xml_map.h
+++ b/engines/ultima/ultima4/map/xml_map.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_MAP_XML_MAP_H
 
 #include "ultima/ultima4/map/city.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/sound/music.h b/engines/ultima/ultima4/sound/music.h
index c6fac81bcd9..27644124a86 100644
--- a/engines/ultima/ultima4/sound/music.h
+++ b/engines/ultima/ultima4/sound/music.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA4_SOUND_MUSIC_H
 #define ULTIMA4_SOUND_MUSIC_H
 
-#include "ultima/shared/std/containers.h"
 #include "audio/audiostream.h"
 #include "audio/midiplayer.h"
 #include "audio/mixer.h"
diff --git a/engines/ultima/ultima4/sound/sound.h b/engines/ultima/ultima4/sound/sound.h
index 75cc9b89873..56c37c0d8a5 100644
--- a/engines/ultima/ultima4/sound/sound.h
+++ b/engines/ultima/ultima4/sound/sound.h
@@ -22,7 +22,6 @@
 #ifndef ULTIMA4_SOUND_H
 #define ULTIMA4_SOUND_H
 
-#include "ultima/shared/std/containers.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/ultima4.h b/engines/ultima/ultima4/ultima4.h
index fe5fc036c5f..3d55863ac7f 100644
--- a/engines/ultima/ultima4/ultima4.h
+++ b/engines/ultima/ultima4/ultima4.h
@@ -25,7 +25,6 @@
 #include "common/random.h"
 #include "engines/engine.h"
 #include "ultima/detection.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/views/menu.h b/engines/ultima/ultima4/views/menu.h
index e64406abd0e..aea4e585170 100644
--- a/engines/ultima/ultima4/views/menu.h
+++ b/engines/ultima/ultima4/views/menu.h
@@ -26,7 +26,6 @@
 #include "ultima/ultima4/views/menuitem.h"
 #include "ultima/ultima4/core/observable.h"
 #include "ultima/ultima4/core/types.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/views/menuitem.h b/engines/ultima/ultima4/views/menuitem.h
index 423e0e14c46..5093297f2eb 100644
--- a/engines/ultima/ultima4/views/menuitem.h
+++ b/engines/ultima/ultima4/views/menuitem.h
@@ -23,7 +23,6 @@
 #define ULTIMA4_VIEWS_MENUITEM_H
 
 #include "common/str.h"
-#include "ultima/shared/std/containers.h"
 
 namespace Ultima {
 namespace Ultima4 {

More information about the Scummvm-git-logs mailing list