diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 2e934ba29..2c64f62d2 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -2,8 +2,8 @@ set(sound_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/sound.cpp)
 
 if(USE_SOUND)
 	set(sound_SRCS ${sound_SRCS}
-		${CMAKE_CURRENT_SOURCE_DIR}/sound_openal.cpp
-		${CMAKE_CURRENT_SOURCE_DIR}/sound_openal_internal.cpp)
+		${CMAKE_CURRENT_SOURCE_DIR}/sound/sound_openal.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/sound/sound_openal_internal.cpp)
 	set(SOUND_INCLUDE_DIRS
 		${OPENAL_INCLUDE_DIR}
 		${VORBIS_INCLUDE_DIR}
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 55e5b0b59..d8384bfcb 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "network/networkexceptions.h"
 
 #if USE_SOUND
-	#include "sound_openal.h"
+	#include "sound/sound_openal.h"
 #endif
 
 /* mainmenumanager.h
diff --git a/src/client/game.cpp b/src/client/game.cpp
index f0192a918..b28cb7060 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/keys.h"
 #include "client/joystick_controller.h"
 #include "client/mapblock_mesh.h"
+#include "client/sound.h"
 #include "clientmap.h"
 #include "clouds.h"
 #include "config.h"
@@ -75,10 +76,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientdynamicinfo.h"
 
 #if USE_SOUND
-	#include "client/sound_openal.h"
-#else
-	#include "client/sound.h"
+	#include "client/sound/sound_openal.h"
 #endif
+
 /*
 	Text input system
 */
diff --git a/src/client/sound_openal.cpp b/src/client/sound/sound_openal.cpp
similarity index 100%
rename from src/client/sound_openal.cpp
rename to src/client/sound/sound_openal.cpp
diff --git a/src/client/sound_openal.h b/src/client/sound/sound_openal.h
similarity index 97%
rename from src/client/sound_openal.h
rename to src/client/sound/sound_openal.h
index 50762331b..431919ac6 100644
--- a/src/client/sound_openal.h
+++ b/src/client/sound/sound_openal.h
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include "sound.h"
+#include "client/sound.h"
 
 #include <memory>
 
diff --git a/src/client/sound_openal_internal.cpp b/src/client/sound/sound_openal_internal.cpp
similarity index 100%
rename from src/client/sound_openal_internal.cpp
rename to src/client/sound/sound_openal_internal.cpp
diff --git a/src/client/sound_openal_internal.h b/src/client/sound/sound_openal_internal.h
similarity index 99%
rename from src/client/sound_openal_internal.h
rename to src/client/sound/sound_openal_internal.h
index 65e9622f2..19ba411ef 100644
--- a/src/client/sound_openal_internal.h
+++ b/src/client/sound/sound_openal_internal.h
@@ -27,7 +27,7 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "porting.h"
 #include "sound_openal.h"
-#include "../sound.h"
+#include "../../sound.h"
 #include "threading/thread.h"
 #include "util/basic_macros.h"
 #include "util/container.h"
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index b33974b7f..8e75fa77e 100644
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "guiMainMenu.h"
 #include "sound.h"
-#include "client/sound_openal.h"
 #include "httpfetch.h"
 #include "log.h"
 #include "client/fontengine.h"
@@ -39,6 +38,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlicht_changes/static_text.h"
 #include "client/tile.h"
 
+#if USE_SOUND
+	#include "client/sound/sound_openal.h"
+#endif
+
 
 /******************************************************************************/
 void TextDestGuiEngine::gotText(const StringMap &fields)