diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h
index d88ce0484..6ab01846b 100644
--- a/es-core/src/components/primary/CarouselComponent.h
+++ b/es-core/src/components/primary/CarouselComponent.h
@@ -6,8 +6,8 @@
 //  Carousel, usable in both the system and gamelist views.
 //
 
-#ifndef ES_CORE_COMPONENTS_CAROUSEL_COMPONENT_H
-#define ES_CORE_COMPONENTS_CAROUSEL_COMPONENT_H
+#ifndef ES_CORE_COMPONENTS_PRIMARY_CAROUSEL_COMPONENT_H
+#define ES_CORE_COMPONENTS_PRIMARY_CAROUSEL_COMPONENT_H
 
 #include "Sound.h"
 #include "animations/LambdaAnimation.h"
@@ -1346,4 +1346,4 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
         mCursorChangedCallback(state);
 }
 
-#endif // ES_CORE_COMPONENTS_CAROUSEL_COMPONENT_H
+#endif // ES_CORE_COMPONENTS_PRIMARY_CAROUSEL_COMPONENT_H
diff --git a/es-core/src/components/primary/PrimaryComponent.h b/es-core/src/components/primary/PrimaryComponent.h
index 9df90c1dd..03ad7c7a9 100644
--- a/es-core/src/components/primary/PrimaryComponent.h
+++ b/es-core/src/components/primary/PrimaryComponent.h
@@ -6,8 +6,8 @@
 //  Base class for the primary components (carousel and textlist).
 //
 
-#ifndef ES_CORE_COMPONENTS_PRIMARY_COMPONENT_H
-#define ES_CORE_COMPONENTS_PRIMARY_COMPONENT_H
+#ifndef ES_CORE_COMPONENTS_PRIMARY_PRIMARY_COMPONENT_H
+#define ES_CORE_COMPONENTS_PRIMARY_PRIMARY_COMPONENT_H
 
 template <typename T> class PrimaryComponent : public virtual GuiComponent
 {
@@ -52,4 +52,4 @@ public:
     virtual void setAlignment(PrimaryAlignment align) {}
 };
 
-#endif // ES_CORE_COMPONENTS_PRIMARY_COMPONENT_H
+#endif // ES_CORE_COMPONENTS_PRIMARY_PRIMARY_COMPONENT_H
diff --git a/es-core/src/components/primary/TextListComponent.h b/es-core/src/components/primary/TextListComponent.h
index a658d1ed2..abebebd24 100644
--- a/es-core/src/components/primary/TextListComponent.h
+++ b/es-core/src/components/primary/TextListComponent.h
@@ -6,8 +6,8 @@
 //  Text list, usable in both the system and gamelist views.
 //
 
-#ifndef ES_CORE_COMPONENTS_TEXT_LIST_COMPONENT_H
-#define ES_CORE_COMPONENTS_TEXT_LIST_COMPONENT_H
+#ifndef ES_CORE_COMPONENTS_PRIMARY_TEXT_LIST_COMPONENT_H
+#define ES_CORE_COMPONENTS_PRIMARY_TEXT_LIST_COMPONENT_H
 
 #include "Log.h"
 #include "Sound.h"
@@ -723,4 +723,4 @@ template <typename T> void TextListComponent<T>::onCursorChanged(const CursorSta
         mCursorChangedCallback(state);
 }
 
-#endif // ES_CORE_COMPONENTS_TEXT_LIST_COMPONENT_H
+#endif // ES_CORE_COMPONENTS_PRIMARY_TEXT_LIST_COMPONENT_H