fix guard header part3.

36 files changed, 112 insertions, 107 deletions

diff --git a/src/resources/action.h b/src/resources/action.h
index 281e95210..16f3d96d5 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTION_H
-#define ACTION_H
+#ifndef RESOURCES_ACTION_H
+#define RESOURCES_ACTION_H
 
 #include <map>
 
@@ -61,4 +61,4 @@ class Action final
         unsigned mNumber;
 };
 
-#endif
+#endif  // RESOURCES_ACTION_H
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index 9c07dcfc2..18bbfb69a 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_AMBIENTOVERLAY_H
-#define RESOURCES_AMBIENTOVERLAY_H
+#ifndef RESOURCES_AMBIENTLAYER_H
+#define RESOURCES_AMBIENTLAYER_H
 
 #include "localconsts.h"
 
@@ -62,4 +62,4 @@ class AmbientLayer final
         bool mKeepRatio;         /**< Keep overlay ratio on every resolution */
 };
 
-#endif
+#endif  // RESOURCES_AMBIENTLAYER_H
diff --git a/src/resources/animation.h b/src/resources/animation.h
index d0217cdc1..09738620c 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef RESOURCES_ANIMATION_H
+#define RESOURCES_ANIMATION_H
 
 #include <vector>
 #include <string>
@@ -109,4 +109,4 @@ class Animation final
         int mDuration;
 };
 
-#endif
+#endif  // RESOURCES_ANIMATION_H
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index caa9b57eb..ac53a1a54 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ATLASMANAGER_H
-#define ATLASMANAGER_H
+#ifndef RESOURCES_ATLASMANAGER_H
+#define RESOURCES_ATLASMANAGER_H
 
 #ifdef USE_OPENGL
 
@@ -123,5 +123,5 @@ class AtlasManager final
         static void convertAtlas(TextureAtlas *const atlas);
 };
 
-#endif
-#endif
+#endif  // USE_OPENGL
+#endif  // RESOURCES_ATLASMANAGER_H
diff --git a/src/resources/avatardb.h b/src/resources/avatardb.h
index 2a74d1c2e..e5af78ff7 100644
--- a/src/resources/avatardb.h
+++ b/src/resources/avatardb.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVATAR_DB_H
-#define AVATAR_DB_H
+#ifndef RESOURCES_AVATARDB_H
+#define RESOURCES_AVATARDB_H
 
 #include "localconsts.h"
 
@@ -36,4 +36,4 @@ namespace AvatarDB
     BeingInfo *get(const int id) A_WARN_UNUSED;
 }
 
-#endif
+#endif  // RESOURCES_AVATARDB_H
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 36c78f53b..e62dda149 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEINGINFO_H
-#define BEINGINFO_H
+#ifndef RESOURCES_BEINGINFO_H
+#define RESOURCES_BEINGINFO_H
 
 #include "actorsprite.h"
 
@@ -235,4 +235,4 @@ class BeingInfo final
 typedef std::map<int, BeingInfo*> BeingInfos;
 typedef BeingInfos::iterator BeingInfoIterator;
 
-#endif  // BEINGINFO_H
+#endif  // RESOURCES_BEINGINFO_H
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index 031ffe4e6..52f4cb8bc 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHARDB_MANAGER_H
-#define CHARDB_MANAGER_H
+#ifndef RESOURCES_CHARDB_H
+#define RESOURCES_CHARDB_H
 
 #include <map>
 #include <string>
@@ -64,4 +64,4 @@ namespace CharDB
     const std::vector<int> &getDefaultItems() A_WARN_UNUSED;
 }  // namespace CharDB
 
-#endif
+#endif  // RESOURCES_CHARDB_H
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 60da1c4f4..ad69799d9 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COLOR_MANAGER_H
-#define COLOR_MANAGER_H
+#ifndef RESOURCES_COLORDB_H
+#define RESOURCES_COLORDB_H
 
 #include <map>
 #include <string>
@@ -85,4 +85,4 @@ namespace ColorDB
     typedef ColorLists::iterator ColorListsIterator;
 }  // namespace ColorDB
 
-#endif
+#endif  // RESOURCES_COLORDB_H
diff --git a/src/resources/cursor.h b/src/resources/cursor.h
index aaaf2c758..1f597a821 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursor.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CURSOR_H
-#define CURSOR_H
+#ifndef RESOURCES_CURSOR_H
+#define RESOURCES_CURSOR_H
 
 #include <string>
 
@@ -59,4 +59,4 @@ namespace Cursor
     Cursor stringToCursor(const std::string &name) A_WARN_UNUSED;
 }  // namespace Cursor
 
-#endif
+#endif  // RESOURCES_CURSOR_H
diff --git a/src/resources/dye.h b/src/resources/dye.h
index efcf95420..95a4dbdae 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DYE_H
-#define DYE_H
+#ifndef RESOURCES_DYE_H
+#define RESOURCES_DYE_H
 
 #include "resources/dyecolor.h"
 
@@ -144,4 +144,4 @@ class Dye final
         DyePalette *mDyePalettes[dyePalateSize];
 };
 
-#endif
+#endif  // RESOURCES_DYE_H
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 77351a042..e9a6a5950 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DYECOLOR_H
-#define DYECOLOR_H
+#ifndef RESOURCES_DYECOLOR_H
+#define RESOURCES_DYECOLOR_H
 
 #include <SDL_stdinc.h>
 
@@ -52,4 +52,4 @@ struct DyeColor
     uint8_t value[4];
 };
 
-#endif
+#endif  // RESOURCES_DYECOLOR_H
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 939b3d667..b0b232653 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EMOTE_DB_H
-#define EMOTE_DB_H
+#ifndef RESOURCES_EMOTEDB_H
+#define RESOURCES_EMOTEDB_H
 
 #include "utils/stringvector.h"
 
@@ -84,4 +84,4 @@ namespace EmoteDB
     typedef EmoteInfos::iterator EmoteInfosIterator;
 }  // namespace EmoteDB
 
-#endif
+#endif  // RESOURCES_EMOTEDB_H
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index ead076fa8..20fef77e3 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FBOINFO_H
-#define FBOINFO_H
+#ifndef RESOURCES_FBOINFO_H
+#define RESOURCES_FBOINFO_H
 
 #include "main.h"
 #ifdef USE_OPENGL
@@ -48,5 +48,5 @@ struct FBOInfo final
     GLuint rboId;
 };
 
-#endif
-#endif
+#endif  // USE_OPENGL
+#endif  // RESOURCES_FBOINFO_H
diff --git a/src/resources/image.h b/src/resources/image.h
index fb99c2cdf..78eb07d7f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IMAGE_H
-#define IMAGE_H
+#ifndef RESOURCES_IMAGE_H
+#define RESOURCES_IMAGE_H
 
 #include "localconsts.h"
 #include "main.h"
@@ -220,4 +220,4 @@ class Image : public Resource
 #endif
 };
 
-#endif
+#endif  // RESOURCES_IMAGE_H
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index b55714787..cf01a3f1e 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IMAGEHELPER_H
-#define IMAGEHELPER_H
+#ifndef RESOURCES_IMAGEHELPER_H
+#define RESOURCES_IMAGEHELPER_H
 
 #include "localconsts.h"
 
@@ -106,4 +106,4 @@ class ImageHelper
 
 extern ImageHelper *imageHelper;
 extern ImageHelper *sdlImageHelper;
-#endif
+#endif  // RESOURCES_IMAGEHELPER_H
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 80ee84ba2..140232af0 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IMAGESET_H
-#define IMAGESET_H
+#ifndef RESOURCES_IMAGESET_H
+#define RESOURCES_IMAGESET_H
 
 #include "resources/resource.h"
 
@@ -90,4 +90,4 @@ class ImageSet : public Resource
         int mOffsetY;
 };
 
-#endif
+#endif  // RESOURCES_IMAGESET_H
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index b88e0aec9..c71f61ca3 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -20,6 +20,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef RESOURCES_IMAGEWRITER_H
+#define RESOURCES_IMAGEWRITER_H
+
 #include <iosfwd>
 
 #include <string>
@@ -34,3 +37,5 @@ class ImageWriter final
         static bool writePNG(SDL_Surface *const surface,
                              const std::string &filename);
 };
+
+#endif  // RESOURCES_IMAGEWRITER_H
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 44ab68f6d..6e23c7017 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEM_MANAGER_H
-#define ITEM_MANAGER_H
+#ifndef RESOURCES_ITEMDB_H
+#define RESOURCES_ITEMDB_H
 
 #include "utils/stringvector.h"
 
@@ -73,4 +73,4 @@ namespace ItemDB
     void setStatsList(const std::vector<Stat> &stats);
 }  // namespace ItemDB
 
-#endif
+#endif  // RESOURCES_ITEMDB_H
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c1c9f9d27..a3b606dc8 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEMINFO_H
-#define ITEMINFO_H
+#ifndef RESOURCES_ITEMINFO_H
+#define RESOURCES_ITEMINFO_H
 
 #include "being.h"
 
@@ -340,4 +340,4 @@ class ItemInfo final
         bool mProtected;
 };
 
-#endif
+#endif  // RESOURCES_ITEMINFO_H
diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h
index 9889c4dc8..9e0407f66 100644
--- a/src/resources/mapdb.h
+++ b/src/resources/mapdb.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPDB_H
-#define MAPDB_H
+#ifndef RESOURCES_MAPDB_H
+#define RESOURCES_MAPDB_H
 
 #include "utils/stringvector.h"
 
@@ -75,4 +75,4 @@ namespace MapDB
     typedef Atlases::const_iterator AtlasCIter;
 }  // namespace MapDB
 
-#endif
+#endif  // RESOURCES_MAPDB_H
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index fa7254b51..0dbc299d2 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPREADER_H
-#define MAPREADER_H
+#ifndef RESOURCES_MAPREADER_H
+#define RESOURCES_MAPREADER_H
 
 #include "utils/xml.h"
 
@@ -90,4 +90,4 @@ class MapReader final
         static void updateMusic(Map *const map);
 };
 
-#endif
+#endif  // RESOURCES_MAPREADER_H
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 20e885ce5..4d88320b5 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MONSTER_DB_H
-#define MONSTER_DB_H
+#ifndef RESOURCES_MONSTERDB_H
+#define RESOURCES_MONSTERDB_H
 
 #include "localconsts.h"
 
@@ -39,4 +39,4 @@ namespace MonsterDB
     BeingInfo *get(const int id) A_WARN_UNUSED;
 }
 
-#endif
+#endif  // RESOURCES_MONSTERDB_H
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 61641eaec..a01730ed8 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NPC_DB_H
-#define NPC_DB_H
+#ifndef RESOURCES_NPCDB_H
+#define RESOURCES_NPCDB_H
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ namespace NPCDB
     uint16_t getAvatarFor(const int id);
 }
 
-#endif
+#endif  // RESOURCES_NPCDB_H
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 5c144809a..e19c5e735 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPENGLIMAGEHELPER_H
-#define OPENGLIMAGEHELPER_H
+#ifndef RESOURCES_OPENGLIMAGEHELPER_H
+#define RESOURCES_OPENGLIMAGEHELPER_H
 
 #include "localconsts.h"
 #include "main.h"
@@ -147,4 +147,4 @@ class OpenGLImageHelper final : public ImageHelper
 };
 
 #endif
-#endif
+#endif  // RESOURCES_OPENGLIMAGEHELPER_H
diff --git a/src/resources/palettedb.h b/src/resources/palettedb.h
index 28b901799..307178693 100644
--- a/src/resources/palettedb.h
+++ b/src/resources/palettedb.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PALETTEDB_H
-#define PALETTEDB_H
+#ifndef RESOURCES_PALETTEDB_H
+#define RESOURCES_PALETTEDB_H
 
 #include "localconsts.h"
 
@@ -36,4 +36,4 @@ namespace PaletteDB
 
 }  // namespace PaletteDB
 
-#endif
+#endif  // RESOURCES_PALETTEDB_H
diff --git a/src/resources/petdb.h b/src/resources/petdb.h
index 755937902..4c43f1869 100644
--- a/src/resources/petdb.h
+++ b/src/resources/petdb.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PET_DB_H
-#define PET_DB_H
+#ifndef RESOURCES_PETDB_H
+#define RESOURCES_PETDB_H
 
 #include <stdint.h>
 
@@ -38,4 +38,4 @@ namespace PETDB
     BeingInfo *get(const int id) A_WARN_UNUSED;
 }
 
-#endif
+#endif  // RESOURCES_PETDB_H
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 884e58dc6..4c1eef90a 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef RESOURCES_RESOURCE_H
+#define RESOURCES_RESOURCE_H
 
 #include "main.h"
 
@@ -121,4 +121,4 @@ class Resource
 #endif
 };
 
-#endif
+#endif  // RESOURCES_RESOURCE_H
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index d56406bec..0c40dc1b7 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCE_MANAGER_H
-#define RESOURCE_MANAGER_H
+#ifndef RESOURCES_RESOURCEMANAGER_H
+#define RESOURCES_RESOURCEMANAGER_H
 
 #include "main.h"
 
@@ -353,4 +353,4 @@ class ResourceManager final
         static DelayedAnim mDelayedAnimations;
 };
 
-#endif
+#endif  // RESOURCES_RESOURCEMANAGER_H
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 8a538ca3c..291345164 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SDLIMAGEHELPER_H
-#define SDLIMAGEHELPER_H
+#ifndef RESOURCES_SDLIMAGEHELPER_H
+#define RESOURCES_SDLIMAGEHELPER_H
 
 #include "localconsts.h"
 
@@ -94,4 +94,4 @@ class SDLImageHelper final : public ImageHelper
         static bool mEnableAlphaCache;
 };
 
-#endif
+#endif  // RESOURCES_SDLIMAGEHELPER_H
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 8d2b24044..05a5528b7 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SDLMUSIC_H
-#define SDLMUSIC_H
+#ifndef RESOURCES_SDLMUSIC_H
+#define RESOURCES_SDLMUSIC_H
 
 #include "resources/resource.h"
 
@@ -78,4 +78,4 @@ class SDLMusic final : public Resource
         Mix_Music *mMusic;
 };
 
-#endif
+#endif  // RESOURCES_SDLMUSIC_H
diff --git a/src/resources/sounddb.h b/src/resources/sounddb.h
index 560cdb4be..864d23fb9 100644
--- a/src/resources/sounddb.h
+++ b/src/resources/sounddb.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SOUNDDB_H
-#define SOUNDDB_H
+#ifndef RESOURCES_SOUNDDB_H
+#define RESOURCES_SOUNDDB_H
 
 #include <map>
 #include <string>
@@ -35,4 +35,4 @@ namespace SoundDB
     std::string &getSound(const int id);
 }
 
-#endif
+#endif  // RESOURCES_SOUNDDB_H
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 33a406128..3b6724820 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SOUND_EFFECT_H
-#define SOUND_EFFECT_H
+#ifndef RESOURCES_SOUNDEFFECT_H
+#define RESOURCES_SOUNDEFFECT_H
 
 #include "resources/resource.h"
 
@@ -77,4 +77,4 @@ class SoundEffect final : public Resource
         Mix_Chunk *mChunk;
 };
 
-#endif  // SOUND_EFFECT_H
+#endif  // RESOURCES_SOUNDEFFECT_H
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index f60892e1c..30fe8675d 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SOUNDINFO_H
-#define SOUNDINFO_H
+#ifndef RESOURCES_SOUNDINFO_H
+#define RESOURCES_SOUNDINFO_H
 
 #include <string>
 #include <vector>
@@ -40,4 +40,4 @@ struct SoundInfo final
 
 typedef std::vector<SoundInfo> SoundInfoVect;
 
-#endif
+#endif  // RESOURCES_SOUNDINFO_H
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 2da538baf..2a01bb9d7 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPRITEDEF_H
-#define SPRITEDEF_H
+#ifndef RESOURCES_SPRITEDEF_H
+#define RESOURCES_SPRITEDEF_H
 
 #include "resources/resource.h"
 
@@ -226,4 +226,4 @@ class SpriteDef final : public Resource
         std::set<std::string> mProcessedFiles;
 };
 
-#endif  // SPRITEDEF_H
+#endif  // RESOURCES_SPRITEDEF_H
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index c3bb1482e..8dae594f6 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SUBIMAGE_H
-#define SUBIMAGE_H
+#ifndef RESOURCES_SUBIMAGE_H
+#define RESOURCES_SUBIMAGE_H
 
 #include "localconsts.h"
 #include "main.h"
@@ -81,4 +81,4 @@ class SubImage final : public Image
         Image *mParent;
 };
 
-#endif
+#endif  // RESOURCES_SUBIMAGE_H
diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h
index cb3078b14..98cf58ae1 100644
--- a/src/resources/wallpaper.h
+++ b/src/resources/wallpaper.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WALLPAPER_H
-#define WALLPAPER_H
+#ifndef RESOURCES_WALLPAPER_H
+#define RESOURCES_WALLPAPER_H
 
 #include <string>
 
@@ -51,4 +51,4 @@ class Wallpaper final
                                         const int height) A_WARN_UNUSED;
 };
 
-#endif  // WALLPAPER_H
+#endif  // RESOURCES_WALLPAPER_H