8 files changed, 33 insertions, 25 deletions
diff --git a/src/libjin/Audio/SDL/SDLAudio.cpp b/src/libjin/Audio/SDL/je_sdl_audio.cpp
index 96bb304..0cc8380 100644
--- a/src/libjin/Audio/SDL/SDLAudio.cpp
+++ b/src/libjin/Audio/SDL/je_sdl_audio.cpp
@@ -1,11 +1,13 @@
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <iostream>
-#include "SDLAudio.h"
-#include "SDLSource.h"
-#include "../../math/math.h"
-#include "../../utils/log.h"
+
+#include "../../math/je_math.h"
+#include "../../utils/je_log.h"
+
+#include "je_sdl_audio.h"
+#include "je_sdl_source.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/SDL/SDLAudio.h b/src/libjin/Audio/SDL/je_sdl_audio.h
index 1a29595..c64b109 100644
--- a/src/libjin/Audio/SDL/SDLAudio.h
+++ b/src/libjin/Audio/SDL/je_sdl_audio.h
@@ -1,11 +1,13 @@
 #ifndef __LIBJIN_AUDIO_SDL_H
 #define __LIBJIN_AUDIO_SDL_H
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
-#include "SDLSource.h"
 #include <vector>
-#include "../audio.h"
+
+#include "../je_audio.h"
+
+#include "je_sdl_source.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/SDL/SDLSource.cpp b/src/libjin/Audio/SDL/je_sdl_source.cpp
index 34fc0f5..5fbce49 100644
--- a/src/libjin/Audio/SDL/SDLSource.cpp
+++ b/src/libjin/Audio/SDL/je_sdl_source.cpp
@@ -1,16 +1,18 @@
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <exception>
 #include <fstream>
 #include <climits>
-#include "../../math/math.h"
-#include "../../utils/macros.h"
-#include "SDLSource.h"
-#include "../../3rdparty/wav/wav.h"
+
 #define STB_VORBIS_HEADER_ONLY
 #include "../../3rdparty/stb/stb_vorbis.c"
-#include "SDLAudio.h"
+#include "../../math/je_math.h"
+#include "../../utils/je_macros.h"
+#include "../../3rdparty/wav/wav.h"
+
+#include "je_sdl_audio.h"
+#include "je_sdl_source.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/SDL/SDLSource.h b/src/libjin/Audio/SDL/je_sdl_source.h
index 4977ec8..15676d6 100644
--- a/src/libjin/Audio/SDL/SDLSource.h
+++ b/src/libjin/Audio/SDL/je_sdl_source.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_SOURCE_SDL_H
 #define __LIBJIN_SOURCE_SDL_H
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <vector>
@@ -8,7 +8,7 @@
 #include <stack>
 #include <exception>
 
-#include "../source.h"
+#include "../je_source.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/Audio.cpp b/src/libjin/Audio/je_audio.cpp
index 928f01a..81201b7 100644
--- a/src/libjin/Audio/Audio.cpp
+++ b/src/libjin/Audio/je_audio.cpp
@@ -1,8 +1,8 @@
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
-#include "audio.h"
+#include "je_audio.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/Audio.h b/src/libjin/Audio/je_audio.h
index fd391aa..341e4c9 100644
--- a/src/libjin/Audio/Audio.h
+++ b/src/libjin/Audio/je_audio.h
@@ -1,12 +1,13 @@
 #ifndef __LIBJIN_AUDIO_H
 #define __LIBJIN_AUDIO_H
-#include "../configuration.h"
+
+#include "../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
-#include "SDL2/SDL.h"
+#include "../utils/je_macros.h"
+#include "../common/je_subsystem.hpp"
 
-#include "../utils/macros.h"
-#include "../common/Subsystem.hpp"
+#include "SDL2/SDL.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/Source.cpp b/src/libjin/Audio/je_source.cpp
index 646e5ef..e20cd69 100644
--- a/src/libjin/Audio/Source.cpp
+++ b/src/libjin/Audio/je_source.cpp
@@ -1,8 +1,9 @@
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include <cstring>
-#include "source.h"
+
+#include "je_source.h"
 
 namespace jin
 {
diff --git a/src/libjin/Audio/Source.h b/src/libjin/Audio/je_source.h
index 6dfc86c..bcac214 100644
--- a/src/libjin/Audio/Source.h
+++ b/src/libjin/Audio/je_source.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_SOURCE_H
 #define __LIBJIN_AUDIO_SOURCE_H
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"