11 files changed, 24 insertions, 24 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 133abff3b9..d3006a719e 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -34,8 +34,8 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/message.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/music.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/music.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp
index c7dc629d8f..6350ac1565 100644
--- a/engines/sci/engine/kernel32.cpp
+++ b/engines/sci/engine/kernel32.cpp
@@ -28,7 +28,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/segment.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 4619f29f40..8d04bc7354 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -29,8 +29,8 @@
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
 #include "sci/event.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index ff3783db79..3021aa6f5b 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -33,11 +33,11 @@
 #include "sci/video/seq_decoder.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index b3ed6d03e0..d426b9f8a1 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -27,8 +27,8 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 76253ee516..4327957ebb 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -31,7 +31,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/gc.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 3702035c2d..da667037c6 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -27,7 +27,7 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui_animate.h"
+#include "sci/graphics/gui_animate.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 6771e95902..dd446a2737 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -26,7 +26,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 #include "common/list.h"
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index d70b23c13f..3881e234ba 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -25,7 +25,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
 
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index cd8b738bde..fcdfe8f7e6 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -36,13 +36,13 @@
 #include "sci/engine/message.h"
 #include "sci/engine/savegame.h"
 #include "sci/engine/vm_types.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/audio.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
 #else
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #endif
 
 namespace Sci {
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 61f3aa68f2..da5ccdf73e 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -41,11 +41,11 @@ namespace Common {
 #include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
 #include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"
-#include "sci/sfx/audio.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
+#include "sci/sound/iterator/core.h"
 #endif
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 
 namespace Sci {