diff --git a/src/client/sound/sound_manager.h b/src/client/sound/sound_manager.h index b72d93d108..794991613d 100644 --- a/src/client/sound/sound_manager.h +++ b/src/client/sound/sound_manager.h @@ -12,7 +12,7 @@ #include "al_extensions.h" #include "sound_constants.h" #include "sound_manager_messages.h" -#include "../sound.h" +#include "sound_spec.h" #include "threading/thread.h" #include "util/container.h" // MutexedQueue diff --git a/src/client/sound/sound_manager_messages.h b/src/client/sound/sound_manager_messages.h index 2d3d73cd24..ee18600e40 100644 --- a/src/client/sound/sound_manager_messages.h +++ b/src/client/sound/sound_manager_messages.h @@ -4,8 +4,8 @@ #pragma once -#include "../sound.h" -#include "../../sound.h" +#include "client/sound.h" +#include "sound_spec.h" #include namespace sound { diff --git a/src/client/sound_maker.h b/src/client/sound_maker.h index 5b156d7ddc..cdf0f32c6a 100644 --- a/src/client/sound_maker.h +++ b/src/client/sound_maker.h @@ -4,7 +4,7 @@ #pragma once -#include "../sound.h" +#include "sound_spec.h" class ISoundManager; class NodeDefManager; diff --git a/src/itemdef.h b/src/itemdef.h index 76e5c16423..cd3fc7a88e 100644 --- a/src/itemdef.h +++ b/src/itemdef.h @@ -11,7 +11,7 @@ #include #include #include "itemgroup.h" -#include "sound.h" +#include "sound_spec.h" #include "texture_override.h" // TextureOverride #include "tool.h" #include "util/pointabilities.h" diff --git a/src/nodedef.h b/src/nodedef.h index 01e6e92534..9c8a41f8f1 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -11,7 +11,7 @@ #include "mapnode.h" #include "nameidmapping.h" #include "itemgroup.h" -#include "sound.h" // SoundSpec +#include "sound_spec.h" #include "texture_override.h" // TextureOverride #include "tileanimation.h" #include "util/pointabilities.h" diff --git a/src/script/lua_api/l_client_sound.cpp b/src/script/lua_api/l_client_sound.cpp index b9b07674b3..ab2f8dc557 100644 --- a/src/script/lua_api/l_client_sound.cpp +++ b/src/script/lua_api/l_client_sound.cpp @@ -10,7 +10,7 @@ #include "common/c_converter.h" #include "client/client.h" #include "client/sound.h" -#include "sound.h" +#include "sound_spec.h" /* ModApiClientSound */ diff --git a/src/script/lua_api/l_mainmenu_sound.cpp b/src/script/lua_api/l_mainmenu_sound.cpp index 7cba2bd66c..4bb6e291ae 100644 --- a/src/script/lua_api/l_mainmenu_sound.cpp +++ b/src/script/lua_api/l_mainmenu_sound.cpp @@ -8,7 +8,7 @@ #include "l_internal.h" #include "common/c_content.h" #include "gui/guiEngine.h" -#include "sound.h" +#include "sound_spec.h" /* ModApiMainMenuSound */ diff --git a/src/server.h b/src/server.h index 25673329d5..ed1f1f3458 100644 --- a/src/server.h +++ b/src/server.h @@ -16,7 +16,7 @@ #include "server/clientiface.h" #include "threading/ordered_mutex.h" #include "translation.h" -#include "sound.h" +#include "sound_spec.h" #include #include #include diff --git a/src/sound.h b/src/sound_spec.h similarity index 100% rename from src/sound.h rename to src/sound_spec.h