XEEN: Move all the dialog classes to their own sub-folder

56 files changed, 109 insertions, 109 deletions

diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 69fbc1666a..c6ebde8a39 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xeen/character.h"
-#include "xeen/dialogs_query.h"
-#include "xeen/dialogs_message.h"
+#include "xeen/dialogs/dialogs_query.h"
+#include "xeen/dialogs/dialogs_message.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs/dialogs.cpp
index 4ca69ec4cb..c9b5658a0e 100644
--- a/engines/xeen/dialogs.cpp
+++ b/engines/xeen/dialogs/dialogs.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/scummsys.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/events.h"
 #include "xeen/resources.h"
 #include "xeen/screen.h"
diff --git a/engines/xeen/dialogs.h b/engines/xeen/dialogs/dialogs.h
index cabc921536..cabc921536 100644
--- a/engines/xeen/dialogs.h
+++ b/engines/xeen/dialogs/dialogs.h
diff --git a/engines/xeen/dialogs_awards.cpp b/engines/xeen/dialogs/dialogs_awards.cpp
index 242539c20b..8e8bfcf67f 100644
--- a/engines/xeen/dialogs_awards.cpp
+++ b/engines/xeen/dialogs/dialogs_awards.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_awards.h"
+#include "xeen/dialogs/dialogs_awards.h"
 #include "xeen/party.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/dialogs_awards.h b/engines/xeen/dialogs/dialogs_awards.h
index 6ce3a05f59..2ca68171a4 100644
--- a/engines/xeen/dialogs_awards.h
+++ b/engines/xeen/dialogs/dialogs_awards.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_AWARDS_H
 #define XEEN_DIALOGS_AWARDS_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/character.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp
index 3d9ebfb2e0..0ae64ed608 100644
--- a/engines/xeen/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "xeen/dialogs_awards.h"
-#include "xeen/dialogs_char_info.h"
-#include "xeen/dialogs_exchange.h"
-#include "xeen/dialogs_items.h"
-#include "xeen/dialogs_quick_ref.h"
+#include "xeen/dialogs/dialogs_awards.h"
+#include "xeen/dialogs/dialogs_char_info.h"
+#include "xeen/dialogs/dialogs_exchange.h"
+#include "xeen/dialogs/dialogs_items.h"
+#include "xeen/dialogs/dialogs_quick_ref.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_char_info.h b/engines/xeen/dialogs/dialogs_char_info.h
index 5f538700f9..6dc7eaa51a 100644
--- a/engines/xeen/dialogs_char_info.h
+++ b/engines/xeen/dialogs/dialogs_char_info.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_CHAR_INFO_H
 #define XEEN_DIALOGS_CHAR_INFO_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 #include "xeen/window.h"
 
diff --git a/engines/xeen/dialogs_control_panel.cpp b/engines/xeen/dialogs/dialogs_control_panel.cpp
index d2129e46c2..9c933b30a3 100644
--- a/engines/xeen/dialogs_control_panel.cpp
+++ b/engines/xeen/dialogs/dialogs_control_panel.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "xeen/dialogs_control_panel.h"
-#include "xeen/dialogs_query.h"
+#include "xeen/dialogs/dialogs_control_panel.h"
+#include "xeen/dialogs/dialogs_query.h"
 #include "xeen/party.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/dialogs_control_panel.h b/engines/xeen/dialogs/dialogs_control_panel.h
index b87e78dd14..5181825630 100644
--- a/engines/xeen/dialogs_control_panel.h
+++ b/engines/xeen/dialogs/dialogs_control_panel.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_CONTROL_PANEL_H
 #define XEEN_DIALOGS_CONTROL_PANEL_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_create_char.cpp b/engines/xeen/dialogs/dialogs_create_char.cpp
index 73aa4b3f02..577ae5314b 100644
--- a/engines/xeen/dialogs_create_char.cpp
+++ b/engines/xeen/dialogs/dialogs_create_char.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "xeen/dialogs_create_char.h"
-#include "xeen/dialogs_input.h"
+#include "xeen/dialogs/dialogs_create_char.h"
+#include "xeen/dialogs/dialogs_input.h"
 #include "xeen/xeen.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_create_char.h b/engines/xeen/dialogs/dialogs_create_char.h
index de140e8626..dc1422eb23 100644
--- a/engines/xeen/dialogs_create_char.h
+++ b/engines/xeen/dialogs/dialogs_create_char.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_CREATE_CHAR_H
 #define XEEN_DIALOGS_CREATE_CHAR_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/character.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_difficulty.cpp b/engines/xeen/dialogs/dialogs_difficulty.cpp
index 8d542dc165..0b024e1857 100644
--- a/engines/xeen/dialogs_difficulty.cpp
+++ b/engines/xeen/dialogs/dialogs_difficulty.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_difficulty.h"
+#include "xeen/dialogs/dialogs_difficulty.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_difficulty.h b/engines/xeen/dialogs/dialogs_difficulty.h
index e0771a50b9..5ff2c93a2b 100644
--- a/engines/xeen/dialogs_difficulty.h
+++ b/engines/xeen/dialogs/dialogs_difficulty.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_DIFFICULTY_H
 #define XEEN_DIALOGS_DIFFICULTY_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_dismiss.cpp b/engines/xeen/dialogs/dialogs_dismiss.cpp
index 52ac475e05..716f8f0035 100644
--- a/engines/xeen/dialogs_dismiss.cpp
+++ b/engines/xeen/dialogs/dialogs_dismiss.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_dismiss.h"
+#include "xeen/dialogs/dialogs_dismiss.h"
 #include "xeen/party.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/dialogs_dismiss.h b/engines/xeen/dialogs/dialogs_dismiss.h
index 7b73fc6f03..832f779a09 100644
--- a/engines/xeen/dialogs_dismiss.h
+++ b/engines/xeen/dialogs/dialogs_dismiss.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_DISMISS_H
 #define XEEN_DIALOGS_DISMISS_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_exchange.cpp b/engines/xeen/dialogs/dialogs_exchange.cpp
index d977656d35..87dde1b0c3 100644
--- a/engines/xeen/dialogs_exchange.cpp
+++ b/engines/xeen/dialogs/dialogs_exchange.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_exchange.h"
+#include "xeen/dialogs/dialogs_exchange.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_exchange.h b/engines/xeen/dialogs/dialogs_exchange.h
index e67c315133..ff7e214787 100644
--- a/engines/xeen/dialogs_exchange.h
+++ b/engines/xeen/dialogs/dialogs_exchange.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_EXCHANGE_H
 #define XEEN_DIALOGS_EXCHANGE_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_info.cpp b/engines/xeen/dialogs/dialogs_info.cpp
index 4f51316b6e..50558534d1 100644
--- a/engines/xeen/dialogs_info.cpp
+++ b/engines/xeen/dialogs/dialogs_info.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_info.h"
+#include "xeen/dialogs/dialogs_info.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_info.h b/engines/xeen/dialogs/dialogs_info.h
index 68c8403545..fdbbc22163 100644
--- a/engines/xeen/dialogs_info.h
+++ b/engines/xeen/dialogs/dialogs_info.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_INFO_H
 
 #include "common/str-array.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs/dialogs_input.cpp
index 0bf95f766b..1d05c81f32 100644
--- a/engines/xeen/dialogs_input.cpp
+++ b/engines/xeen/dialogs/dialogs_input.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_input.h"
+#include "xeen/dialogs/dialogs_input.h"
 #include "xeen/scripts.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_input.h b/engines/xeen/dialogs/dialogs_input.h
index 3451fbc681..270495ffd5 100644
--- a/engines/xeen/dialogs_input.h
+++ b/engines/xeen/dialogs/dialogs_input.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_STRING_INPUT_H
 
 #include "common/keyboard.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/screen.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs/dialogs_items.cpp
index f7c0e48e41..0ca0fd2267 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs/dialogs_items.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "xeen/dialogs_items.h"
-#include "xeen/dialogs_query.h"
-#include "xeen/dialogs_quests.h"
+#include "xeen/dialogs/dialogs_items.h"
+#include "xeen/dialogs/dialogs_query.h"
+#include "xeen/dialogs/dialogs_quests.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_items.h b/engines/xeen/dialogs/dialogs_items.h
index f35ef883b8..b9af06eb74 100644
--- a/engines/xeen/dialogs_items.h
+++ b/engines/xeen/dialogs/dialogs_items.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_ITEMS_H
 #define XEEN_DIALOGS_ITEMS_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 #include "xeen/window.h"
 
diff --git a/engines/xeen/dialogs_map.cpp b/engines/xeen/dialogs/dialogs_map.cpp
index d7442605c3..b822c71472 100644
--- a/engines/xeen/dialogs_map.cpp
+++ b/engines/xeen/dialogs/dialogs_map.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_map.h"
+#include "xeen/dialogs/dialogs_map.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_map.h b/engines/xeen/dialogs/dialogs_map.h
index 3c12afab49..5e22e5268d 100644
--- a/engines/xeen/dialogs_map.h
+++ b/engines/xeen/dialogs/dialogs_map.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_MAP_H
 #define XEEN_DIALOGS_MAP_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_message.cpp b/engines/xeen/dialogs/dialogs_message.cpp
index b0bc5b6634..df8afea34c 100644
--- a/engines/xeen/dialogs_message.cpp
+++ b/engines/xeen/dialogs/dialogs_message.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/scummsys.h"
-#include "xeen/dialogs_message.h"
+#include "xeen/dialogs/dialogs_message.h"
 #include "xeen/events.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_message.h b/engines/xeen/dialogs/dialogs_message.h
index e092b30670..95d942858c 100644
--- a/engines/xeen/dialogs_message.h
+++ b/engines/xeen/dialogs/dialogs_message.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_dialogs_message_H
 #define XEEN_dialogs_message_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/character.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_party.cpp b/engines/xeen/dialogs/dialogs_party.cpp
index b0c638243d..33e138b6ac 100644
--- a/engines/xeen/dialogs_party.cpp
+++ b/engines/xeen/dialogs/dialogs_party.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "xeen/dialogs_char_info.h"
-#include "xeen/dialogs_create_char.h"
-#include "xeen/dialogs_party.h"
-#include "xeen/dialogs_input.h"
-#include "xeen/dialogs_query.h"
+#include "xeen/dialogs/dialogs_char_info.h"
+#include "xeen/dialogs/dialogs_create_char.h"
+#include "xeen/dialogs/dialogs_party.h"
+#include "xeen/dialogs/dialogs_input.h"
+#include "xeen/dialogs/dialogs_query.h"
 #include "xeen/character.h"
 #include "xeen/events.h"
 #include "xeen/party.h"
diff --git a/engines/xeen/dialogs_party.h b/engines/xeen/dialogs/dialogs_party.h
index ba9c34cd0d..8f87ca3aa6 100644
--- a/engines/xeen/dialogs_party.h
+++ b/engines/xeen/dialogs/dialogs_party.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_PARTY_H
 
 #include "common/array.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/interface.h"
 #include "xeen/screen.h"
 #include "xeen/sprites.h"
diff --git a/engines/xeen/dialogs_query.cpp b/engines/xeen/dialogs/dialogs_query.cpp
index 5fbf35f1c4..79f46826cd 100644
--- a/engines/xeen/dialogs_query.cpp
+++ b/engines/xeen/dialogs/dialogs_query.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_query.h"
+#include "xeen/dialogs/dialogs_query.h"
 #include "xeen/xeen.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_query.h b/engines/xeen/dialogs/dialogs_query.h
index 0b9b2687ac..911de3d79d 100644
--- a/engines/xeen/dialogs_query.h
+++ b/engines/xeen/dialogs/dialogs_query.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_QUERY_H
 #define XEEN_DIALOGS_QUERY_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_quests.cpp b/engines/xeen/dialogs/dialogs_quests.cpp
index 5e5171ea87..e4f62270ef 100644
--- a/engines/xeen/dialogs_quests.cpp
+++ b/engines/xeen/dialogs/dialogs_quests.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/scummsys.h"
-#include "xeen/dialogs_quests.h"
+#include "xeen/dialogs/dialogs_quests.h"
 #include "xeen/events.h"
 #include "xeen/party.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/dialogs_quests.h b/engines/xeen/dialogs/dialogs_quests.h
index dd1461f75b..a3f1980c67 100644
--- a/engines/xeen/dialogs_quests.h
+++ b/engines/xeen/dialogs/dialogs_quests.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_QUESTS_H
 
 #include "common/str-array.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_quick_fight.cpp b/engines/xeen/dialogs/dialogs_quick_fight.cpp
index 74261a8e18..63acf55655 100644
--- a/engines/xeen/dialogs_quick_fight.cpp
+++ b/engines/xeen/dialogs/dialogs_quick_fight.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_quick_fight.h"
+#include "xeen/dialogs/dialogs_quick_fight.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_quick_fight.h b/engines/xeen/dialogs/dialogs_quick_fight.h
index 66f4d3cd8a..e3662c930a 100644
--- a/engines/xeen/dialogs_quick_fight.h
+++ b/engines/xeen/dialogs/dialogs_quick_fight.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_QUICK_FIGHT_H
 
 #include "xeen/character.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/sprites.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_quick_ref.cpp b/engines/xeen/dialogs/dialogs_quick_ref.cpp
index afc06966dd..0c8a63b43a 100644
--- a/engines/xeen/dialogs_quick_ref.cpp
+++ b/engines/xeen/dialogs/dialogs_quick_ref.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_quick_ref.h"
+#include "xeen/dialogs/dialogs_quick_ref.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_quick_ref.h b/engines/xeen/dialogs/dialogs_quick_ref.h
index eaafd99537..4630043c3f 100644
--- a/engines/xeen/dialogs_quick_ref.h
+++ b/engines/xeen/dialogs/dialogs_quick_ref.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_QUICK_REF_H
 #define XEEN_DIALOGS_QUICK_REF_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 96917e225c..3da5a5149e 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "xeen/dialogs_spells.h"
-#include "xeen/dialogs_input.h"
-#include "xeen/dialogs_query.h"
+#include "xeen/dialogs/dialogs_spells.h"
+#include "xeen/dialogs/dialogs_input.h"
+#include "xeen/dialogs/dialogs_query.h"
 #include "xeen/resources.h"
 #include "xeen/spells.h"
 #include "xeen/sprites.h"
diff --git a/engines/xeen/dialogs_spells.h b/engines/xeen/dialogs/dialogs_spells.h
index 4781a8d08c..2bcaef43e5 100644
--- a/engines/xeen/dialogs_spells.h
+++ b/engines/xeen/dialogs/dialogs_spells.h
@@ -24,7 +24,7 @@
 #define XEEN_DIALOGS_SPELLS_H
 
 #include "common/array.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/party.h"
 
 namespace Xeen {
diff --git a/engines/xeen/dialogs_whowill.cpp b/engines/xeen/dialogs/dialogs_whowill.cpp
index 1e32007d7f..842804219b 100644
--- a/engines/xeen/dialogs_whowill.cpp
+++ b/engines/xeen/dialogs/dialogs_whowill.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "xeen/dialogs_whowill.h"
+#include "xeen/dialogs/dialogs_whowill.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/dialogs_whowill.h b/engines/xeen/dialogs/dialogs_whowill.h
index 8018cbb0ef..5303bdbea3 100644
--- a/engines/xeen/dialogs_whowill.h
+++ b/engines/xeen/dialogs/dialogs_whowill.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_DIALOGS_WHOWHILL_H
 #define XEEN_DIALOGS_WHOWHILL_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index f646eb8ac5..3d9f05b5a2 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -21,21 +21,21 @@
  */
 
 #include "xeen/interface.h"
-#include "xeen/dialogs_char_info.h"
-#include "xeen/dialogs_control_panel.h"
-#include "xeen/dialogs_message.h"
-#include "xeen/dialogs_quick_fight.h"
-#include "xeen/dialogs_info.h"
-#include "xeen/dialogs_items.h"
-#include "xeen/dialogs_map.h"
-#include "xeen/dialogs_query.h"
-#include "xeen/dialogs_quests.h"
-#include "xeen/dialogs_quick_ref.h"
-#include "xeen/dialogs_spells.h"
+#include "xeen/dialogs/dialogs_char_info.h"
+#include "xeen/dialogs/dialogs_control_panel.h"
+#include "xeen/dialogs/dialogs_message.h"
+#include "xeen/dialogs/dialogs_quick_fight.h"
+#include "xeen/dialogs/dialogs_info.h"
+#include "xeen/dialogs/dialogs_items.h"
+#include "xeen/dialogs/dialogs_map.h"
+#include "xeen/dialogs/dialogs_query.h"
+#include "xeen/dialogs/dialogs_quests.h"
+#include "xeen/dialogs/dialogs_quick_ref.h"
+#include "xeen/dialogs/dialogs_spells.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
-#include "xeen/dialogs_party.h"
+#include "xeen/dialogs/dialogs_party.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/interface.h b/engines/xeen/interface.h
index e2499d8fa3..bbc2a77f1e 100644
--- a/engines/xeen/interface.h
+++ b/engines/xeen/interface.h
@@ -24,7 +24,7 @@
 #define XEEN_INTERFACE_H
 
 #include "common/scummsys.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/interface_minimap.h"
 #include "xeen/interface_scene.h"
 #include "xeen/party.h"
diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp
index b82cd7ae38..4f03362b91 100644
--- a/engines/xeen/interface_scene.cpp
+++ b/engines/xeen/interface_scene.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xeen/interface_scene.h"
-#include "xeen/dialogs_message.h"
+#include "xeen/dialogs/dialogs_message.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 7a8290504a..4a9abf073d 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -21,11 +21,11 @@
  */
 
 #include "xeen/locations.h"
-#include "xeen/dialogs_input.h"
-#include "xeen/dialogs_items.h"
-#include "xeen/dialogs_party.h"
-#include "xeen/dialogs_query.h"
-#include "xeen/dialogs_spells.h"
+#include "xeen/dialogs/dialogs_input.h"
+#include "xeen/dialogs/dialogs_items.h"
+#include "xeen/dialogs/dialogs_party.h"
+#include "xeen/dialogs/dialogs_query.h"
+#include "xeen/dialogs/dialogs_spells.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
 
diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h
index 246548c11e..bcc3c07209 100644
--- a/engines/xeen/locations.h
+++ b/engines/xeen/locations.h
@@ -25,8 +25,8 @@
 
 #include "common/scummsys.h"
 #include "common/str-array.h"
-#include "xeen/dialogs.h"
-#include "xeen/dialogs_message.h"
+#include "xeen/dialogs/dialogs.h"
+#include "xeen/dialogs/dialogs_message.h"
 #include "xeen/party.h"
 
 namespace Xeen {
diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index fcd99a89d5..a49d5a3e33 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -14,26 +14,26 @@ MODULE_OBJS := \
 	cutscenes.o \
 	debugger.o \
 	detection.o \
-	dialogs.o \
-	dialogs_awards.o \
-	dialogs_char_info.o \
-	dialogs_control_panel.o \
-	dialogs_create_char.o \
-	dialogs_difficulty.o \
-	dialogs_dismiss.o \
-	dialogs_exchange.o \
-	dialogs_info.o \
-	dialogs_input.o \
-	dialogs_items.o \
-	dialogs_map.o \
-	dialogs_message.o \
-	dialogs_party.o \
-	dialogs_query.o \
-	dialogs_quests.o \
-	dialogs_quick_fight.o \
-	dialogs_quick_ref.o \
-	dialogs_spells.o \
-	dialogs_whowill.o \
+	dialogs/dialogs.o \
+	dialogs/dialogs_awards.o \
+	dialogs/dialogs_char_info.o \
+	dialogs/dialogs_control_panel.o \
+	dialogs/dialogs_create_char.o \
+	dialogs/dialogs_difficulty.o \
+	dialogs/dialogs_dismiss.o \
+	dialogs/dialogs_exchange.o \
+	dialogs/dialogs_info.o \
+	dialogs/dialogs_input.o \
+	dialogs/dialogs_items.o \
+	dialogs/dialogs_map.o \
+	dialogs/dialogs_message.o \
+	dialogs/dialogs_party.o \
+	dialogs/dialogs_query.o \
+	dialogs/dialogs_quests.o \
+	dialogs/dialogs_quick_fight.o \
+	dialogs/dialogs_quick_ref.o \
+	dialogs/dialogs_spells.o \
+	dialogs/dialogs_whowill.o \
 	events.o \
 	files.o \
 	font.o \
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index b24030d380..62e74ae8c2 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -23,8 +23,8 @@
 #include "common/scummsys.h"
 #include "common/algorithm.h"
 #include "xeen/party.h"
-#include "xeen/dialogs_message.h"
-#include "xeen/dialogs_input.h"
+#include "xeen/dialogs/dialogs_message.h"
+#include "xeen/dialogs/dialogs_input.h"
 #include "xeen/files.h"
 #include "xeen/resources.h"
 #include "xeen/saves.h"
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index 372e373676..40cf4ef1db 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -29,7 +29,7 @@
 #include "common/serializer.h"
 #include "xeen/character.h"
 #include "xeen/combat.h"
-#include "xeen/dialogs_message.h"
+#include "xeen/dialogs/dialogs_message.h"
 
 namespace Xeen {
 
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 679e48c5b0..a3aa67baf8 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -22,9 +22,9 @@
 
 #include "common/config-manager.h"
 #include "xeen/scripts.h"
-#include "xeen/dialogs_input.h"
-#include "xeen/dialogs_whowill.h"
-#include "xeen/dialogs_query.h"
+#include "xeen/dialogs/dialogs_input.h"
+#include "xeen/dialogs/dialogs_whowill.h"
+#include "xeen/dialogs/dialogs_query.h"
 #include "xeen/party.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp
index 72140a2d2f..9ba581249b 100644
--- a/engines/xeen/spells.cpp
+++ b/engines/xeen/spells.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xeen/spells.h"
-#include "xeen/dialogs_items.h"
-#include "xeen/dialogs_spells.h"
+#include "xeen/dialogs/dialogs_items.h"
+#include "xeen/dialogs/dialogs_spells.h"
 #include "xeen/files.h"
 #include "xeen/resources.h"
 #include "xeen/xeen.h"
diff --git a/engines/xeen/swordsofxeen/swordsofxeen_menu.cpp b/engines/xeen/swordsofxeen/swordsofxeen_menu.cpp
index ce424b90c0..6eb6a647b1 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen_menu.cpp
+++ b/engines/xeen/swordsofxeen/swordsofxeen_menu.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xeen/swordsofxeen/swordsofxeen_menu.h"
-#include "xeen/dialogs_difficulty.h"
+#include "xeen/dialogs/dialogs_difficulty.h"
 #include "xeen/xeen.h"
 
 namespace Xeen {
diff --git a/engines/xeen/swordsofxeen/swordsofxeen_menu.h b/engines/xeen/swordsofxeen/swordsofxeen_menu.h
index 6457c2c859..e7e92b862c 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen_menu.h
+++ b/engines/xeen/swordsofxeen/swordsofxeen_menu.h
@@ -23,7 +23,7 @@
 #ifndef XEEN_SWORDSOFXEEN_MENU_H
 #define XEEN_SWORDSOFXEEN_MENU_H
 
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 namespace SwordsOfXeen {
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index a91a711a67..c0aa9008b5 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -23,7 +23,7 @@
 #include "common/scummsys.h"
 #include "xeen/worldofxeen/worldofxeen_menu.h"
 #include "xeen/worldofxeen/worldofxeen.h"
-#include "xeen/dialogs_difficulty.h"
+#include "xeen/dialogs/dialogs_difficulty.h"
 #include "xeen/resources.h"
 
 namespace Xeen {
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.h b/engines/xeen/worldofxeen/worldofxeen_menu.h
index 3495f08923..92d770be80 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.h
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.h
@@ -24,7 +24,7 @@
 #define XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H
 
 #include "xeen/xeen.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 
 namespace Xeen {
 namespace WorldOfXeen {
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index 98ba00bf52..62b3a7e426 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -32,7 +32,7 @@
 #include "engines/engine.h"
 #include "xeen/combat.h"
 #include "xeen/debugger.h"
-#include "xeen/dialogs.h"
+#include "xeen/dialogs/dialogs.h"
 #include "xeen/events.h"
 #include "xeen/files.h"
 #include "xeen/interface.h"