7 files changed, 24 insertions, 22 deletions
diff --git a/src/resources/atlasitem.h b/src/resources/atlas/atlasitem.h
index 59485f691..37c3b9a67 100644
--- a/src/resources/atlasitem.h
+++ b/src/resources/atlas/atlasitem.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_ATLASITEM_H
-#define RESOURCES_ATLASITEM_H
+#ifndef RESOURCES_ATLAS_ATLASITEM_H
+#define RESOURCES_ATLAS_ATLASITEM_H
 
 #ifdef USE_OPENGL
 
@@ -50,4 +50,4 @@ struct AtlasItem final
 };
 
 #endif  // USE_OPENGL
-#endif  // RESOURCES_ATLASITEM_H
+#endif  // RESOURCES_ATLAS_ATLASITEM_H
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index a3836ad46..a81a6c10d 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -20,7 +20,7 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/atlasmanager.h"
+#include "resources/atlas/atlasmanager.h"
 
 #include "settings.h"
 
@@ -33,14 +33,15 @@
 #include "utils/physfsrwops.h"
 #include "utils/sdlcheckutils.h"
 
-#include "resources/atlasitem.h"
-#include "resources/atlasresource.h"
 #include "resources/dye.h"
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 #include "resources/resourcemanager.h"
 #include "resources/sdlimagehelper.h"
-#include "resources/textureatlas.h"
+
+#include "resources/atlas/atlasitem.h"
+#include "resources/atlas/atlasresource.h"
+#include "resources/atlas/textureatlas.h"
 
 #include "debug.h"
 
diff --git a/src/resources/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index 83a5ad7de..b30981be6 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_ATLASMANAGER_H
-#define RESOURCES_ATLASMANAGER_H
+#ifndef RESOURCES_ATLAS_ATLASMANAGER_H
+#define RESOURCES_ATLAS_ATLASMANAGER_H
 
 #ifdef USE_OPENGL
 
@@ -67,4 +67,4 @@ class AtlasManager final
 };
 
 #endif  // USE_OPENGL
-#endif  // RESOURCES_ATLASMANAGER_H
+#endif  // RESOURCES_ATLAS_ATLASMANAGER_H
diff --git a/src/resources/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp
index 9f27446bd..8125131c6 100644
--- a/src/resources/atlasresource.cpp
+++ b/src/resources/atlas/atlasresource.cpp
@@ -20,12 +20,13 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/atlasresource.h"
+#include "resources/atlas/atlasresource.h"
 
-#include "resources/atlasitem.h"
-#include "resources/atlasmanager.h"
 #include "resources/resourcemanager.h"
-#include "resources/textureatlas.h"
+
+#include "resources/atlas/atlasitem.h"
+#include "resources/atlas/atlasmanager.h"
+#include "resources/atlas/textureatlas.h"
 
 #include "debug.h"
 
diff --git a/src/resources/atlasresource.h b/src/resources/atlas/atlasresource.h
index c819dd964..d0c9d6548 100644
--- a/src/resources/atlasresource.h
+++ b/src/resources/atlas/atlasresource.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_ATLASRESOURCE_H
-#define RESOURCES_ATLASRESOURCE_H
+#ifndef RESOURCES_ATLAS_ATLASRESOURCE_H
+#define RESOURCES_ATLAS_ATLASRESOURCE_H
 
 #ifdef USE_OPENGL
 
@@ -50,4 +50,4 @@ class AtlasResource final : public Resource
 };
 
 #endif  // USE_OPENGL
-#endif  // RESOURCES_ATLASRESOURCE_H
+#endif  // RESOURCES_ATLAS_ATLASRESOURCE_H
diff --git a/src/resources/textureatlas.h b/src/resources/atlas/textureatlas.h
index 89ec1bca5..1906d8bd6 100644
--- a/src/resources/textureatlas.h
+++ b/src/resources/atlas/textureatlas.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_TEXTUREATLAS_H
-#define RESOURCES_TEXTUREATLAS_H
+#ifndef RESOURCES_ATLAS_TEXTUREATLAS_H
+#define RESOURCES_ATLAS_TEXTUREATLAS_H
 
 #ifdef USE_OPENGL
 
@@ -58,4 +58,4 @@ struct TextureAtlas final
 };
 
 #endif  // USE_OPENGL
-#endif  // RESOURCES_TEXTUREATLAS_H
+#endif  // RESOURCES_ATLAS_TEXTUREATLAS_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 8d8e843df..cf16c77d6 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -29,8 +29,8 @@
 #include "resources/map/walklayer.h"
 
 #ifdef USE_OPENGL
-#include "resources/atlasmanager.h"
-#include "resources/atlasresource.h"
+#include "resources/atlas/atlasmanager.h"
+#include "resources/atlas/atlasresource.h"
 #endif
 #include "resources/dye.h"
 #include "resources/image.h"