13 files changed, 25 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5af3ac562..b53730766 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1111,7 +1111,7 @@ SET(SRCS
     shortcutbase.h
     simpleanimation.cpp
     simpleanimation.h
-    soundconsts.h
+    const/sound.h
     soundmanager.cpp
     soundmanager.h
     sprite.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a27ace903..0ff411f1d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -634,7 +634,7 @@ SRC += events/actionevent.h \
 	      simpleanimation.cpp \
 	      simpleanimation.h \
 	      sprite.h \
-	      soundconsts.h \
+	      const/sound.h \
 	      soundmanager.cpp \
 	      soundmanager.h \
 	      text.cpp \
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index d20c7b7e0..37e5abdc8 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -30,16 +30,16 @@
 #include "item.h"
 #include "party.h"
 #include "settings.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
-#include "resources/map/walklayer.h"
 
 #include "being/beingflag.h"
 #include "being/crazymoves.h"
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
+#include "const/sound.h"
+
 #include "enums/being/beingdirection.h"
 
 #include "enums/resources/map/mapitemtype.h"
@@ -78,6 +78,7 @@
 #include "resources/map/map.h"
 #include "resources/map/mapitem.h"
 #include "resources/map/speciallayer.h"
+#include "resources/map/walklayer.h"
 
 #include "listeners/awaylistener.h"
 
diff --git a/src/soundconsts.h b/src/const/sound.h
index a3dada2cb..f4cd9e351 100644
--- a/src/soundconsts.h
+++ b/src/const/sound.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SOUNDCONSTS_H
-#define SOUNDCONSTS_H
+#ifndef CONST_SOUND_H
+#define CONST_SOUND_H
 
 #include <string>
 
@@ -34,4 +34,4 @@ static const std::string SOUND_GUILD = "soundguild";
 static const std::string SOUND_SHOW_WINDOW = "soundshowwindow";
 static const std::string SOUND_HIDE_WINDOW = "soundhidewindow";
 
-#endif  // SOUNDCONSTS_H
+#endif  // CONST_SOUND_H
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 0eb4200ad..e15cd0261 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -25,11 +25,12 @@
 #include "chatlogger.h"
 #include "configuration.h"
 #include "settings.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "being/localplayer.h"
 
+#include "const/sound.h"
+
 #include "gui/chatlog.h"
 #include "gui/windowmanager.h"
 
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index e4d0d8dd1..b9c05719b 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -23,9 +23,10 @@
 #include "gui/widgets/tabs/chat/emulateguildtab.h"
 
 #include "configuration.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "gui/windows/chatwindow.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp
index 4d4d7d1d2..caff1cec7 100644
--- a/src/gui/widgets/tabs/chat/guildtab.cpp
+++ b/src/gui/widgets/tabs/chat/guildtab.cpp
@@ -23,9 +23,10 @@
 #include "gui/widgets/tabs/chat/guildtab.h"
 
 #include "configuration.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "net/guildhandler.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/tabs/chat/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index cb458f1fe..711a4e115 100644
--- a/src/gui/widgets/tabs/chat/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -24,11 +24,12 @@
 
 #include "configuration.h"
 #include "party.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "being/localplayer.h"
 
+#include "const/sound.h"
+
 #include "net/partyhandler.h"
 #include "net/serverfeatures.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 471b273be..6223a3d33 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -73,9 +73,10 @@
 #include "resources/image.h"
 #endif
 #include "graphicsvertexes.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "gui/focushandler.h"
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 91132b641..47f1c07f4 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -25,7 +25,7 @@
 
 #include "localconsts.h"
 
-#include "soundconsts.h"
+#include "const/sound.h"
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 4f716f32d..9cdf6a3b0 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -26,9 +26,10 @@
 #include "configuration.h"
 #include "item.h"
 #include "settings.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "being/being.h"
 #include "being/playerinfo.h"
 
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index 25a440b85..88b456a15 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/windows/okdialog.h"
 
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 1d6290152..cd6e4b14b 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "const/sound.h"
+
 #include "gui/dialogsmanager.h"
 #include "gui/viewport.h"