diff --git a/include/FileRevealer.h b/include/FileRevealer.h
index 99b04916c..46c52cd8c 100644
--- a/include/FileRevealer.h
+++ b/include/FileRevealer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LMMS_FILE_REVEALER_H
-#define LMMS_FILE_REVEALER_H
+#ifndef LMMS_GUI_FILE_REVEALER_H
+#define LMMS_GUI_FILE_REVEALER_H
 
 #include <QFileInfo>
 
@@ -74,4 +74,5 @@ protected:
 };
 
 } // namespace lmms::gui
-#endif // LMMS_FILE_REVEALER_H
+
+#endif // LMMS_GUI_FILE_REVEALER_H
diff --git a/include/FontHelper.h b/include/FontHelper.h
index ccef24775..c1c0ee665 100644
--- a/include/FontHelper.h
+++ b/include/FontHelper.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LMMS_FONT_HELPER_H
-#define LMMS_FONT_HELPER_H
+#ifndef LMMS_GUI_FONT_HELPER_H
+#define LMMS_GUI_FONT_HELPER_H
 
 #include <QApplication>
 #include <QFont>
@@ -44,4 +44,4 @@ inline QFont adjustedToPixelSize(QFont font, int size)
 
 } // namespace lmms::gui
 
-#endif // LMMS_FONT_HELPER_H
+#endif // LMMS_GUI_FONT_HELPER_H
diff --git a/include/SimpleTextFloat.h b/include/SimpleTextFloat.h
index bde6c84fa..e930d2430 100644
--- a/include/SimpleTextFloat.h
+++ b/include/SimpleTextFloat.h
@@ -23,8 +23,8 @@
 */
 
 
-#ifndef SIMPLE_TEXT_FLOAT_H
-#define SIMPLE_TEXT_FLOAT_H
+#ifndef LMMS_GUI_SIMPLE_TEXT_FLOAT_H
+#define LMMS_GUI_SIMPLE_TEXT_FLOAT_H
 
 #include <QWidget>
 
@@ -64,4 +64,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SIMPLE_TEXT_FLOAT_H