Full pass of include-what-you-use on the codebase

apps/esmtool/esmtool.cpp

@@ -19,6 +19,8 @@
 #include <components/files/openfile.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 #include "arguments.hpp"
 #include "labels.hpp"
 #include "record.hpp"

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -1,28 +1,39 @@
 #include "dialoguemanagerimp.hpp"
 
 #include <algorithm>
+#include <exception>
+#include <iterator>
 #include <list>
 #include <sstream>
+#include <stddef.h>
+#include <type_traits>
 
-#include <components/debug/debuglog.hpp>
+#include <apps/openmw/mwbase/dialoguemanager.hpp>
+#include <apps/openmw/mwdialogue/journalentry.hpp>
+#include <apps/openmw/mwdialogue/topic.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
+#include <components/compiler/exception.hpp>
+#include <components/compiler/locals.hpp>
+#include <components/compiler/scanner.hpp>
+#include <components/compiler/scriptparser.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/esm/defs.hpp>
 #include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loaddial.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadinfo.hpp>
-
-#include <components/compiler/errorhandler.hpp>
-#include <components/compiler/exception.hpp>
-#include <components/compiler/locals.hpp>
-#include <components/compiler/output.hpp>
-#include <components/compiler/scanner.hpp>
-#include <components/compiler/scriptparser.hpp>
-
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/interpreter/defines.hpp>
 #include <components/interpreter/interpreter.hpp>
-
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/settings/settings.hpp>
+#include <components/translation/translation.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/journal.hpp"
@@ -47,6 +58,21 @@
 #include "filter.hpp"
 #include "hypertextparser.hpp"
 
+namespace Compiler
+{
+    class Extensions;
+}
+
+namespace ESM
+{
+    class ESMReader;
+}
+
+namespace Loading
+{
+    class Listener;
+}
+
 namespace MWDialogue
 {
     DialogueManager::DialogueManager(

apps/openmw/mwdialogue/dialoguemanagerimp.hpp

@@ -1,24 +1,49 @@
 #ifndef GAME_MWDIALOG_DIALOGUEMANAGERIMP_H
 #define GAME_MWDIALOG_DIALOGUEMANAGERIMP_H
 
-#include "../mwbase/dialoguemanager.hpp"
-
+#include <list>
 #include <map>
 #include <set>
+#include <stdint.h>
+#include <string>
+#include <string_view>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/esm3/loadinfo.hpp>
+#include <components/interpreter/types.hpp>
 #include <components/misc/strings/algorithm.hpp>
-#include <components/translation/translation.hpp>
+
+#include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 
 #include "../mwscript/compilercontext.hpp"
 
+namespace Compiler
+{
+    class Extensions;
+}
+
+namespace Loading
+{
+    class Listener;
+}
+
+namespace Translation
+{
+    class Storage;
+}
+
 namespace ESM
 {
     struct Dialogue;
+    struct Dialogue;
+
+    class ESMReader;
+    class ESMWriter;
 }
 
 namespace MWDialogue

apps/openmw/mwdialogue/journalimp.hpp

@@ -1,6 +1,10 @@
 #ifndef GAME_MWDIALOG_JOURNAL_H
 #define GAME_MWDIALOG_JOURNAL_H
 
+#include <stdint.h>
+#include <string>
+#include <string_view>
+
 #include "../mwbase/journal.hpp"
 
 #include "quest.hpp"

apps/openmw/mwgui/alchemywindow.cpp

@@ -1,14 +1,41 @@
 #include "alchemywindow.hpp"
 
+#include <algorithm>
+#include <limits>
+#include <set>
+#include <stdlib.h>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_ControllerRepeatClick.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_Gui.h>
-
+#include <MyGUI_KeyCode.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/refid.hpp>
 #include <components/esm3/loadingr.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/widgets/box.hpp>
+#include <components/widgets/numericeditbox.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -30,6 +57,11 @@
 #include "ustring.hpp"
 #include "widgets.hpp"
 
+namespace MyGUI
+{
+    class ControllerItem;
+}
+
 namespace MWGui
 {
     AlchemyWindow::AlchemyWindow()

apps/openmw/mwgui/alchemywindow.hpp

@@ -2,18 +2,31 @@
 #define MWGUI_ALCHEMY_H
 
 #include <memory>
+#include <stddef.h>
+#include <string>
 #include <vector>
 
-#include <MyGUI_ComboBox.h>
-#include <MyGUI_ControllerItem.h>
-
-#include <components/widgets/box.hpp>
-#include <components/widgets/numericeditbox.hpp>
+#include <MyGUI_MouseButton.h>
 
 #include "windowbase.hpp"
 
 #include "../mwmechanics/alchemy.hpp"
 
+namespace Gui
+{
+    class AutoSizedButton;
+    class NumericEditBox;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class ComboBox;
+    class ControllerItem;
+    class EditBox;
+    class Widget;
+}
+
 namespace MWGui
 {
     class ItemView;

apps/openmw/mwgui/backgroundimage.cpp

@@ -1,6 +1,10 @@
 #include "backgroundimage.hpp"
 
+#include <algorithm>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_Widget.h>
 
 namespace MWGui
 {

apps/openmw/mwgui/backgroundimage.hpp

@@ -1,7 +1,11 @@
 #ifndef OPENMW_MWGUI_BACKGROUNDIMAGE_H
 #define OPENMW_MWGUI_BACKGROUNDIMAGE_H
 
+#include <string>
+
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_Types.h>
 
 namespace MWGui
 {

apps/openmw/mwgui/birth.cpp

@@ -1,12 +1,29 @@
 #include "birth.hpp"
 
+#include <algorithm>
+#include <string>
+#include <utility>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
+#include <MyGUI_Macros.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadspel.hpp>
+#include <components/esm3/spelllist.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
@@ -20,6 +37,11 @@
 #include "ustring.hpp"
 #include "widgets.hpp"
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace
 {
 

apps/openmw/mwgui/birth.hpp

@@ -1,9 +1,22 @@
 #ifndef MWGUI_BIRTH_H
 #define MWGUI_BIRTH_H
 
+#include <stddef.h>
+#include <vector>
+
+#include <MyGUI_Delegate.h>
+
 #include "windowbase.hpp"
 #include <components/esm/refid.hpp>
 
+namespace MyGUI
+{
+    class ImageBox;
+    class ListBox;
+    class ScrollView;
+    class Widget;
+}
+
 namespace MWGui
 {
     class BirthDialog : public WindowModal

apps/openmw/mwgui/bookpage.cpp

@@ -1,22 +1,46 @@
 #include "bookpage.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <list>
+#include <map>
 #include <optional>
+#include <stdexcept>
+#include <type_traits>
+#include <vector>
 
 #include "MyGUI_FactoryManager.h"
 #include "MyGUI_FontManager.h"
 #include "MyGUI_RenderItem.h"
 #include "MyGUI_RenderManager.h"
 #include "MyGUI_TextureUtility.h"
+#include <MyGUI_Colour.h>
+#include <MyGUI_ICroppedRectangle.h>
+#include <MyGUI_IFont.h>
+#include <MyGUI_ILayerNode.h>
+#include <MyGUI_IRenderTarget.h>
+#include <MyGUI_ISubWidget.h>
+#include <MyGUI_ISubWidgetText.h>
+#include <MyGUI_MouseButton.h>
+#include <MyGUI_RenderFormat.h>
+#include <MyGUI_RenderTargetInfo.h>
+#include <MyGUI_TPoint.h>
+#include <MyGUI_VertexData.h>
+
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>
 
-namespace MWGui
+namespace MyGUI
 {
-    struct TypesetBookImpl;
-    class PageDisplay;
-    class BookPageImpl;
+    class ITexture;
+    class Widget;
+}
 
+namespace MWGui
+{
     static bool ucsSpace(int codePoint);
     static bool ucsLineBreak(int codePoint);
     static bool ucsCarriageReturn(int codePoint);

apps/openmw/mwgui/bookpage.hpp

@@ -1,15 +1,21 @@
 #ifndef MWGUI_BOOKPAGE_HPP
 #define MWGUI_BOOKPAGE_HPP
 
-#include "MyGUI_Colour.h"
-#include "MyGUI_IFont.h"
-#include "MyGUI_Widget.h"
-
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <stddef.h>
+#include <string>
+#include <utility>
+
+#include "MyGUI_Colour.h"
+#include "MyGUI_IFont.h"
+#include "MyGUI_Widget.h"
+#include <MyGUI_FontData.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_Types.h>
 
-#include <components/settings/settings.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/bookwindow.cpp

@@ -1,9 +1,24 @@
 #include "bookwindow.hpp"
 
+#include <memory>
+#include <string_view>
+
+#include <MyGUI_Delegate.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_StringUtility.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
 
+#include <components/esm/refid.hpp>
 #include <components/esm3/loadbook.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/bookwindow.hpp

@@ -1,11 +1,27 @@
 #ifndef MWGUI_BOOKWINDOW_H
 #define MWGUI_BOOKWINDOW_H
 
+#include <algorithm>
+#include <utility>
+#include <vector>
+
+#include <MyGUI_KeyCode.h>
+#include <MyGUI_Types.h>
+
 #include "windowbase.hpp"
 
 #include "../mwworld/ptr.hpp"
 
-#include <components/widgets/imagebutton.hpp>
+namespace Gui
+{
+    class ImageButton;
+}
+
+namespace MyGUI
+{
+    class TextBox;
+    class Widget;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/charactercreation.cpp

@@ -1,9 +1,28 @@
 #include "charactercreation.hpp"
 
-#include <MyGUI_ITexture.h>
+#include <array>
+#include <assert.h>
+#include <exception>
+#include <stddef.h>
+#include <string_view>
+#include <utility>
+
+#include <MyGUI_Delegate.h>
+#include <MyGUI_StringUtility.h>
+
+#include <apps/openmw/mwgui/layout.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm/attr.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -13,7 +32,6 @@
 #include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

apps/openmw/mwgui/charactercreation.hpp

@@ -1,12 +1,19 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
-#include <components/esm3/loadclas.hpp>
-
+#include <algorithm>
 #include <map>
 #include <memory>
+#include <string>
+#include <string_view>
 #include <vector>
 
+#include <apps/openmw/mwmechanics/stat.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>
+
 #include "statswatcher.hpp"
 
 namespace osg
@@ -21,19 +28,16 @@ namespace Resource
 
 namespace MWGui
 {
-    class WindowBase;
-
-    class TextInputDialog;
-    class InfoBoxDialog;
-    class RaceDialog;
-    class DialogueWindow;
+    class BirthDialog;
     class ClassChoiceDialog;
+    class CreateClassDialog;
     class GenerateClassResultDialog;
+    class InfoBoxDialog;
     class PickClassDialog;
-    class CreateClassDialog;
-    class BirthDialog;
+    class RaceDialog;
     class ReviewDialog;
-    class MessageBoxManager;
+    class TextInputDialog;
+    class WindowBase;
 
     class CharacterCreation : public StatsListener
     {

apps/openmw/mwgui/class.cpp

@@ -1,8 +1,34 @@
 #include "class.hpp"
 
+#include <string_view>
+#include <utility>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ISubWidgetText.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
+#include <MyGUI_Macros.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/layout.hpp>
+#include <apps/openmw/mwgui/widgets.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/debug/debuglog.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -12,12 +38,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/debug/debuglog.hpp>
-#include <components/esm3/loadnpc.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/resource/resourcesystem.hpp>
-#include <components/vfs/manager.hpp>
-
 #include "tooltips.hpp"
 #include "ustring.hpp"
 

apps/openmw/mwgui/class.hpp

@@ -1,17 +1,32 @@
 #ifndef MWGUI_CLASS_H
 #define MWGUI_CLASS_H
 
+#include <algorithm>
 #include <memory>
+#include <string>
+#include <vector>
 
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm/attr.hpp>
 #include <components/esm/refid.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class ImageBox;
+    class ListBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
     void setClassImage(MyGUI::ImageBox* imageBox, const ESM::RefId& classId);

apps/openmw/mwgui/companionitemmodel.cpp

@@ -1,5 +1,13 @@
 #include "companionitemmodel.hpp"
 
+#include <type_traits>
+
+#include <apps/openmw/mwgui/inventoryitemmodel.hpp>
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwscript/locals.hpp>
+
+#include <components/esm/refid.hpp>
+
 #include "../mwworld/class.hpp"
 
 namespace

apps/openmw/mwgui/companionitemmodel.hpp

@@ -1,10 +1,15 @@
 #ifndef MWGUI_COMPANION_ITEM_MODEL_H
 #define MWGUI_COMPANION_ITEM_MODEL_H
 
+#include <stddef.h>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include "inventoryitemmodel.hpp"
 
 namespace MWGui
 {
+    struct ItemStack;
 
     /// @brief The companion item model keeps track of the companion's profit by
     /// monitoring which items are being added to and removed from the model.

apps/openmw/mwgui/companionwindow.cpp

@@ -1,10 +1,32 @@
 #include "companionwindow.hpp"
 
 #include <cmath>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/referenceinterface.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwscript/locals.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -20,6 +42,11 @@
 #include "tooltips.hpp"
 #include "widgets.hpp"
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace
 {
 

apps/openmw/mwgui/companionwindow.hpp

@@ -4,6 +4,19 @@
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
     namespace Widgets

apps/openmw/mwgui/confirmationdialog.cpp

@@ -2,6 +2,13 @@
 
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
+
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/confirmationdialog.hpp

@@ -1,8 +1,19 @@
 #ifndef MWGUI_CONFIRMATIONDIALOG_H
 #define MWGUI_CONFIRMATIONDIALOG_H
 
+#include <string>
+
+#include <MyGUI_Delegate.h>
+
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class Widget;
+}
+
 namespace MWGui
 {
     class ConfirmationDialog : public WindowModal

apps/openmw/mwgui/console.cpp

@@ -1,18 +1,41 @@
 #include "console.hpp"
 
+#include <algorithm>
+#include <compare>
+#include <exception>
+#include <filesystem>
+#include <fstream>
+#include <memory>
+#include <stddef.h>
+#include <type_traits>
+
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LayerManager.h>
+#include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_WidgetInput.h>
 
-#include <filesystem>
-#include <fstream>
+#include <apps/openmw/mwgui/referenceinterface.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwscript/compilercontext.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
 #include <components/compiler/lineparser.hpp>
 #include <components/compiler/locals.hpp>
+#include <components/compiler/output.hpp>
 #include <components/compiler/scanner.hpp>
+#include <components/compiler/tokenloc.hpp>
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/interpreter/interpreter.hpp>
+#include <components/interpreter/types.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/strings/lower.hpp>
 
 #include "../mwscript/extensions.hpp"
 #include "../mwscript/interpretercontext.hpp"
@@ -26,6 +49,11 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace MWGui
 {
     class ConsoleInterpreterContext : public MWScript::InterpreterContext

apps/openmw/mwgui/console.hpp

@@ -3,11 +3,16 @@
 
 #include <list>
 #include <string>
+#include <string_view>
 #include <vector>
 
+#include <MyGUI_KeyCode.h>
+#include <MyGUI_Types.h>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include <components/compiler/errorhandler.hpp>
 #include <components/compiler/extensions.hpp>
-#include <components/compiler/output.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -16,6 +21,18 @@
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
+namespace Compiler
+{
+    class Output;
+    struct TokenLoc;
+}
+
+namespace MyGUI
+{
+    class EditBox;
+    class Widget;
+}
+
 namespace MWGui
 {
     class Console : public WindowBase, private Compiler::ErrorHandler, public ReferenceInterface

apps/openmw/mwgui/container.cpp

@@ -1,7 +1,30 @@
 #include "container.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <map>
+#include <memory>
+#include <stddef.h>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/referenceinterface.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/aisequence.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwgui/container.hpp

@@ -4,19 +4,25 @@
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
-#include "itemmodel.hpp"
+namespace MWWorld
+{
+    class Ptr;
+}
 
 namespace MyGUI
 {
-    class Gui;
+    class Button;
     class Widget;
 }
 
 namespace MWGui
 {
-    class ContainerWindow;
+    class DragAndDrop;
+    class ItemModel;
     class ItemView;
     class SortFilterItemModel;
+
+    struct ItemStack;
 }
 
 namespace MWGui

apps/openmw/mwgui/containeritemmodel.cpp

@@ -1,6 +1,17 @@
 #include "containeritemmodel.hpp"
 
 #include <algorithm>
+#include <assert.h>
+#include <memory>
+#include <stdexcept>
+#include <type_traits>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/refdata.hpp>
+
+#include <components/esm3/loadcont.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/containeritemmodel.hpp

@@ -1,9 +1,12 @@
 #ifndef MWGUI_CONTAINER_ITEM_MODEL_H
 #define MWGUI_CONTAINER_ITEM_MODEL_H
 
+#include <stddef.h>
 #include <utility>
 #include <vector>
 
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include "itemmodel.hpp"
 
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwgui/controllers.hpp

@@ -1,9 +1,11 @@
 #ifndef MWGUI_CONTROLLERS_H
 #define MWGUI_CONTROLLERS_H
 
-#include <MyGUI_ControllerItem.h>
 #include <string>
 
+#include <MyGUI_ControllerItem.h>
+#include <MyGUI_RTTI.h>
+
 namespace MyGUI
 {
     class Widget;

apps/openmw/mwgui/countdialog.cpp

@@ -1,9 +1,21 @@
 #include "countdialog.hpp"
 
+#include <algorithm>
+
 #include <MyGUI_Button.h>
+#include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
+#include <MyGUI_KeyCode.h>
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollBar.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
 
+#include <components/misc/notnullptr.hpp>
 #include <components/widgets/numericeditbox.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/countdialog.hpp

@@ -1,8 +1,22 @@
 #ifndef MWGUI_COUNTDIALOG_H
 #define MWGUI_COUNTDIALOG_H
 
+#include <stddef.h>
+#include <string>
+
+#include <MyGUI_Delegate.h>
+
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class ScrollBar;
+    class TextBox;
+    class Widget;
+}
+
 namespace Gui
 {
     class NumericEditBox;

apps/openmw/mwgui/cursor.cpp

@@ -1,9 +1,10 @@
 #include "cursor.hpp"
 
-#include <MyGUI_Gui.h>
-#include <MyGUI_InputManager.h>
-#include <MyGUI_PointerManager.h>
-#include <MyGUI_RotatingSkin.h>
+#include <MyGUI_IResource.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ResourceManager.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_Version.h>
 
 namespace MWGui
 {

apps/openmw/mwgui/cursor.hpp

@@ -1,8 +1,19 @@
 #ifndef MWGUI_CURSOR_H
 #define MWGUI_CURSOR_H
 
+#include <string>
+
 #include <MyGUI_IPointer.h>
+#include <MyGUI_RTTI.h>
 #include <MyGUI_ResourceImageSet.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_XmlDocument.h>
+
+namespace MyGUI
+{
+    class ImageBox;
+    class Version;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/debugwindow.cpp

@@ -1,11 +1,25 @@
 #include "debugwindow.hpp"
 
+#include <algorithm>
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include <LinearMath/btQuickprof.h>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_TabControl.h>
 #include <MyGUI_TabItem.h>
+#include <MyGUI_Types.h>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
 
-#include <LinearMath/btQuickprof.h>
 #include <components/debug/debugging.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/debugwindow.hpp

@@ -3,6 +3,12 @@
 
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class EditBox;
+    class TabControl;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/dialogue.cpp

@@ -1,13 +1,44 @@
 #include "dialogue.hpp"
 
+#include <algorithm>
+#include <functional>
+#include <limits>
+#include <string_view>
+#include <type_traits>
+
 #include <MyGUI_Button.h>
+#include <MyGUI_Colour.h>
+#include <MyGUI_EventPair.h>
+#include <MyGUI_ISubWidgetText.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_ScrollBar.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TCoord.h>
+#include <MyGUI_TSize.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_WidgetInput.h>
 #include <MyGUI_Window.h>
 
+#include <apps/openmw/mwdialogue/keywordsearch.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwscript/locals.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+#include <apps/openmw/mwworld/timestamp.hpp>
+
 #include <components/debug/debuglog.hpp>
+#include <components/esm/refid.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/strings/lower.hpp>
+#include <components/settings/settings.hpp>
 #include <components/translation/translation.hpp>
 #include <components/widgets/box.hpp>
 #include <components/widgets/list.hpp>

apps/openmw/mwgui/dialogue.hpp

@@ -1,7 +1,17 @@
 #ifndef MWGUI_DIALOGE_H
 #define MWGUI_DIALOGE_H
 
+#include <cstdint>
+#include <list>
+#include <map>
 #include <memory>
+#include <stddef.h>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
 
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
@@ -13,6 +23,20 @@
 
 #include <MyGUI_Delegate.h>
 
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class ProgressBar;
+    class ScrollBar;
+    class TextBox;
+    class Window;
+}
+
 namespace Gui
 {
     class AutoSizedTextBox;

apps/openmw/mwgui/draganddrop.cpp

@@ -1,8 +1,19 @@
 #include "draganddrop.hpp"
 
+#include <memory>
+#include <string_view>
+#include <type_traits>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_ControllerItem.h>
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_Gui.h>
 
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/misc/notnullptr.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 

apps/openmw/mwgui/enchantingdialog.cpp

@@ -1,17 +1,37 @@
 #include "enchantingdialog.hpp"
 
-#include <iomanip>
+#include <algorithm>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <vector>
 
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
+#include <MyGUI_KeyCode.h>
 #include <MyGUI_ScrollView.h>
-
+#include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/spellcreationdialog.hpp>
+#include <apps/openmw/mwmechanics/enchanting.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/settings/settings.hpp>
 #include <components/widgets/list.hpp>
 
-#include <components/esm3/loadgmst.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/enchantingdialog.hpp

@@ -3,11 +3,29 @@
 
 #include <memory>
 
+#include <apps/openmw/mwgui/referenceinterface.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+
+#include <components/esm3/effectlist.hpp>
+
 #include "itemselection.hpp"
 #include "spellcreationdialog.hpp"
 
 #include "../mwmechanics/enchanting.hpp"
 
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/exposedwindow.cpp

@@ -1,5 +1,10 @@
 #include "exposedwindow.hpp"
 
+#include <ostream>
+
+#include <MyGUI_LogStream.h>
+#include <MyGUI_Widget.h>
+
 namespace MWGui
 {
     MyGUI::VectorWidgetPtr Window::getSkinWidgetsByName(const std::string& name)

apps/openmw/mwgui/exposedwindow.hpp

@@ -1,8 +1,17 @@
 #ifndef MWGUI_EXPOSEDWINDOW_H
 #define MWGUI_EXPOSEDWINDOW_H
 
+#include <string>
+
+#include <MyGUI_RTTI.h>
+#include <MyGUI_WidgetDefines.h>
 #include <MyGUI_Window.h>
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/formatting.cpp

@@ -1,17 +1,31 @@
 #include "formatting.hpp"
 
-#include <MyGUI_EditBox.h>
+#include <istream>
+#include <memory>
+#include <stdexcept>
+
 #include <MyGUI_EditText.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ISubWidgetText.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextIterator.h>
+#include <MyGUI_TextViewData.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+
+#include <apps/openmw/mwworld/ptr.hpp>
 
 #include <components/debug/debuglog.hpp>
 #include <components/fontloader/fontloader.hpp>
 #include <components/interpreter/defines.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/widgets/box.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/formatting.hpp

@@ -1,10 +1,26 @@
 #ifndef MWGUI_FORMATTING_H
 #define MWGUI_FORMATTING_H
 
-#include <MyGUI_Colour.h>
+#include <algorithm>
 #include <map>
+#include <stddef.h>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_Colour.h>
+
+namespace Gui
+{
+    class EditBox;
+}
 
-#include <components/widgets/box.hpp>
+namespace MyGUI
+{
+    class ImageBox;
+    class Widget;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/hud.cpp

@@ -1,14 +1,42 @@
 #include "hud.hpp"
 
+#include <algorithm>
+#include <cmath>
+#include <stddef.h>
+#include <stdexcept>
+#include <string_view>
+#include <type_traits>
+#include <vector>
+
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollView.h>
-
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TPoint.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <osg/Math>
+
+#include <apps/openmw/mwgui/mapwindow.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/effectlist.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/settings/settings.hpp>
@@ -30,6 +58,11 @@
 
 #include "itemwidget.hpp"
 
+namespace MWRender
+{
+    class LocalMap;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/hud.hpp

@@ -2,11 +2,29 @@
 #define OPENMW_GAME_MWGUI_HUD_H
 
 #include <memory>
+#include <string>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/stat.hpp>
 
 #include "mapwindow.hpp"
-#include "spellicons.hpp"
 #include "statswatcher.hpp"
 
+namespace MWRender
+{
+    class LocalMap;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class ImageBox;
+    class ProgressBar;
+    class ScrollView;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWWorld
 {
     class Ptr;
@@ -16,6 +34,7 @@ namespace MWGui
 {
     class DragAndDrop;
     class ItemWidget;
+    class SpellIcons;
     class SpellWidget;
 
     class HUD : public WindowBase, public LocalMapBase, public StatsListener

apps/openmw/mwgui/inventoryitemmodel.cpp

@@ -1,9 +1,16 @@
 #include "inventoryitemmodel.hpp"
 
 #include <sstream>
+#include <stdexcept>
+#include <type_traits>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwgui/inventoryitemmodel.hpp

@@ -1,6 +1,11 @@
 #ifndef MWGUI_INVENTORY_ITEM_MODEL_H
 #define MWGUI_INVENTORY_ITEM_MODEL_H
 
+#include <stddef.h>
+#include <vector>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include "itemmodel.hpp"
 
 namespace MWGui

apps/openmw/mwgui/inventorywindow.cpp

@@ -1,21 +1,58 @@
 #include "inventorywindow.hpp"
 
+#include <algorithm>
 #include <cmath>
+#include <stddef.h>
 #include <stdexcept>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
+#include <MyGUI_ISubWidgetRect.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_MouseButton.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TPoint.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
 #include <MyGUI_Window.h>
 
 #include <osg/Texture2D>
 
-#include <components/misc/strings/algorithm.hpp>
-
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/widgets.hpp>
+#include <apps/openmw/mwgui/windowpinnablebase.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
+#include <apps/openmw/mwrender/characterpreview.hpp>
+#include <apps/openmw/mwscript/locals.hpp>
+#include <apps/openmw/mwworld/action.hpp>
+#include <apps/openmw/mwworld/containerstore.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
-
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -23,7 +60,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/actionequip.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 

apps/openmw/mwgui/inventorywindow.hpp

@@ -1,12 +1,30 @@
 #ifndef MGUI_Inventory_H
 #define MGUI_Inventory_H
 
+#include <memory>
+#include <string>
+
+#include <MyGUI_ITexture.h>
+#include <MyGUI_Types.h>
+
+#include <osg/Vec2f>
+
 #include "mode.hpp"
 #include "windowpinnablebase.hpp"
 
 #include "../mwrender/characterpreview.hpp"
 #include "../mwworld/ptr.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class ImageBox;
+    class TextBox;
+    class Widget;
+    class Window;
+}
+
 namespace osg
 {
     class Group;

apps/openmw/mwgui/itemchargeview.cpp

@@ -1,13 +1,25 @@
 #include "itemchargeview.hpp"
 
 #include <set>
+#include <stddef.h>
+#include <stdexcept>
+#include <string_view>
+#include <type_traits>
 
+#include <MyGUI_Align.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_WidgetInput.h>
 
+#include <apps/openmw/mwgui/widgets.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/refid.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/itemchargeview.hpp

@@ -1,11 +1,18 @@
 #ifndef MWGUI_ITEMCHARGEVIEW_H
 #define MWGUI_ITEMCHARGEVIEW_H
 
+#include <algorithm>
 #include <memory>
+#include <string>
 #include <vector>
 
+#include <MyGUI_Delegate.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_Types.h>
 #include <MyGUI_Widget.h>
 
+#include <apps/openmw/mwgui/itemmodel.hpp>
+
 #include "../mwworld/ptr.hpp"
 
 #include "widgets.hpp"
@@ -18,7 +25,6 @@ namespace MyGUI
 
 namespace MWGui
 {
-    class ItemModel;
     class ItemWidget;
 
     class ItemChargeView final : public MyGUI::Widget

apps/openmw/mwgui/itemmodel.cpp

@@ -1,5 +1,13 @@
 #include "itemmodel.hpp"
 
+#include <type_traits>
+#include <utility>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 

apps/openmw/mwgui/itemmodel.hpp

@@ -2,6 +2,7 @@
 #define MWGUI_ITEM_MODEL_H
 
 #include <memory>
+#include <stddef.h>
 
 #include "../mwworld/ptr.hpp"
 

apps/openmw/mwgui/itemselection.cpp

@@ -1,11 +1,23 @@
 #include "itemselection.hpp"
 
+#include <memory>
+#include <utility>
+
 #include <MyGUI_Button.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
 
 #include "inventoryitemmodel.hpp"
 #include "itemview.hpp"
 #include "sortfilteritemmodel.hpp"
+#include <apps/openmw/mwgui/windowbase.hpp>
+
+namespace MyGUI
+{
+    class Widget;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/itemselection.hpp

@@ -1,10 +1,17 @@
 #ifndef OPENMW_GAME_MWGUI_ITEMSELECTION_H
 #define OPENMW_GAME_MWGUI_ITEMSELECTION_H
 
+#include <string>
+
 #include <MyGUI_Delegate.h>
 
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace MWWorld
 {
     class Ptr;

apps/openmw/mwgui/itemview.cpp

@@ -1,11 +1,15 @@
 #include "itemview.hpp"
 
+#include <algorithm>
 #include <cmath>
+#include <stdexcept>
+#include <utility>
 
+#include <MyGUI_Align.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_WidgetInput.h>
 
 #include "itemmodel.hpp"
 #include "itemwidget.hpp"

apps/openmw/mwgui/itemview.hpp

@@ -1,10 +1,21 @@
 #ifndef MWGUI_ITEMVIEW_H
 #define MWGUI_ITEMVIEW_H
 
+#include <memory>
+#include <string>
+
+#include <MyGUI_Delegate.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_Types.h>
 #include <MyGUI_Widget.h>
 
 #include "itemmodel.hpp"
 
+namespace MyGUI
+{
+    class ScrollView;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/itemwidget.cpp

@@ -1,12 +1,20 @@
 #include "itemwidget.hpp"
 
+#include <string_view>
+#include <utility>
+
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_ITexture.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_StringUtility.h>
 #include <MyGUI_TextBox.h>
 
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include <components/debug/debuglog.hpp>
-// correctIconPath
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>

apps/openmw/mwgui/itemwidget.hpp

@@ -1,8 +1,19 @@
 #ifndef OPENMW_MWGUI_ITEMWIDGET_H
 #define OPENMW_MWGUI_ITEMWIDGET_H
 
+#include <map>
+#include <string>
+
+#include <MyGUI_RTTI.h>
+#include <MyGUI_Types.h>
 #include <MyGUI_Widget.h>
 
+namespace MyGUI
+{
+    class ImageBox;
+    class TextBox;
+}
+
 namespace MWWorld
 {
     class Ptr;

apps/openmw/mwgui/jailscreen.cpp

@@ -1,5 +1,25 @@
+#include <algorithm>
+#include <set>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include <MyGUI_Delegate.h>
 #include <MyGUI_ScrollBar.h>
 
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/timeadvancer.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/activespells.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
+#include <apps/openmw/mwmechanics/stat.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
 

apps/openmw/mwgui/jailscreen.hpp

@@ -4,6 +4,11 @@
 #include "timeadvancer.hpp"
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class ScrollBar;
+}
+
 namespace MWGui
 {
     class JailScreen : public WindowBase

apps/openmw/mwgui/journalbooks.cpp

@@ -1,5 +1,16 @@
 #include "journalbooks.hpp"
 
+#include <memory>
+#include <stdio.h>
+#include <string.h>
+
+#include <MyGUI_Colour.h>
+
+#include <apps/openmw/mwgui/bookpage.hpp>
+#include <apps/openmw/mwgui/journalviewmodel.hpp>
+
+#include <components/misc/notnullptr.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 

apps/openmw/mwgui/journalbooks.hpp

@@ -1,6 +1,9 @@
 #ifndef MWGUI_JOURNALBOOKS_HPP
 #define MWGUI_JOURNALBOOKS_HPP
 
+#include <stdint.h>
+#include <string>
+
 #include "bookpage.hpp"
 #include "journalviewmodel.hpp"
 

apps/openmw/mwgui/journalviewmodel.cpp

@@ -1,9 +1,21 @@
 #include "journalviewmodel.hpp"
 
+#include <algorithm>
+#include <deque>
 #include <map>
+#include <ostream>
+#include <set>
+#include <vector>
 
 #include <MyGUI_LanguageManager.h>
+#include <MyGUI_UString.h>
 
+#include <apps/openmw/mwdialogue/journalentry.hpp>
+#include <apps/openmw/mwdialogue/quest.hpp>
+#include <apps/openmw/mwdialogue/topic.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/translation/translation.hpp>
 
@@ -17,8 +29,6 @@
 namespace MWGui
 {
 
-    struct JournalViewModelImpl;
-
     struct JournalViewModelImpl : JournalViewModel
     {
         typedef MWDialogue::KeywordSearch<std::string, intptr_t> KeywordSearchT;

apps/openmw/mwgui/journalviewmodel.hpp

@@ -4,7 +4,10 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <stddef.h>
 #include <string>
+#include <string_view>
+#include <utility>
 
 #include <components/misc/utf8stream.hpp>
 

apps/openmw/mwgui/journalwindow.cpp

@@ -1,15 +1,27 @@
 #include "journalwindow.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <functional>
 #include <set>
 #include <stack>
+#include <stdint.h>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_KeyCode.h>
+#include <MyGUI_StringUtility.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
 
-#include <components/misc/strings/algorithm.hpp>
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/widgets/imagebutton.hpp>
 #include <components/widgets/list.hpp>
 

apps/openmw/mwgui/journalwindow.hpp

@@ -7,11 +7,6 @@
 
 #include <memory>
 
-namespace MWBase
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     struct JournalViewModel;

apps/openmw/mwgui/keyboardnavigation.cpp

@@ -1,11 +1,23 @@
 #include "keyboardnavigation.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <stdlib.h>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <MyGUI_Delegate.h>
+#include <MyGUI_Exception.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetDefines.h>
 #include <MyGUI_WidgetManager.h>
 #include <MyGUI_Window.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/keyboardnavigation.hpp

@@ -1,9 +1,16 @@
 #ifndef OPENMW_MWGUI_KEYBOARDNAVIGATION_H
 #define OPENMW_MWGUI_KEYBOARDNAVIGATION_H
 
+#include <map>
+
 #include <MyGUI_IUnlinkWidget.h>
 #include <MyGUI_KeyCode.h>
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/layout.cpp

@@ -1,8 +1,14 @@
 #include "layout.hpp"
 
+#include <ostream>
+#include <vector>
+
 #include <MyGUI_Gui.h>
 #include <MyGUI_LayoutManager.h>
+#include <MyGUI_LogStream.h>
+#include <MyGUI_StringUtility.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
 #include <MyGUI_Widget.h>
 #include <MyGUI_Window.h>
 

apps/openmw/mwgui/layout.hpp

@@ -1,10 +1,15 @@
 #ifndef OPENMW_MWGUI_LAYOUT_H
 #define OPENMW_MWGUI_LAYOUT_H
 
+#include <assert.h>
 #include <string>
 #include <string_view>
 
+#include <MyGUI_Exception.h>
 #include <MyGUI_Widget.h>
+#include <MyGUI_WidgetDefines.h>
+
+#include "MyGUI_LogManager.h"
 
 #include <components/debug/debuglog.hpp>
 

apps/openmw/mwgui/levelupdialog.cpp

@@ -1,10 +1,29 @@
 #include "levelupdialog.hpp"
 
+#include <algorithm>
+#include <string_view>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ImageBox.h>
-
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TPoint.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/stat.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"

apps/openmw/mwgui/levelupdialog.hpp

@@ -1,8 +1,20 @@
 #ifndef MWGUI_LEVELUPDIALOG_H
 #define MWGUI_LEVELUPDIALOG_H
 
+#include <string>
+#include <vector>
+
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class ImageBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/loadingscreen.cpp

@@ -1,16 +1,36 @@
 #include "loadingscreen.hpp"
 
+#include <algorithm>
 #include <array>
+#include <string_view>
+
+#include <MyGUI_ISubWidgetRect.h>
+#include <MyGUI_ITexture.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+
+#include <osg/BoundingSphere>
+#include <osg/Camera>
+#include <osg/FrameStamp>
+#include <osg/GL>
+#include <osg/Node>
+#include <osg/RenderInfo>
+#include <osg/Texture2D>
+#include <osg/Viewport>
 
 #include <osgViewer/Viewer>
 
-#include <osg/Texture2D>
+#include <osgUtil/IncrementalCompileOperation>
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_ScrollBar.h>
 #include <MyGUI_TextBox.h>
 
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+
 #include <components/debug/debuglog.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/myguiplatform/myguitexture.hpp>

apps/openmw/mwgui/loadingscreen.hpp

@@ -2,6 +2,9 @@
 #define MWGUI_LOADINGSCREEN_H
 
 #include <memory>
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 #include <osg/Timer>
 #include <osg/ref_ptr>
@@ -10,6 +13,14 @@
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
+namespace MyGUI
+{
+    class ITexture;
+    class ScrollBar;
+    class TextBox;
+    class Widget;
+}
+
 namespace osgViewer
 {
     class Viewer;

apps/openmw/mwgui/mainmenu.cpp

@@ -1,9 +1,28 @@
 #include "mainmenu.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <list>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
 
+#include <apps/openmw/mwgui/layout.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/widgets/imagebutton.hpp>

apps/openmw/mwgui/mainmenu.hpp

@@ -1,7 +1,9 @@
 #ifndef OPENMW_GAME_MWGUI_MAINMENU_H
 #define OPENMW_GAME_MWGUI_MAINMENU_H
 
+#include <map>
 #include <memory>
+#include <string>
 
 #include "savegamedialog.hpp"
 #include "windowbase.hpp"
@@ -16,6 +18,13 @@ namespace VFS
     class Manager;
 }
 
+namespace MyGUI
+{
+    class ImageBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/mapwindow.cpp

@@ -1,20 +1,48 @@
 #include "mapwindow.hpp"
 
-#include <osg/Texture2D>
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <stdexcept>
+#include <type_traits>
+
+#include <osg/Vec2i>
+#include <osg/Vec3f>
+#include <osg/ref_ptr>
 
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Colour.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ISubWidget.h>
+#include <MyGUI_ISubWidgetRect.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
-#include <MyGUI_RenderManager.h>
+#include <MyGUI_RTTI.h>
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_TPoint.h>
+#include <MyGUI_TextBox.h>
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowpinnablebase.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
+#include <components/esm/defs.hpp>
+#include <components/esm/refid.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/globalmap.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 #include <components/settings/settings.hpp>
 
@@ -33,7 +61,15 @@
 
 #include "confirmationdialog.hpp"
 
-#include <numeric>
+namespace MWGui
+{
+    class DragAndDrop;
+}
+
+namespace osg
+{
+    class Texture2D;
+}
 
 namespace
 {

apps/openmw/mwgui/mapwindow.hpp

@@ -2,19 +2,44 @@
 #define MWGUI_MAPWINDOW_H
 
 #include <cstdint>
+#include <map>
 #include <memory>
+#include <set>
+#include <stddef.h>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <osg/Vec2f>
 
+#include <MyGUI_Delegate.h>
 #include <MyGUI_ITexture.h>
+#include <MyGUI_MouseButton.h>
+#include <MyGUI_Types.h>
 
 #include "windowpinnablebase.hpp"
 
+#include <apps/openmw/mwgui/windowbase.hpp>
+
 #include <components/esm3/cellid.hpp>
 
 #include <components/esm3/custommarkerstate.hpp>
 #include <components/misc/constants.hpp>
 
+namespace MWGui
+{
+    class DragAndDrop;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class ImageBox;
+    class ScrollView;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWRender
 {
     class GlobalMap;

apps/openmw/mwgui/merchantrepair.cpp

@@ -1,10 +1,30 @@
 #include "merchantrepair.hpp"
 
-#include <components/esm3/loadgmst.hpp>
+#include <algorithm>
+#include <string>
+#include <string_view>
+#include <type_traits>
 
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwgui/merchantrepair.hpp

@@ -4,6 +4,14 @@
 #include "../mwworld/ptr.hpp"
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class ScrollView;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/messagebox.cpp

@@ -1,11 +1,23 @@
 #include "messagebox.hpp"
 
+#include <algorithm>
+#include <utility>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_TSize.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_WidgetInput.h>
+#include <MyGUI_WidgetStyle.h>
+
+#include <apps/openmw/mwgui/windowbase.hpp>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/messagebox.hpp

@@ -2,12 +2,19 @@
 #define MWGUI_MESSAGE_BOX_H
 
 #include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include <MyGUI_Delegate.h>
+#include <MyGUI_Widget.h>
+
+#include <apps/openmw/mwgui/layout.hpp>
 
 #include "windowbase.hpp"
 
 namespace MyGUI
 {
-    class Widget;
     class Button;
     class EditBox;
 }
@@ -15,7 +22,6 @@ namespace MyGUI
 namespace MWGui
 {
     class InteractiveMessageBox;
-    class MessageBoxManager;
     class MessageBox;
     class MessageBoxManager
     {

apps/openmw/mwgui/pickpocketitemmodel.cpp

@@ -1,6 +1,15 @@
 #include "pickpocketitemmodel.hpp"
 
+#include <algorithm>
+#include <stdexcept>
+#include <utility>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+
+#include <components/esm/refid.hpp>
 #include <components/esm3/loadskil.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/rng.hpp>
 
 #include "../mwmechanics/actorutil.hpp"

apps/openmw/mwgui/pickpocketitemmodel.hpp

@@ -1,6 +1,12 @@
 #ifndef MWGUI_PICKPOCKET_ITEM_MODEL_H
 #define MWGUI_PICKPOCKET_ITEM_MODEL_H
 
+#include <memory>
+#include <stddef.h>
+#include <vector>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
 #include "itemmodel.hpp"
 
 namespace MWGui

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -1,14 +1,41 @@
 #include "quickkeysmenu.hpp"
 
+#include <algorithm>
+#include <assert.h>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ITexture.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
-
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/spellmodel.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/drawstate.hpp>
+#include <apps/openmw/mwmechanics/spells.hpp>
+#include <apps/openmw/mwworld/containerstore.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
+
+#include <components/esm/defs.hpp>
+#include <components/esm3/effectlist.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
 #include <components/esm3/quickkeys.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
@@ -31,6 +58,11 @@
 #include "sortfilteritemmodel.hpp"
 #include "spellview.hpp"
 
+namespace ESM
+{
+    class ESMReader;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/quickkeysmenu.hpp

@@ -2,11 +2,35 @@
 #define MWGUI_QUICKKEYS_H
 
 #include <memory>
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+#include <components/esm/refid.hpp>
 
 #include "itemselection.hpp"
 #include "spellmodel.hpp"
 #include "windowbase.hpp"
 
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+}
+
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class EditBox;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/race.cpp

@@ -1,17 +1,40 @@
 #include "race.hpp"
 
+#include <algorithm>
+#include <exception>
+#include <string>
+#include <utility>
+
+#include <osg/Math>
+#include <osg/Texture2D>
+
+#include <MyGUI_Align.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ISubWidgetRect.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
+#include <MyGUI_Macros.h>
 #include <MyGUI_ScrollBar.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
 
-#include <osg/Texture2D>
+#include <apps/openmw/mwgui/widgets.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/debug/debuglog.hpp>
-#include <components/myguiplatform/myguitexture.hpp>
-
 #include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/spelllist.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/myguiplatform/myguitexture.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/race.hpp

@@ -1,13 +1,25 @@
 #ifndef MWGUI_RACE_H
 #define MWGUI_RACE_H
 
-#include "windowbase.hpp"
-#include <components/esm/refid.hpp>
 #include <memory>
+#include <stddef.h>
+#include <vector>
+
+#include <MyGUI_Delegate.h>
+#include <MyGUI_ITexture.h>
+
+#include <components/esm/refid.hpp>
+
+#include <apps/openmw/mwrender/characterpreview.hpp>
+
+#include "windowbase.hpp"
 
-namespace MWRender
+namespace MyGUI
 {
-    class RaceSelectionPreview;
+    class ImageBox;
+    class ListBox;
+    class ScrollBar;
+    class Widget;
 }
 
 namespace ESM

apps/openmw/mwgui/recharge.cpp

@@ -1,10 +1,26 @@
 #include "recharge.hpp"
 
-#include <MyGUI_ScrollView.h>
-
-#include <components/widgets/box.hpp>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <type_traits>
+
+#include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/esm3/loadcrea.hpp>
+#include <components/misc/notnullptr.hpp>
+#include <components/widgets/box.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/recharge.hpp

@@ -3,8 +3,17 @@
 
 #include <memory>
 
+#include <apps/openmw/mwgui/itemselection.hpp>
+
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWWorld
 {
     class Ptr;
@@ -12,8 +21,6 @@ namespace MWWorld
 
 namespace MWGui
 {
-
-    class ItemSelectionDialog;
     class ItemWidget;
     class ItemChargeView;
 

apps/openmw/mwgui/referenceinterface.cpp

@@ -1,5 +1,9 @@
 #include "referenceinterface.hpp"
 
+#include <type_traits>
+
+#include <apps/openmw/mwworld/ptr.hpp>
+
 namespace MWGui
 {
     ReferenceInterface::ReferenceInterface() {}

apps/openmw/mwgui/repair.cpp

@@ -1,19 +1,37 @@
 #include "repair.hpp"
 
 #include <iomanip>
-
-#include <MyGUI_ScrollView.h>
-
+#include <ostream>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <type_traits>
+
+#include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/itemmodel.hpp>
+#include <apps/openmw/mwgui/mode.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwmechanics/repair.hpp>
+#include <apps/openmw/mwworld/livecellref.hpp>
+#include <apps/openmw/mwworld/ptr.hpp>
+
+#include <components/esm/refid.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/misc/notnullptr.hpp>
 #include <components/widgets/box.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/containerstore.hpp"
 
 #include "inventoryitemmodel.hpp"
 #include "itemchargeview.hpp"

apps/openmw/mwgui/repair.hpp

@@ -3,14 +3,27 @@
 
 #include <memory>
 
+#include <apps/openmw/mwgui/itemselection.hpp>
+
 #include "windowbase.hpp"
 
 #include "../mwmechanics/repair.hpp"
 
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MyGUI
+{
+    class Button;
+    class TextBox;
+    class Widget;
+}
+
 namespace MWGui
 {
 
-    class ItemSelectionDialog;
     class ItemWidget;
     class ItemChargeView;
 

apps/openmw/mwgui/resourceskin.cpp

@@ -1,6 +1,10 @@
 #include "resourceskin.hpp"
 
+#include <MyGUI_ITexture.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_TCoord.h>
+#include <MyGUI_Types.h>
+#include <MyGUI_Version.h>
 
 #include <components/misc/strings/algorithm.hpp>
 

apps/openmw/mwgui/resourceskin.hpp

@@ -1,7 +1,16 @@
 #ifndef MWGUI_RESOURCESKIN_H
 #define MWGUI_RESOURCESKIN_H
 
+#include <string>
+
+#include <MyGUI_RTTI.h>
 #include <MyGUI_ResourceSkin.h>
+#include <MyGUI_XmlDocument.h>
+
+namespace MyGUI
+{
+    class Version;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/review.cpp

@@ -1,15 +1,32 @@
 #include "review.hpp"
 
+#include <array>
+#include <assert.h>
 #include <cmath>
+#include <iterator>
+#include <set>
+#include <type_traits>
+#include <utility>
 
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_StringUtility.h>
+#include <MyGUI_TCoord.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_WidgetInput.h>
+
+#include <apps/openmw/mwgui/widgets.hpp>
+#include <apps/openmw/mwgui/windowbase.hpp>
+#include <apps/openmw/mwworld/store.hpp>
 
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadspel.hpp>
+#include <components/esm3/spelllist.hpp>
+#include <components/misc/notnullptr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -20,6 +37,11 @@
 #include "tooltips.hpp"
 #include "ustring.hpp"
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace
 {
     void adjustButtonSize(MyGUI::Button* button)