diff --git a/include/AboutDialog.h b/include/AboutDialog.h
index c7d65023fe2..2fd01faf5e5 100644
--- a/include/AboutDialog.h
+++ b/include/AboutDialog.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef ABOUT_DIALOG_H
-#define ABOUT_DIALOG_H
+#ifndef LMMS_GUI_ABOUT_DIALOG_H
+#define LMMS_GUI_ABOUT_DIALOG_H
 
 #include <QDialog>
 
@@ -42,5 +41,4 @@ class AboutDialog : public QDialog, public Ui::AboutDialog
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_ABOUT_DIALOG_H
diff --git a/include/ActionGroup.h b/include/ActionGroup.h
index 0fe9d78ed41..e18f6fb2370 100644
--- a/include/ActionGroup.h
+++ b/include/ActionGroup.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef ACTION_GROUP_H
-#define ACTION_GROUP_H
+#ifndef LMMS_GUI_ACTION_GROUP_H
+#define LMMS_GUI_ACTION_GROUP_H
 
 #include <QActionGroup>
 
@@ -59,4 +58,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_ACTION_GROUP_H
diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
index f96dd01c9b7..9755320718f 100644
--- a/include/AudioAlsa.h
+++ b/include/AudioAlsa.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_ALSA_H
-#define AUDIO_ALSA_H
+#ifndef LMMS_AUDIO_ALSA_H
+#define LMMS_AUDIO_ALSA_H
 
 #include "lmmsconfig.h"
 
@@ -108,4 +108,4 @@ class AudioAlsa : public QThread, public AudioDevice
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_AUDIO_ALSA_H
diff --git a/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h
index f68d71e8a8b..cbe99ba0148 100644
--- a/include/AudioAlsaSetupWidget.h
+++ b/include/AudioAlsaSetupWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_ALSA_SETUP_WIDGET_H
-#define AUDIO_ALSA_SETUP_WIDGET_H
+#ifndef LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H
+#define LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H
 
 #include "lmmsconfig.h"
 
@@ -66,4 +66,4 @@ public slots:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H
diff --git a/include/AudioDevice.h b/include/AudioDevice.h
index 6b4e9939aee..d1a9617cd39 100644
--- a/include/AudioDevice.h
+++ b/include/AudioDevice.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_DEVICE_H
-#define AUDIO_DEVICE_H
+#ifndef LMMS_AUDIO_DEVICE_H
+#define LMMS_AUDIO_DEVICE_H
 
 #include <QMutex>
 #include <samplerate.h>
@@ -160,4 +160,4 @@ class AudioDevice
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_DEVICE_H
diff --git a/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h
index e984651e415..f56fa07a6ee 100644
--- a/include/AudioDeviceSetupWidget.h
+++ b/include/AudioDeviceSetupWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_DEVICE_SETUP_WIDGET_H
-#define AUDIO_DEVICE_SETUP_WIDGET_H
+#ifndef LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H
+#define LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H
 
 #include "TabWidget.h"
 
@@ -45,4 +45,4 @@ class AudioDeviceSetupWidget : public TabWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H
diff --git a/include/AudioDummy.h b/include/AudioDummy.h
index 30b125b3a0d..e342601717d 100644
--- a/include/AudioDummy.h
+++ b/include/AudioDummy.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_DUMMY_H
-#define AUDIO_DUMMY_H
+#ifndef LMMS_AUDIO_DUMMY_H
+#define LMMS_AUDIO_DUMMY_H
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
@@ -116,4 +116,4 @@ class AudioDummy : public QThread, public AudioDevice
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_DUMMY_H
diff --git a/include/AudioEngine.h b/include/AudioEngine.h
index 71751acb8e9..d0f269d8797 100644
--- a/include/AudioEngine.h
+++ b/include/AudioEngine.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_ENGINE_H
-#define AUDIO_ENGINE_H
+#ifndef LMMS_AUDIO_ENGINE_H
+#define LMMS_AUDIO_ENGINE_H
 
 #include <QMutex>
 
@@ -487,4 +487,4 @@ class LMMS_EXPORT AudioEngine : public QObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_H
diff --git a/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h
index 38631c6a9d1..7b5191e76b4 100644
--- a/include/AudioEngineProfiler.h
+++ b/include/AudioEngineProfiler.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_ENGINE_PROFILER_H
-#define AUDIO_ENGINE_PROFILER_H
+#ifndef LMMS_AUDIO_ENGINE_PROFILER_H
+#define LMMS_AUDIO_ENGINE_PROFILER_H
 
 #include <QFile>
 
@@ -62,4 +62,4 @@ class AudioEngineProfiler
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_PROFILER_H
diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h
index 87e2791b1f3..1129308086a 100644
--- a/include/AudioEngineWorkerThread.h
+++ b/include/AudioEngineWorkerThread.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_ENGINE_WORKER_THREAD_H
-#define AUDIO_ENGINE_WORKER_THREAD_H
+#ifndef LMMS_AUDIO_ENGINE_WORKER_THREAD_H
+#define LMMS_AUDIO_ENGINE_WORKER_THREAD_H
 
 #include <QThread>
 
@@ -121,4 +121,4 @@ class AudioEngineWorkerThread : public QThread
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_WORKER_THREAD_H
diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
index beee087e7ba..dc9a786a4a8 100644
--- a/include/AudioFileDevice.h
+++ b/include/AudioFileDevice.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUDIO_FILE_DEVICE_H
-#define AUDIO_FILE_DEVICE_H
+#ifndef LMMS_AUDIO_FILE_DEVICE_H
+#define LMMS_AUDIO_FILE_DEVICE_H
 
 #include <QFile>
 
@@ -73,4 +73,4 @@ using AudioFileDeviceInstantiaton
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_FILE_DEVICE_H
diff --git a/include/AudioFileFlac.h b/include/AudioFileFlac.h
index 542a2e717d9..944e30478c4 100644
--- a/include/AudioFileFlac.h
+++ b/include/AudioFileFlac.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_FILE_FLAC_H
-#define AUDIO_FILE_FLAC_H
+#ifndef LMMS_AUDIO_FILE_FLAC_H
+#define LMMS_AUDIO_FILE_FLAC_H
 
 #include "lmmsconfig.h"
 
@@ -33,7 +33,7 @@
 namespace lmms
 {
 
-class AudioFileFlac: public AudioFileDevice
+class AudioFileFlac : public AudioFileDevice
 {
 public:
 	AudioFileFlac(OutputSettings const& outputSettings,
@@ -77,4 +77,4 @@ class AudioFileFlac: public AudioFileDevice
 
 } // namespace lmms
 
-#endif //AUDIO_FILE_FLAC_H
+#endif // LMMS_AUDIO_FILE_FLAC_H
diff --git a/include/AudioFileMP3.h b/include/AudioFileMP3.h
index 290c9ccbfc8..4289ad211e6 100644
--- a/include/AudioFileMP3.h
+++ b/include/AudioFileMP3.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUDIO_FILE_MP3_H
-#define AUDIO_FILE_MP3_H
+#ifndef LMMS_AUDIO_FILE_MP3_H
+#define LMMS_AUDIO_FILE_MP3_H
 
 #include "lmmsconfig.h"
 
@@ -75,4 +75,4 @@ class AudioFileMP3 : public AudioFileDevice
 
 #endif // LMMS_HAVE_MP3LAME
 
-#endif
+#endif // LMMS_AUDIO_FILE_MP3_H
diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h
index 18617fa5f2e..77be8ca1c1e 100644
--- a/include/AudioFileOgg.h
+++ b/include/AudioFileOgg.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUDIO_FILE_OGG_H
-#define AUDIO_FILE_OGG_H
+#ifndef LMMS_AUDIO_FILE_OGG_H
+#define LMMS_AUDIO_FILE_OGG_H
 
 #include "lmmsconfig.h"
 
@@ -113,4 +113,4 @@ class AudioFileOgg : public AudioFileDevice
 
 #endif // LMMS_HAVE_OGGVORBIS
 
-#endif
+#endif // LMMS_AUDIO_FILE_OGG_H
diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h
index 8dd3566f4de..c186aaaa705 100644
--- a/include/AudioFileWave.h
+++ b/include/AudioFileWave.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUDIO_FILE_WAVE_H
-#define AUDIO_FILE_WAVE_H
+#ifndef LMMS_AUDIO_FILE_WAVE_H
+#define LMMS_AUDIO_FILE_WAVE_H
 
 #include "lmmsconfig.h"
 #include "AudioFileDevice.h"
@@ -71,4 +71,4 @@ class AudioFileWave : public AudioFileDevice
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_FILE_WAVE_H
diff --git a/include/AudioJack.h b/include/AudioJack.h
index 26339948789..2ef0f665cbe 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_JACK_H
-#define AUDIO_JACK_H
+#ifndef LMMS_AUDIO_JACK_H
+#define LMMS_AUDIO_JACK_H
 
 #include "lmmsconfig.h"
 
@@ -144,4 +144,4 @@ private slots:
 
 #endif // LMMS_HAVE_JACK
 
-#endif
+#endif // LMMS_AUDIO_JACK_H
diff --git a/include/AudioOss.h b/include/AudioOss.h
index 71103586a5f..55f64de851e 100644
--- a/include/AudioOss.h
+++ b/include/AudioOss.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_OSS_H
-#define AUDIO_OSS_H
+#ifndef LMMS_AUDIO_OSS_H
+#define LMMS_AUDIO_OSS_H
 
 #include "lmmsconfig.h"
 
@@ -92,4 +92,4 @@ class setupWidget : public gui::AudioDeviceSetupWidget
 
 #endif // LMMS_HAVE_OSS
 
-#endif
+#endif // LMMS_AUDIO_OSS_H
diff --git a/include/AudioPort.h b/include/AudioPort.h
index 5a2645784da..d9803d205e8 100644
--- a/include/AudioPort.h
+++ b/include/AudioPort.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_PORT_H
-#define AUDIO_PORT_H
+#ifndef LMMS_AUDIO_PORT_H
+#define LMMS_AUDIO_PORT_H
 
 #include <memory>
 #include <QString>
@@ -138,4 +138,4 @@ class AudioPort : public ThreadableJob
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_PORT_H
diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index 3fd32a7acbc..01b8f3fd7e8 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_PORTAUDIO_H
-#define AUDIO_PORTAUDIO_H
+#ifndef LMMS_AUDIO_PORTAUDIO_H
+#define LMMS_AUDIO_PORTAUDIO_H
 
 #include <QObject>
 
@@ -163,4 +163,4 @@ class AudioPortAudio : public AudioDevice
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_PORTAUDIO_H
diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h
index 789296e275e..b6a99827479 100644
--- a/include/AudioPulseAudio.h
+++ b/include/AudioPulseAudio.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_PULSEAUDIO_H
-#define AUDIO_PULSEAUDIO_H
+#ifndef LMMS_AUDIO_PULSEAUDIO_H
+#define LMMS_AUDIO_PULSEAUDIO_H
 
 #include "lmmsconfig.h"
 
@@ -104,4 +104,4 @@ class AudioPulseAudio : public QThread, public AudioDevice
 
 #endif // LMMS_HAVE_PULSEAUDIO
 
-#endif
+#endif // LMMS_AUDIO_PULSEAUDIO_H
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
index 7ad55191608..8937ceb5efd 100644
--- a/include/AudioSampleRecorder.h
+++ b/include/AudioSampleRecorder.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUDIO_SAMPLE_RECORDER_H
-#define AUDIO_SAMPLE_RECORDER_H
+#ifndef LMMS_AUDIO_SAMPLE_RECORDER_H
+#define LMMS_AUDIO_SAMPLE_RECORDER_H
 
 #include <QList>
 #include <QPair>
@@ -59,4 +59,4 @@ class AudioSampleRecorder : public AudioDevice
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_SAMPLE_RECORDER_H
diff --git a/include/AudioSdl.h b/include/AudioSdl.h
index 7e7710a2fc7..62db8b68ace 100644
--- a/include/AudioSdl.h
+++ b/include/AudioSdl.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_SDL_H
-#define AUDIO_SDL_H
+#ifndef LMMS_AUDIO_SDL_H
+#define LMMS_AUDIO_SDL_H
 
 #include "lmmsconfig.h"
 
@@ -115,4 +115,4 @@ class AudioSdl : public AudioDevice
 
 #endif // LMMS_HAVE_SDL
 
-#endif
+#endif // LMMS_AUDIO_SDL_H
diff --git a/include/AudioSndio.h b/include/AudioSndio.h
index 60685010588..594ca94e72b 100644
--- a/include/AudioSndio.h
+++ b/include/AudioSndio.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUDIO_SNDIO_H
-#define _AUDIO_SNDIO_H
+#ifndef LMMS_AUDIO_SNDIO_H
+#define LMMS_AUDIO_SNDIO_H
 
 #include "lmmsconfig.h"
 
@@ -87,6 +87,6 @@ class AudioSndio : public QThread, public AudioDevice
 
 } // namespace lmms
 
-#endif	// LMMS_HAVE_SNDIO
+#endif // LMMS_HAVE_SNDIO
 
-#endif	// _AUDIO_SNDIO_H
+#endif // LMMS_AUDIO_SNDIO_H
diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h
index dc9afe7e4a0..b327f7d8447 100644
--- a/include/AudioSoundIo.h
+++ b/include/AudioSoundIo.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUDIO_SOUNDIO_H
-#define AUDIO_SOUNDIO_H
+#ifndef LMMS_AUDIO_SOUNDIO_H
+#define LMMS_AUDIO_SOUNDIO_H
 
 #include <QObject>
 
@@ -145,4 +145,4 @@ class AudioSoundIo : public AudioDevice
 
 #endif // LMMS_HAVE_SOUNDIO
 
-#endif
+#endif // LMMS_AUDIO_SOUNDIO_H
diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h
index d8c58523c55..3d78b8e9c38 100644
--- a/include/AutomatableButton.h
+++ b/include/AutomatableButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef AUTOMATABLE_BUTTON_H
-#define AUTOMATABLE_BUTTON_H
+#ifndef LMMS_GUI_AUTOMATABLE_BUTTON_H
+#define LMMS_GUI_AUTOMATABLE_BUTTON_H
 
 #include <QPushButton>
 
@@ -109,4 +108,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_AUTOMATABLE_BUTTON_H
diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
index c8f2ab5480b..1e6d5eda3d0 100644
--- a/include/AutomatableModel.h
+++ b/include/AutomatableModel.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUTOMATABLE_MODEL_H
-#define AUTOMATABLE_MODEL_H
+#ifndef LMMS_AUTOMATABLE_MODEL_H
+#define LMMS_AUTOMATABLE_MODEL_H
 
 #include <QMap>
 #include <QMutex>
@@ -507,5 +507,4 @@ using AutomatedValueMap = QMap<AutomatableModel*, float>;
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_AUTOMATABLE_MODEL_H
diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h
index 1e8ef7398f5..12b2e4d4919 100644
--- a/include/AutomatableModelView.h
+++ b/include/AutomatableModelView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUTOMATABLE_MODEL_VIEW_H
-#define AUTOMATABLE_MODEL_VIEW_H
+#ifndef LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H
+#define LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H
 
 #include "ModelView.h"
 #include "AutomatableModel.h"
@@ -137,5 +137,4 @@ using BoolModelView = TypedModelView<BoolModel>;
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H
diff --git a/include/AutomatableSlider.h b/include/AutomatableSlider.h
index ba11741b590..cb1a6965f43 100644
--- a/include/AutomatableSlider.h
+++ b/include/AutomatableSlider.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef AUTOMATABLE_SLIDER_H
-#define AUTOMATABLE_SLIDER_H
+#ifndef LMMS_GUI_AUTOMATABLE_SLIDER_H
+#define LMMS_GUI_AUTOMATABLE_SLIDER_H
 
 #include <QSlider>
 
@@ -77,4 +76,4 @@ using sliderModel = IntModel;
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_AUTOMATABLE_SLIDER_H
diff --git a/include/AutomationClip.h b/include/AutomationClip.h
index 6f7c6291d84..10c714c3d07 100644
--- a/include/AutomationClip.h
+++ b/include/AutomationClip.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AUTOMATION_CLIP_H
-#define AUTOMATION_CLIP_H
+#ifndef LMMS_AUTOMATION_CLIP_H
+#define LMMS_AUTOMATION_CLIP_H
 
 #include <QMap>
 #include <QPointer>
@@ -260,4 +260,4 @@ inline int POS(AutomationClip::TimemapIterator it)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUTOMATION_CLIP_H
diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h
index b4de7839c23..a20e2ce2822 100644
--- a/include/AutomationClipView.h
+++ b/include/AutomationClipView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AUTOMATION_CLIP_VIEW_H
-#define AUTOMATION_CLIP_VIEW_H
+#ifndef LMMS_GUI_AUTOMATION_CLIP_VIEW_H
+#define LMMS_GUI_AUTOMATION_CLIP_VIEW_H
 
 #include <QStaticText>
 
@@ -85,4 +85,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_CLIP_VIEW_H
diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
index 52609416f88..c2ab9809266 100644
--- a/include/AutomationEditor.h
+++ b/include/AutomationEditor.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUTOMATION_EDITOR_H
-#define AUTOMATION_EDITOR_H
+#ifndef LMMS_GUI_AUTOMATION_EDITOR_H
+#define LMMS_GUI_AUTOMATION_EDITOR_H
 
 #include <QWidget>
 
@@ -304,4 +304,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_EDITOR_H
diff --git a/include/AutomationNode.h b/include/AutomationNode.h
index 11bd6d57d58..a922109e604 100644
--- a/include/AutomationNode.h
+++ b/include/AutomationNode.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUTOMATION_NODE_H
-#define AUTOMATION_NODE_H
+#ifndef LMMS_AUTOMATION_NODE_H
+#define LMMS_AUTOMATION_NODE_H
 
 namespace lmms
 {
@@ -156,4 +156,4 @@ class AutomationNode
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUTOMATION_NODE_H
diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h
index 1779bf10248..64c2cc43aea 100644
--- a/include/AutomationTrack.h
+++ b/include/AutomationTrack.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AUTOMATION_TRACK_H
-#define AUTOMATION_TRACK_H
+#ifndef LMMS_AUTOMATION_TRACK_H
+#define LMMS_AUTOMATION_TRACK_H
 
 #include "Track.h"
 
@@ -62,4 +62,4 @@ class AutomationTrack : public Track
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUTOMATION_TRACK_H
diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h
index 18454bec28f..449e9bef8f8 100644
--- a/include/AutomationTrackView.h
+++ b/include/AutomationTrackView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AUTOMATION_TRACK_VIEW_H
-#define AUTOMATION_TRACK_VIEW_H
+#ifndef LMMS_GUI_AUTOMATION_TRACK_VIEW_H
+#define LMMS_GUI_AUTOMATION_TRACK_VIEW_H
 
 #include "TrackView.h"
 
@@ -52,4 +52,4 @@ class AutomationTrackView : public TrackView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_TRACK_VIEW_H
diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h
index 588fc4eeac7..2a12c62e3ce 100644
--- a/include/BandLimitedWave.h
+++ b/include/BandLimitedWave.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BANDLIMITEDWAVE_H
-#define BANDLIMITEDWAVE_H
+#ifndef LMMS_BANDLIMITEDWAVE_H
+#define LMMS_BANDLIMITEDWAVE_H
 
 class QDataStream;
 class QString;
@@ -149,7 +149,8 @@ class LMMS_EXPORT BandLimitedWave
 
 		return sr;
 
-/*		lookup = lookup << 1;
+		/*
+		lookup = lookup << 1;
 		tlen = tlen << 1;
 		t += 1;
 		const sample_t s3 = s_waveforms[ _wave ].sampleAt( t, lookup );
@@ -159,7 +160,7 @@ class LMMS_EXPORT BandLimitedWave
 		const float ip2 = ( ( tlen - _wavelen ) / tlen - 0.5 ) * 2.0;
 
 		return linearInterpolate( s12, s34, ip2 );
-	*/
+		*/
 	};
 
 
@@ -174,4 +175,4 @@ class LMMS_EXPORT BandLimitedWave
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BANDLIMITEDWAVE_H
diff --git a/include/BasicFilters.h b/include/BasicFilters.h
index 836d758b6cf..c10c4748930 100644
--- a/include/BasicFilters.h
+++ b/include/BasicFilters.h
@@ -28,9 +28,8 @@
  *
  */
 
-
-#ifndef BASIC_FILTERS_H
-#define BASIC_FILTERS_H
+#ifndef LMMS_BASIC_FILTERS_H
+#define LMMS_BASIC_FILTERS_H
 
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
@@ -918,4 +917,4 @@ class BasicFilters
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BASIC_FILTERS_H
diff --git a/include/BufferManager.h b/include/BufferManager.h
index 57729918ec6..712e420ff97 100644
--- a/include/BufferManager.h
+++ b/include/BufferManager.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BUFFER_MANAGER_H
-#define BUFFER_MANAGER_H
+#ifndef LMMS_BUFFER_MANAGER_H
+#define LMMS_BUFFER_MANAGER_H
 
 #include "lmms_export.h"
 #include "lmms_basics.h"
@@ -54,4 +54,4 @@ class LMMS_EXPORT BufferManager
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BUFFER_MANAGER_H
diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
index dd2747ef2c5..904445c67f0 100644
--- a/include/CPULoadWidget.h
+++ b/include/CPULoadWidget.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef CPULOAD_WIDGET_H
-#define CPULOAD_WIDGET_H
+#ifndef LMMS_GUI_CPU_LOAD_WIDGET_H
+#define LMMS_GUI_CPU_LOAD_WIDGET_H
 
 #include <QTimer>
 #include <QPixmap>
@@ -70,4 +69,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CPU_LOAD_WIDGET_H
diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h
index f6a2fff2509..4a8889a83be 100644
--- a/include/CaptionMenu.h
+++ b/include/CaptionMenu.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef CAPTION_MENU_H
-#define CAPTION_MENU_H
+#ifndef LMMS_GUI_CAPTION_MENU_H
+#define LMMS_GUI_CAPTION_MENU_H
 
 #include <QMenu>
 
@@ -47,4 +46,4 @@ class LMMS_EXPORT CaptionMenu : public QMenu
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CAPTION_MENU_H
diff --git a/include/Clip.h b/include/Clip.h
index 204a071a766..8f4162d966d 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef TRACK_CONTENT_OBJECT_H
-#define TRACK_CONTENT_OBJECT_H
+#ifndef LMMS_CLIP_H
+#define LMMS_CLIP_H
 
 #include <QColor>
 
@@ -194,4 +194,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CLIP_H
diff --git a/include/ClipView.h b/include/ClipView.h
index 8cfb9e7a44d..32c5130b984 100644
--- a/include/ClipView.h
+++ b/include/ClipView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef TRACK_CONTENT_OBJECT_VIEW_H
-#define TRACK_CONTENT_OBJECT_VIEW_H
+#ifndef LMMS_GUI_CLIP_VIEW_H
+#define LMMS_GUI_CLIP_VIEW_H
 
 
 #include <QVector>
@@ -252,4 +252,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CLIP_VIEW_H
diff --git a/include/Clipboard.h b/include/Clipboard.h
index 1c2dcb647cd..c6ae66ee873 100644
--- a/include/Clipboard.h
+++ b/include/Clipboard.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CLIPBOARD_H
-#define CLIPBOARD_H
+#ifndef LMMS_CLIPBOARD_H
+#define LMMS_CLIPBOARD_H
 
 #include <QMap>
 #include <QDomElement>
@@ -68,4 +68,4 @@ namespace lmms::Clipboard
 
 } // namespace lmms::Clipboard
 
-#endif
+#endif // LMMS_CLIPBOARD_H
diff --git a/include/ColorChooser.h b/include/ColorChooser.h
index 5482a9a0320..0e85ea9bb8b 100644
--- a/include/ColorChooser.h
+++ b/include/ColorChooser.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef COLOR_CHOOSER_H
-#define COLOR_CHOOSER_H
+#ifndef LMMS_GUI_COLOR_CHOOSER_H
+#define LMMS_GUI_COLOR_CHOOSER_H
 
 #include <QApplication>
 #include <QColor>
@@ -34,7 +34,7 @@ namespace lmms::gui
 {
 
 
-class ColorChooser: public QColorDialog
+class ColorChooser : public QColorDialog
 {
 public:
 	ColorChooser(const QColor &initial, QWidget *parent): QColorDialog(initial, parent) {};
@@ -68,5 +68,4 @@ class ColorChooser: public QColorDialog
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_COLOR_CHOOSER_H
diff --git a/include/ComboBox.h b/include/ComboBox.h
index 9a0e5a517ad..8153451e863 100644
--- a/include/ComboBox.h
+++ b/include/ComboBox.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef COMBOBOX_H
-#define COMBOBOX_H
+#ifndef LMMS_GUI_COMBOBOX_H
+#define LMMS_GUI_COMBOBOX_H
 
 #include <QMenu>
 #include <QWidget>
@@ -83,4 +82,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_COMBOBOX_H
diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h
index 0c76620d81e..8fd1f49f4c7 100644
--- a/include/ComboBoxModel.h
+++ b/include/ComboBoxModel.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef COMBOBOX_MODEL_H
-#define COMBOBOX_MODEL_H
+#ifndef LMMS_COMBOBOX_MODEL_H
+#define LMMS_COMBOBOX_MODEL_H
 
 #include <memory>
 #include <utility>
@@ -95,4 +95,4 @@ class LMMS_EXPORT ComboBoxModel : public IntModel
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_COMBOBOX_MODEL_H
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index fd2967b6af7..eee06968123 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef CONFIG_MGR_H
-#define CONFIG_MGR_H
+#ifndef LMMS_CONFIG_MANAGER_H
+#define LMMS_CONFIG_MANAGER_H
 
 #include "lmmsconfig.h"
 
@@ -314,4 +313,4 @@ class LMMS_EXPORT ConfigManager : public QObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CONFIG_MANAGER_H
diff --git a/include/ControlLayout.h b/include/ControlLayout.h
index 8c629f8e1cd..568ce1a854d 100644
--- a/include/ControlLayout.h
+++ b/include/ControlLayout.h
@@ -70,8 +70,8 @@
 **
 ****************************************************************************/
 
-#ifndef CONTROLLAYOUT_H
-#define CONTROLLAYOUT_H
+#ifndef LMMS_GUI_CONTROL_LAYOUT_H
+#define LMMS_GUI_CONTROL_LAYOUT_H
 
 #include <QLayout>
 #include <QMultiMap>
@@ -141,4 +141,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif // CONTROLLAYOUT_H
+#endif // LMMS_GUI_CONTROL_LAYOUT_H
diff --git a/include/Controller.h b/include/Controller.h
index d949cf90c72..0a5eb0f369e 100644
--- a/include/Controller.h
+++ b/include/Controller.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef CONTROLLER_H
-#define CONTROLLER_H
+#ifndef LMMS_CONTROLLER_H
+#define LMMS_CONTROLLER_H
 
 #include "lmms_export.h"
 #include "Engine.h"
@@ -184,5 +183,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_CONTROLLER_H
diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
index 8230971ccb7..4473b68e059 100644
--- a/include/ControllerConnection.h
+++ b/include/ControllerConnection.h
@@ -26,9 +26,8 @@
  *
  */
 
-
-#ifndef CONTROLLER_CONNECTION_H
-#define CONTROLLER_CONNECTION_H
+#ifndef LMMS_CONTROLLER_CONNECTION_H
+#define LMMS_CONTROLLER_CONNECTION_H
 
 #include <QObject>
 #include <QVector>
@@ -128,5 +127,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_CONTROLLER_CONNECTION_H
diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
index 5565c8a67b9..6fb9d45d046 100644
--- a/include/ControllerConnectionDialog.h
+++ b/include/ControllerConnectionDialog.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef CONTROLLER_CONNECTION_DIALOG_H
-#define CONTROLLER_CONNECTION_DIALOG_H
+#ifndef LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H
+#define LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
@@ -111,4 +110,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
index 4f496ad775c..0c53a8c849b 100644
--- a/include/ControllerDialog.h
+++ b/include/ControllerDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CONTROLLER_DIALOG_H
-#define CONTROLLER_DIALOG_H
+#ifndef LMMS_GUI_CONTROLLER_DIALOG_H
+#define LMMS_GUI_CONTROLLER_DIALOG_H
 
 #include <QWidget>
 
@@ -61,4 +61,4 @@ class ControllerDialog : public QWidget, public ModelView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_DIALOG_H
diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
index 904e523dd7c..303cc2b401f 100644
--- a/include/ControllerRackView.h
+++ b/include/ControllerRackView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CONTROLLER_RACK_VIEW_H
-#define CONTROLLER_RACK_VIEW_H
+#ifndef LMMS_GUI_CONTROLLER_RACK_VIEW_H
+#define LMMS_GUI_CONTROLLER_RACK_VIEW_H
 
 #include <QWidget>
 #include <QCloseEvent>
@@ -92,4 +92,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_RACK_VIEW_H
diff --git a/include/ControllerView.h b/include/ControllerView.h
index 8b8db0674a0..d1ba533a1a0 100644
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CONTROLLER_VIEW_H
-#define CONTROLLER_VIEW_H
+#ifndef LMMS_GUI_CONTROLLER_VIEW_H
+#define LMMS_GUI_CONTROLLER_VIEW_H
 
 #include <QFrame>
 
@@ -88,4 +88,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_VIEW_H
diff --git a/include/Controls.h b/include/Controls.h
index 9ffed465e53..5ed19027eb2 100644
--- a/include/Controls.h
+++ b/include/Controls.h
@@ -22,10 +22,8 @@
  *
  */
 
-#ifndef CONTROLS_H
-#define CONTROLS_H
-
-
+#ifndef LMMS_GUI_CONTROLS_H
+#define LMMS_GUI_CONTROLS_H
 
 // headers only required for covariance
 #include "AutomatableModel.h"
@@ -146,4 +144,4 @@ class CheckControl : public Control
 
 } // namespace lmms
 
-#endif // CONTROLS_H
+#endif // LMMS_GUI_CONTROLS_H
diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h
index cde718810bf..19768ec8780 100644
--- a/include/CustomTextKnob.h
+++ b/include/CustomTextKnob.h
@@ -1,6 +1,29 @@
-/* Text customizable knob */
-#ifndef CUSTOM_TEXT_KNOB_H
-#define CUSTOM_TEXT_KNOB_H
+/*
+ * CustomTextKnob.h
+ *
+ * Copyright (c) 2020 Ibuki Sugiyama <main/at/fuwa.dev>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_GUI_CUSTOM_TEXT_KNOB_H
+#define LMMS_GUI_CUSTOM_TEXT_KNOB_H
 
 #include "Knob.h"
 
@@ -34,4 +57,4 @@ class LMMS_EXPORT CustomTextKnob : public Knob
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CUSTOM_TEXT_KNOB_H
diff --git a/include/DataFile.h b/include/DataFile.h
index fb8b2ae3e0a..a91b37f9ba2 100644
--- a/include/DataFile.h
+++ b/include/DataFile.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef DATA_FILE_H
-#define DATA_FILE_H
+#ifndef LMMS_DATA_FILE_H
+#define LMMS_DATA_FILE_H
 
 #include <map>
 #include <QDomDocument>
@@ -154,4 +153,4 @@ class LMMS_EXPORT DataFile : public QDomDocument
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DATA_FILE_H
diff --git a/include/Delay.h b/include/Delay.h
index 529577d58d6..daa871baf4c 100644
--- a/include/Delay.h
+++ b/include/Delay.h
@@ -22,10 +22,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
- 
-#ifndef DELAY_H
-#define DELAY_H
+
+#ifndef LMMS_DELAY_H
+#define LMMS_DELAY_H
 
 #include "lmms_basics.h"
 #include "lmms_math.h"
@@ -365,4 +364,4 @@ using StereoAllpassDelay = AllpassDelay<2>;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DELAY_H
diff --git a/include/DeprecationHelper.h b/include/DeprecationHelper.h
index 7786665a30f..b9be6d42ff3 100644
--- a/include/DeprecationHelper.h
+++ b/include/DeprecationHelper.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DEPRECATIONHELPER_H
-#define DEPRECATIONHELPER_H
+#ifndef LMMS_DEPRECATIONHELPER_H
+#define LMMS_DEPRECATIONHELPER_H
 
 #include <QFontMetrics>
 #include <QWheelEvent>
@@ -66,4 +66,4 @@ inline QPoint position(QWheelEvent *wheelEvent)
 
 } // namespace lmms
 
-#endif // DEPRECATIONHELPER_H
+#endif // LMMS_DEPRECATIONHELPER_H
diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h
index f90af3697d8..e5d5f5712d5 100644
--- a/include/DetuningHelper.h
+++ b/include/DetuningHelper.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef DETUNING_HELPER_H
-#define DETUNING_HELPER_H
+#ifndef LMMS_DETUNING_HELPER_H
+#define LMMS_DETUNING_HELPER_H
 
 #include "InlineAutomation.h"
 #include "MemoryManager.h"
@@ -64,4 +64,4 @@ class DetuningHelper : public InlineAutomation
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DETUNING_HELPER_H
diff --git a/include/DrumSynth.h b/include/DrumSynth.h
index 98574f2d2ad..750055ddba9 100644
--- a/include/DrumSynth.h
+++ b/include/DrumSynth.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef DRUMSYNTH_H
-#define DRUMSYNTH_H
+#ifndef LMMS_DRUM_SYNTH_H
+#define LMMS_DRUM_SYNTH_H
 
 #include <stdint.h>
 #include "lmms_basics.h"
@@ -57,4 +56,4 @@ class DrumSynth {
 
 } // namespace lmms
 
-#endif // DRUMSYNTH_H
+#endif // LMMS_DRUM_SYNTH_H
diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h
index eb03e1cf01c..d8268fd8db9 100644
--- a/include/DspEffectLibrary.h
+++ b/include/DspEffectLibrary.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef DSP_EFFECT_LIBRARY_H
-#define DSP_EFFECT_LIBRARY_H
+#ifndef LMMS_DSPEFFECTLIBRARY_H
+#define LMMS_DSPEFFECTLIBRARY_H
 
 #include "lmms_math.h"
 #include "lmms_constants.h"
@@ -331,5 +330,4 @@ namespace lmms::DspEffectLibrary
 
 } // namespace lmms::DspEffectLibrary
 
-
-#endif
+#endif // LMMS_DSPEFFECTLIBRARY_H
diff --git a/include/DummyEffect.h b/include/DummyEffect.h
index 9db45a3e138..0a80b90a981 100644
--- a/include/DummyEffect.h
+++ b/include/DummyEffect.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef DUMMY_EFFECT_H
-#define DUMMY_EFFECT_H
+#ifndef LMMS_DUMMY_EFFECT_H
+#define LMMS_DUMMY_EFFECT_H
 
 #include <QDomElement>
 
@@ -149,4 +149,4 @@ class DummyEffect : public Effect
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_EFFECT_H
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
index a40d8338f2c..aefa035db7b 100644
--- a/include/DummyInstrument.h
+++ b/include/DummyInstrument.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef DUMMY_INSTRUMENT_H
-#define DUMMY_INSTRUMENT_H
+#ifndef LMMS_DUMMY_INSTRUMENT_H
+#define LMMS_DUMMY_INSTRUMENT_H
 
 #include "Instrument.h"
 #include "InstrumentView.h"
@@ -77,4 +77,4 @@ class DummyInstrument : public Instrument
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_INSTRUMENT_H
diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h
index 1c763ec3eaf..3f6746b74b2 100644
--- a/include/DummyPlugin.h
+++ b/include/DummyPlugin.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef DUMMY_PLUGIN_H
-#define DUMMY_PLUGIN_H
+#ifndef LMMS_DUMMY_PLUGIN_H
+#define LMMS_DUMMY_PLUGIN_H
 
 #include "Plugin.h"
 #include "PluginView.h"
@@ -68,4 +68,4 @@ class DummyPlugin : public Plugin
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_PLUGIN_H
diff --git a/include/Editor.h b/include/Editor.h
index 1a39ea72fa6..681bce46ccc 100644
--- a/include/Editor.h
+++ b/include/Editor.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef EDITOR_COMMON_H
-#define EDITOR_COMMON_H
+#ifndef LMMS_GUI_EDITOR_H
+#define LMMS_GUI_EDITOR_H
 
 #include <QMainWindow>
 #include <QToolBar>
@@ -113,4 +113,4 @@ class DropToolBar : public QToolBar
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_EDITOR_H
diff --git a/include/Effect.h b/include/Effect.h
index add1f715885..1f566e0e923 100644
--- a/include/Effect.h
+++ b/include/Effect.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EFFECT_H
-#define EFFECT_H
+#ifndef LMMS_EFFECT_H
+#define LMMS_EFFECT_H
 
 #include "Plugin.h"
 #include "Engine.h"
@@ -241,4 +241,4 @@ using EffectKeyList = Effect::Descriptor::SubPluginFeatures::KeyList;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EFFECT_H
diff --git a/include/EffectChain.h b/include/EffectChain.h
index a9da8e53005..57cf8d5475d 100644
--- a/include/EffectChain.h
+++ b/include/EffectChain.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EFFECT_CHAIN_H
-#define EFFECT_CHAIN_H
+#ifndef LMMS_EFFECT_CHAIN_H
+#define LMMS_EFFECT_CHAIN_H
 
 #include "Model.h"
 #include "SerializingObject.h"
@@ -85,5 +85,4 @@ class LMMS_EXPORT EffectChain : public Model, public SerializingObject
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_EFFECT_CHAIN_H
diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
index 6389db4a3db..4bef5ee7960 100644
--- a/include/EffectControlDialog.h
+++ b/include/EffectControlDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EFFECT_CONTROL_DIALOG_H
-#define EFFECT_CONTROL_DIALOG_H
+#ifndef LMMS_GUI_EFFECT_CONTROL_DIALOG_H
+#define LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 
 #include <QWidget>
 
@@ -64,4 +64,4 @@ class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_EFFECT_CONTROL_DIALOG_H
diff --git a/include/EffectControls.h b/include/EffectControls.h
index 994145a40b6..294f61027a0 100644
--- a/include/EffectControls.h
+++ b/include/EffectControls.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef EFFECT_CONTROLS_H
-#define EFFECT_CONTROLS_H
+#ifndef LMMS_EFFECT_CONTROLS_H
+#define LMMS_EFFECT_CONTROLS_H
 
 #include "Model.h"
 #include "JournallingObject.h"
@@ -82,4 +82,4 @@ class EffectControls : public JournallingObject, public Model
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EFFECT_CONTROLS_H
diff --git a/include/EffectRackView.h b/include/EffectRackView.h
index fb68fda684c..a1e21be0985 100644
--- a/include/EffectRackView.h
+++ b/include/EffectRackView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EFFECT_RACK_VIEW_H
-#define EFFECT_RACK_VIEW_H
+#ifndef LMMS_GUI_EFFECT_RACK_VIEW_H
+#define LMMS_GUI_EFFECT_RACK_VIEW_H
 
 #include <QWidget>
 
@@ -88,4 +88,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_EFFECT_RACK_VIEW_H
diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
index b0acfb734b5..493b0777403 100644
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef EFFECT_SELECT_DIALOG_H
-#define EFFECT_SELECT_DIALOG_H
+#ifndef LMMS_GUI_EFFECT_SELECT_DIALOG_H
+#define LMMS_GUI_EFFECT_SELECT_DIALOG_H
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
@@ -70,5 +70,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_EFFECT_SELECT_DIALOG_H
diff --git a/include/EffectView.h b/include/EffectView.h
index b2b5985ad54..e90700952c7 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EFFECT_VIEW_H
-#define EFFECT_VIEW_H
+#ifndef LMMS_GUI_EFFECT_VIEW_H
+#define LMMS_GUI_EFFECT_VIEW_H
 
 #include "AutomatableModel.h"
 #include "PluginView.h"
@@ -105,4 +105,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_EFFECT_VIEW_H
diff --git a/include/Engine.h b/include/Engine.h
index b63308cde35..ed4cbd93cbc 100644
--- a/include/Engine.h
+++ b/include/Engine.h
@@ -22,14 +22,12 @@
  *
  */
 
-
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef LMMS_ENGINE_H
+#define LMMS_ENGINE_H
 
 #include <QString>
 #include <QObject>
 
-
 #include "lmmsconfig.h"
 #include "lmms_export.h"
 #include "lmms_basics.h"
@@ -157,5 +155,4 @@ class LMMS_EXPORT Engine : public QObject
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_ENGINE_H
diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
index 534adcbe5d3..a713a90f304 100644
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef ENVELOPE_AND_LFO_PARAMETERS_H
-#define ENVELOPE_AND_LFO_PARAMETERS_H
+#ifndef LMMS_ENVELOPE_AND_LFO_PARAMETERS_H
+#define LMMS_ENVELOPE_AND_LFO_PARAMETERS_H
 
 #include <QVector>
 
@@ -190,4 +190,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_ENVELOPE_AND_LFO_PARAMETERS_H
diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h
index a82ccf606b6..b5c7a67d46c 100644
--- a/include/EnvelopeAndLfoView.h
+++ b/include/EnvelopeAndLfoView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef ENVELOPE_AND_LFO_VIEW_H
-#define ENVELOPE_AND_LFO_VIEW_H
+#ifndef LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H
+#define LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H
 
 #include <QWidget>
 
@@ -104,4 +104,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H
diff --git a/include/ExportFilter.h b/include/ExportFilter.h
index 29efef5392a..acbdbb65eb6 100644
--- a/include/ExportFilter.h
+++ b/include/ExportFilter.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef EXPORT_FILTER_H
-#define EXPORT_FILTER_H
+#ifndef LMMS_EXPORT_FILTER_H
+#define LMMS_EXPORT_FILTER_H
 
 #include <QFile>
 
@@ -69,4 +69,4 @@ class LMMS_EXPORT ExportFilter : public Plugin
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EXPORT_FILTER_H
diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h
index 56d039afe49..56a9fc1f5b3 100644
--- a/include/ExportProjectDialog.h
+++ b/include/ExportProjectDialog.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef EXPORT_PROJECT_DIALOG_H
-#define EXPORT_PROJECT_DIALOG_H
+#ifndef LMMS_GUI_EXPORT_PROJECT_DIALOG_H
+#define LMMS_GUI_EXPORT_PROJECT_DIALOG_H
 
 #include <QDialog>
 #include <memory>
@@ -70,5 +69,4 @@ private slots:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_EXPORT_PROJECT_DIALOG_H
diff --git a/include/FadeButton.h b/include/FadeButton.h
index d339009130e..166ef5f2195 100644
--- a/include/FadeButton.h
+++ b/include/FadeButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef FADE_BUTTON_H
-#define FADE_BUTTON_H
+#ifndef LMMS_GUI_FADE_BUTTON_H
+#define LMMS_GUI_FADE_BUTTON_H
 
 #include <QAbstractButton>
 #include <QColor>
@@ -77,4 +76,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_FADE_BUTTON_H
diff --git a/include/Fader.h b/include/Fader.h
index 54acfc57d85..2847819a471 100644
--- a/include/Fader.h
+++ b/include/Fader.h
@@ -44,9 +44,8 @@
  *
  */
 
-
-#ifndef FADER_H
-#define FADER_H
+#ifndef LMMS_GUI_FADER_H
+#define LMMS_GUI_FADER_H
 
 #include <QElapsedTimer>
 #include <QPixmap>
@@ -174,5 +173,4 @@ class LMMS_EXPORT Fader : public QWidget, public FloatModelView
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_FADER_H
diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h
index d49e367c04c..cdb1df41f47 100644
--- a/include/FifoBuffer.h
+++ b/include/FifoBuffer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef FIFO_BUFFER_H
-#define FIFO_BUFFER_H
+#ifndef LMMS_FIFO_BUFFER_H
+#define LMMS_FIFO_BUFFER_H
 
 #include <QSemaphore>
 
@@ -94,4 +94,4 @@ class FifoBuffer
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_FIFO_BUFFER_H
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
index 43a0b333150..51103b19f95 100644
--- a/include/FileBrowser.h
+++ b/include/FileBrowser.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef FILE_BROWSER_H
-#define FILE_BROWSER_H
+#ifndef LMMS_GUI_FILE_BROWSER_H
+#define LMMS_GUI_FILE_BROWSER_H
 
 #include <QCheckBox>
 #include <QDir>
@@ -298,4 +297,4 @@ class FileItem : public QTreeWidgetItem
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_FILE_BROWSER_H
diff --git a/include/FileDialog.h b/include/FileDialog.h
index ed5d2f231bb..67ef1d8eb76 100644
--- a/include/FileDialog.h
+++ b/include/FileDialog.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef FILEDIALOG_H
-#define FILEDIALOG_H
+#ifndef LMMS_GUI_FILE_DIALOG_H
+#define LMMS_GUI_FILE_DIALOG_H
 
 #include <QFileDialog>
 
@@ -57,4 +56,4 @@ class LMMS_EXPORT FileDialog : public QFileDialog
 
 } // namespace lmms::gui
 
-#endif // FILEDIALOG_H
+#endif // LMMS_GUI_FILE_DIALOG_H
diff --git a/include/Graph.h b/include/Graph.h
index 178d1b567ef..f62215ac255 100644
--- a/include/Graph.h
+++ b/include/Graph.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef GRAPH_H
-#define GRAPH_H
+#ifndef LMMS_GUI_GRAPH_H
+#define LMMS_GUI_GRAPH_H
 
 #include <QWidget>
 #include <QPixmap>
@@ -228,4 +227,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_GRAPH_H
diff --git a/include/GroupBox.h b/include/GroupBox.h
index e20db80a681..6a8f424f9f0 100644
--- a/include/GroupBox.h
+++ b/include/GroupBox.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef GROUP_BOX_H
-#define GROUP_BOX_H
+#ifndef LMMS_GUI_GROUP_BOX_H
+#define LMMS_GUI_GROUP_BOX_H
 
 #include <QWidget>
 
@@ -74,5 +73,4 @@ class GroupBox : public QWidget, public BoolModelView
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_GROUP_BOX_H
diff --git a/include/GuiApplication.h b/include/GuiApplication.h
index e39983138b2..3a085149980 100644
--- a/include/GuiApplication.h
+++ b/include/GuiApplication.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef GUIAPPLICATION_H
-#define GUIAPPLICATION_H
+#ifndef LMMS_GUI_GUI_APPLICATION_H
+#define LMMS_GUI_GUI_APPLICATION_H
 
 #include <QObject>
 
@@ -93,4 +93,4 @@ LMMS_EXPORT GuiApplication* getGUI();
 
 } // namespace lmms::gui
 
-#endif // GUIAPPLICATION_H
+#endif // LMMS_GUI_GUI_APPLICATION_H
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index b7a910e5d7c..9c73b3861c8 100644
--- a/include/ImportFilter.h
+++ b/include/ImportFilter.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef IMPORT_FILTER_H
-#define IMPORT_FILTER_H
+#ifndef LMMS_IMPORT_FILTER_H
+#define LMMS_IMPORT_FILTER_H
 
 #include <QFile>
 
@@ -114,4 +114,4 @@ class LMMS_EXPORT ImportFilter : public Plugin
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_IMPORT_FILTER_H
diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h
index 435604506ca..3e27e137bc5 100644
--- a/include/InlineAutomation.h
+++ b/include/InlineAutomation.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INLINE_AUTOMATION_H
-#define INLINE_AUTOMATION_H
+#ifndef LMMS_INLINE_AUTOMATION_H
+#define LMMS_INLINE_AUTOMATION_H
 
 #include "AutomationNode.h"
 #include "AutomationClip.h"
@@ -99,4 +99,4 @@ class InlineAutomation : public FloatModel, public sharedObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INLINE_AUTOMATION_H
diff --git a/include/Instrument.h b/include/Instrument.h
index 4e48e2fd64b..1c42c970e1c 100644
--- a/include/Instrument.h
+++ b/include/Instrument.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef INSTRUMENT_H
-#define INSTRUMENT_H
+#ifndef LMMS_INSTRUMENT_H
+#define LMMS_INSTRUMENT_H
 
 #include <QString>
 #include "lmms_export.h"
@@ -154,4 +154,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Instrument::Flags)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_H
diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h
index 99ba92031bb..71a6e8aaa1d 100644
--- a/include/InstrumentFunctionViews.h
+++ b/include/InstrumentFunctionViews.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_FUNCTION_VIEWS_H
-#define INSTRUMENT_FUNCTION_VIEWS_H
+#ifndef LMMS_INSTRUMENT_FUNCTION_VIEWS_H
+#define LMMS_INSTRUMENT_FUNCTION_VIEWS_H
 
 #include "ModelView.h"
 
@@ -99,4 +99,4 @@ class InstrumentFunctionArpeggioView : public QWidget, public ModelView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_FUNCTION_VIEWS_H
diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h
index 5dcb1114b65..f62b74e9a3f 100644
--- a/include/InstrumentFunctions.h
+++ b/include/InstrumentFunctions.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_FUNCTIONS_H
-#define INSTRUMENT_FUNCTIONS_H
+#ifndef LMMS_INSTRUMENT_FUNCTIONS_H
+#define LMMS_INSTRUMENT_FUNCTIONS_H
 
 #include "JournallingObject.h"
 #include "lmms_basics.h"
@@ -224,4 +224,4 @@ class InstrumentFunctionArpeggio : public Model, public JournallingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_FUNCTIONS_H
diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
index 81feee082c5..7877229a2bf 100644
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef INSTRUMENT_MIDI_IO_VIEW_H
-#define INSTRUMENT_MIDI_IO_VIEW_H
+#ifndef LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H
+#define LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H
 
 #include <QWidget>
 
@@ -77,4 +77,4 @@ class InstrumentMidiIOView : public QWidget, public ModelView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H
diff --git a/include/InstrumentMiscView.h b/include/InstrumentMiscView.h
index 25e16395d96..28f3c6a8e63 100644
--- a/include/InstrumentMiscView.h
+++ b/include/InstrumentMiscView.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef INSTRUMENT_MISC_VIEW_H
-#define INSTRUMENT_MISC_VIEW_H
+#ifndef LMMS_GUI_INSTRUMENT_MISC_VIEW_H
+#define LMMS_GUI_INSTRUMENT_MISC_VIEW_H
 
 #include <QWidget>
 
@@ -71,4 +71,4 @@ class InstrumentMiscView : public QWidget
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_MISC_VIEW_H
diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h
index e9516ab19f1..bbf53d16c21 100644
--- a/include/InstrumentPlayHandle.h
+++ b/include/InstrumentPlayHandle.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_PLAY_HANDLE_H
-#define INSTRUMENT_PLAY_HANDLE_H
+#ifndef LMMS_INSTRUMENT_PLAY_HANDLE_H
+#define LMMS_INSTRUMENT_PLAY_HANDLE_H
 
 #include "PlayHandle.h"
 #include "Instrument.h"
@@ -85,4 +85,4 @@ class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_PLAY_HANDLE_H
diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h
index 11ed4f1c431..6db3078ecaf 100644
--- a/include/InstrumentSoundShaping.h
+++ b/include/InstrumentSoundShaping.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_SOUND_SHAPING_H
-#define INSTRUMENT_SOUND_SHAPING_H
+#ifndef LMMS_INSTRUMENT_SOUND_SHAPING_H
+#define LMMS_INSTRUMENT_SOUND_SHAPING_H
 
 #include "ComboBoxModel.h"
 
@@ -92,4 +92,4 @@ class InstrumentSoundShaping : public Model, public JournallingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_SOUND_SHAPING_H
diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h
index aa8aff19dce..8f671514a89 100644
--- a/include/InstrumentSoundShapingView.h
+++ b/include/InstrumentSoundShapingView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_SOUND_SHAPING_VIEW_H
-#define INSTRUMENT_SOUND_SHAPING_VIEW_H
+#ifndef LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H
+#define LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H
 
 #include <QWidget>
 
@@ -73,4 +73,4 @@ class InstrumentSoundShapingView : public QWidget, public ModelView
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H
diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h
index 129969292a7..7c6d1d795f6 100644
--- a/include/InstrumentTrack.h
+++ b/include/InstrumentTrack.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef INSTRUMENT_TRACK_H
-#define INSTRUMENT_TRACK_H
+#ifndef LMMS_INSTRUMENT_TRACK_H
+#define LMMS_INSTRUMENT_TRACK_H
 
 #include "AudioPort.h"
 #include "InstrumentFunctions.h"
@@ -325,4 +325,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_TRACK_H
diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h
index 3201f81d6a3..363f5b3abc0 100644
--- a/include/InstrumentTrackView.h
+++ b/include/InstrumentTrackView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_TRACK_VIEW_H
-#define INSTRUMENT_TRACK_VIEW_H
+#ifndef LMMS_GUI_INSTRUMENT_TRACK_VIEW_H
+#define LMMS_GUI_INSTRUMENT_TRACK_VIEW_H
 
 #include "TrackView.h"
 
@@ -121,4 +121,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_TRACK_VIEW_H
diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h
index 68750c0b8f4..d41bbdac894 100644
--- a/include/InstrumentTrackWindow.h
+++ b/include/InstrumentTrackWindow.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef INSTRUMENT_TRACK_WINDOW_H
-#define INSTRUMENT_TRACK_WINDOW_H
+#ifndef LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H
+#define LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H
 
 #include <QWidget>
 
@@ -169,4 +169,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H
diff --git a/include/InstrumentView.h b/include/InstrumentView.h
index ab18465eb14..40014a11f32 100644
--- a/include/InstrumentView.h
+++ b/include/InstrumentView.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef INSTRUMENT_VIEW_H
-#define INSTRUMENT_VIEW_H
+#ifndef LMMS_GUI_INSTRUMENT_VIEW_H
+#define LMMS_GUI_INSTRUMENT_VIEW_H
 
 #include "Instrument.h"
 #include "PluginView.h"
@@ -76,4 +75,4 @@ class LMMS_EXPORT InstrumentViewFixedSize : public InstrumentView
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_VIEW_H
diff --git a/include/IoHelper.h b/include/IoHelper.h
index 96d6aa1446e..40c576b8354 100644
--- a/include/IoHelper.h
+++ b/include/IoHelper.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef IO_HELPER_H
-#define IO_HELPER_H
+#ifndef LMMS_IO_HELPER_H
+#define LMMS_IO_HELPER_H
 
 #include "lmmsconfig.h"
 
@@ -91,4 +91,4 @@ inline int fileToDescriptor(FILE* f, bool closeFile = true)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_IO_HELPER_H
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
index 41ae65295b5..f3e134f3466 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef JOURNALLING_OBJECT_H
-#define JOURNALLING_OBJECT_H
+#ifndef LMMS_JOURNALLING_OBJECT_H
+#define LMMS_JOURNALLING_OBJECT_H
 
 #include <QStack>
 
@@ -103,5 +103,4 @@ class LMMS_EXPORT JournallingObject : public SerializingObject
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_JOURNALLING_OBJECT_H
diff --git a/include/Keymap.h b/include/Keymap.h
index 6286f8362d1..967d8078910 100644
--- a/include/Keymap.h
+++ b/include/Keymap.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef KEYMAP_H
-#define KEYMAP_H
+#ifndef LMMS_KEYMAP_H
+#define LMMS_KEYMAP_H
 
 #include <vector>
 #include <QObject>
@@ -80,4 +80,4 @@ class Keymap : public QObject, public SerializingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_KEYMAP_H
diff --git a/include/Knob.h b/include/Knob.h
index 16ac7ed011a..18b26f7e61d 100644
--- a/include/Knob.h
+++ b/include/Knob.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef KNOB_H
-#define KNOB_H
+#ifndef LMMS_GUI_KNOB_H
+#define LMMS_GUI_KNOB_H
 
 #include <memory>
 #include <QPixmap>
@@ -214,4 +213,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_KNOB_H
diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h
index 4b7eb2482f7..abb9691240f 100644
--- a/include/Ladspa2LMMS.h
+++ b/include/Ladspa2LMMS.h
@@ -23,13 +23,11 @@
  *
  */
 
-#ifndef LADSPA_2_LMMS_H
-#define LADSPA_2_LMMS_H
-
+#ifndef LMMS_LADSPA_2_LMMS_H
+#define LMMS_LADSPA_2_LMMS_H
 
 #include "LadspaManager.h"
 
-
 namespace lmms
 {
 
@@ -83,4 +81,4 @@ class LMMS_EXPORT Ladspa2LMMS : public LadspaManager
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_2_LMMS_H
diff --git a/include/LadspaBase.h b/include/LadspaBase.h
index 3feb7d204d6..51c0ca20235 100644
--- a/include/LadspaBase.h
+++ b/include/LadspaBase.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef LADSPA_BASE_H
-#define LADSPA_BASE_H
+#ifndef LMMS_LADSPA_BASE_H
+#define LMMS_LADSPA_BASE_H
 
 #include "LadspaManager.h"
 #include "Plugin.h"
@@ -83,4 +83,4 @@ inline Plugin::Descriptor::SubPluginFeatures::Key ladspaKeyToSubPluginKey(
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_BASE_H
diff --git a/include/LadspaControl.h b/include/LadspaControl.h
index 258a5d8fcb5..e4f0cd745ce 100644
--- a/include/LadspaControl.h
+++ b/include/LadspaControl.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef LADSPA_CONTROL_H
-#define LADSPA_CONTROL_H
+#ifndef LMMS_LADSPA_CONTROL_H
+#define LMMS_LADSPA_CONTROL_H
 
 #include <ladspa.h>
 
@@ -131,4 +131,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_CONTROL_H
diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h
index 5dafa4e5c5e..4f12c29e27c 100644
--- a/include/LadspaControlView.h
+++ b/include/LadspaControlView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef LADSPA_CONTROL_VIEW_H
-#define LADSPA_CONTROL_VIEW_H
+#ifndef LMMS_GUI_LADSPA_CONTROL_VIEW_H
+#define LMMS_GUI_LADSPA_CONTROL_VIEW_H
 
 #include <QWidget>
 
@@ -55,4 +55,4 @@ class LMMS_EXPORT LadspaControlView : public QWidget, public ModelView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_LADSPA_CONTROL_VIEW_H
diff --git a/include/LadspaManager.h b/include/LadspaManager.h
index 176526193a3..8c00d260429 100644
--- a/include/LadspaManager.h
+++ b/include/LadspaManager.h
@@ -24,9 +24,8 @@
  *
  */
 
-
-#ifndef LADSPA_MANAGER_H
-#define LADSPA_MANAGER_H
+#ifndef LMMS_LADSPA_MANAGER_H
+#define LMMS_LADSPA_MANAGER_H
 
 #include <ladspa.h>
 
@@ -350,4 +349,4 @@ class LMMS_EXPORT LadspaManager
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_MANAGER_H
diff --git a/include/LcdFloatSpinBox.h b/include/LcdFloatSpinBox.h
index ab0de304e0f..74a870114a6 100644
--- a/include/LcdFloatSpinBox.h
+++ b/include/LcdFloatSpinBox.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef LCD_FLOATSPINBOX_H
-#define LCD_FLOATSPINBOX_H
+#ifndef LMMS_GUI_LCD_FLOATSPINBOX_H
+#define LMMS_GUI_LCD_FLOATSPINBOX_H
 
 #include <QString>
 
@@ -85,4 +84,4 @@ using LcdFloatSpinBoxModel = FloatModel;
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LCD_FLOATSPINBOX_H
diff --git a/include/LcdSpinBox.h b/include/LcdSpinBox.h
index 9c8923763dc..aeccd2635d2 100644
--- a/include/LcdSpinBox.h
+++ b/include/LcdSpinBox.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef LCD_SPINBOX_H
-#define LCD_SPINBOX_H
+#ifndef LMMS_GUI_LCD_SPINBOX_H
+#define LMMS_GUI_LCD_SPINBOX_H
 
 #include "LcdWidget.h"
 #include "AutomatableModelView.h"
@@ -90,4 +89,4 @@ using LcdSpinBoxModel = IntModel;
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LCD_SPINBOX_H
diff --git a/include/LcdWidget.h b/include/LcdWidget.h
index d55cfc01792..f19c2c5838d 100644
--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef LCD_WIDGET_H
-#define LCD_WIDGET_H
+#ifndef LMMS_GUI_LCD_WIDGET_H
+#define LMMS_GUI_LCD_WIDGET_H
 
 #include <QMap>
 #include <QWidget>
@@ -117,4 +116,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LCD_WIDGET_H
diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h
index a215592e648..95016b87fa5 100644
--- a/include/LedCheckBox.h
+++ b/include/LedCheckBox.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef LED_CHECKBOX_H
-#define LED_CHECKBOX_H
+#ifndef LMMS_GUI_LED_CHECKBOX_H
+#define LMMS_GUI_LED_CHECKBOX_H
 
 #include "AutomatableButton.h"
 
@@ -84,4 +83,4 @@ class LMMS_EXPORT LedCheckBox : public AutomatableButton
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LED_CHECKBOX_H
diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h
index df72193dcd5..49ad25ecf98 100644
--- a/include/LeftRightNav.h
+++ b/include/LeftRightNav.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LEFT_RIGHT_NAV_H
-#define LEFT_RIGHT_NAV_H
+#ifndef LMMS_GUI_LEFT_RIGHT_NAV_H
+#define LMMS_GUI_LEFT_RIGHT_NAV_H
 
 #include "PixmapButton.h"
 
@@ -51,4 +51,4 @@ class LeftRightNav : public QWidget
 
 } // namespace lmms::gui
 
-#endif
\ No newline at end of file
+#endif // LMMS_GUI_LEFT_RIGHT_NAV_H
diff --git a/include/LfoController.h b/include/LfoController.h
index 48aee3d30dc..1c63ba69883 100644
--- a/include/LfoController.h
+++ b/include/LfoController.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LFO_CONTROLLER_H
-#define LFO_CONTROLLER_H
+#ifndef LMMS_LFO_CONTROLLER_H
+#define LMMS_LFO_CONTROLLER_H
 
 #include <QWidget>
 
@@ -51,7 +51,7 @@ class LfoControllerDialog;
 }
 
 
-class LfoController : public Controller 
+class LfoController : public Controller
 {
 	Q_OBJECT
 public:
@@ -136,4 +136,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LFO_CONTROLLER_H
diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h
index 72598281b12..cf5aabd0d46 100644
--- a/include/LinkedModelGroupViews.h
+++ b/include/LinkedModelGroupViews.h
@@ -22,15 +22,13 @@
  *
  */
 
-#ifndef LINKEDMODELGROUPVIEWS_H
-#define LINKEDMODELGROUPVIEWS_H
-
+#ifndef LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
+#define LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
 
 #include <cstddef>
 #include <memory>
 #include <QWidget>
 
-
 namespace lmms
 {
 
@@ -120,4 +118,4 @@ class LinkedModelGroupsView
 
 } // namespace lmms
 
-#endif // LINKEDMODELGROUPVIEWS_H
+#endif // LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h
index 84a216f30d9..3f274d10c8a 100644
--- a/include/LinkedModelGroups.h
+++ b/include/LinkedModelGroups.h
@@ -22,15 +22,13 @@
  *
  */
 
-#ifndef LINKEDMODELGROUPS_H
-#define LINKEDMODELGROUPS_H
-
+#ifndef LMMS_LINKED_MODEL_GROUPS_H
+#define LMMS_LINKED_MODEL_GROUPS_H
 
 #include <cstddef>
 
 #include "Model.h"
 
-
 class QDomDocument;
 class QDomElement;
 
@@ -178,4 +176,4 @@ class LinkedModelGroups
 
 } // namespace lmms
 
-#endif // LINKEDMODELGROUPS_H
+#endif // LMMS_LINKED_MODEL_GROUPS_H
diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h
index 023872254db..91a469de01d 100644
--- a/include/LmmsPalette.h
+++ b/include/LmmsPalette.h
@@ -23,13 +23,12 @@
  *
  */
 
-#ifndef LMMSPALETTE_H
-#define LMMSPALETTE_H
+#ifndef LMMS_GUI_LMMS_PALETTE_H
+#define LMMS_GUI_LMMS_PALETTE_H
 
 #include <QWidget>
 #include "lmms_export.h"
 
-
 namespace lmms::gui
 {
 
@@ -86,7 +85,6 @@ class LMMS_EXPORT LmmsPalette : public QWidget
 };
 
 
-
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LMMS_PALETTE_H
diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h
index ae5b65f9975..b3be03952fe 100644
--- a/include/LmmsStyle.h
+++ b/include/LmmsStyle.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef LMMS_STYLE_H
-#define LMMS_STYLE_H
+#ifndef LMMS_GUI_LMMS_STYLE_H
+#define LMMS_GUI_LMMS_STYLE_H
 
 #include <QProxyStyle>
 
@@ -96,4 +95,4 @@ class LmmsStyle : public QProxyStyle
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LMMS_STYLE_H
diff --git a/include/LocaleHelper.h b/include/LocaleHelper.h
index b071a1596c1..9c829fcaa61 100644
--- a/include/LocaleHelper.h
+++ b/include/LocaleHelper.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef LOCALEHELPER_H
-#define LOCALEHELPER_H
+#ifndef LMMS_LOCALEHELPER_H
+#define LMMS_LOCALEHELPER_H
 
 #include <QLocale>
 
@@ -67,4 +67,4 @@ inline float toFloat(QString str, bool* ok = nullptr)
 
 } // namespace lmms::LocaleHelper
 
-#endif // LOCALEHELPER_H
+#endif // LMMS_LOCALEHELPER_H
diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h
index adde5fe6f6d..d44b9954374 100644
--- a/include/LocklessAllocator.h
+++ b/include/LocklessAllocator.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LOCKLESS_ALLOCATOR_H
-#define LOCKLESS_ALLOCATOR_H
+#ifndef LMMS_LOCKLESS_ALLOCATOR_H
+#define LMMS_LOCKLESS_ALLOCATOR_H
 
 #include <atomic>
 #include <cstddef>
@@ -84,4 +84,4 @@ class LocklessAllocatorT : private LocklessAllocator
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LOCKLESS_ALLOCATOR_H
diff --git a/include/LocklessList.h b/include/LocklessList.h
index 44b71805954..4a0c27de09d 100644
--- a/include/LocklessList.h
+++ b/include/LocklessList.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LOCKLESS_LIST_H
-#define LOCKLESS_LIST_H
+#ifndef LMMS_LOCKLESS_LIST_H
+#define LMMS_LOCKLESS_LIST_H
 
 #include "LocklessAllocator.h"
 
@@ -97,4 +97,4 @@ class LocklessList
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LOCKLESS_LIST_H
diff --git a/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h
index e77c62ccbf1..99c48cc904a 100644
--- a/include/LocklessRingBuffer.h
+++ b/include/LocklessRingBuffer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LOCKLESSRINGBUFFER_H
-#define LOCKLESSRINGBUFFER_H
+#ifndef LMMS_LOCKLESS_RING_BUFFER_H
+#define LMMS_LOCKLESS_RING_BUFFER_H
 
 #include <QMutex>
 #include <QWaitCondition>
@@ -89,4 +89,4 @@ class LocklessRingBufferReader : public ringbuffer_reader_t<T>
 
 } // namespace lmms
 
-#endif //LOCKLESSRINGBUFFER_H
+#endif // LMMS_LOCKLESS_RING_BUFFER_H
diff --git a/include/Lv2Basics.h b/include/Lv2Basics.h
index b935e6a02f9..3dae4c9f231 100644
--- a/include/Lv2Basics.h
+++ b/include/Lv2Basics.h
@@ -22,10 +22,8 @@
  *
  */
 
-
-#ifndef LV2BASICS_H
-#define LV2BASICS_H
-
+#ifndef LMMS_LV2BASICS_H
+#define LMMS_LV2BASICS_H
 
 #include "lmmsconfig.h"
 
@@ -69,4 +67,5 @@ std::string stdStringFromPortName(const LilvPlugin* plug, const LilvPort* port);
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2BASICS_H
+
+#endif // LMMS_LV2BASICS_H
diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h
index c6b08db8cf6..93b3b21eff4 100644
--- a/include/Lv2ControlBase.h
+++ b/include/Lv2ControlBase.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2_CONTROL_BASE_H
-#define LV2_CONTROL_BASE_H
+#ifndef LMMS_LV2_CONTROL_BASE_H
+#define LMMS_LV2_CONTROL_BASE_H
 
 #include "lmmsconfig.h"
 
@@ -163,4 +163,5 @@ class LMMS_EXPORT Lv2ControlBase : public LinkedModelGroups
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2_CONTROL_BASE_H
+
+#endif // LMMS_LV2_CONTROL_BASE_H
diff --git a/include/Lv2Evbuf.h b/include/Lv2Evbuf.h
index 9732fc5e131..319bdf9ce72 100644
--- a/include/Lv2Evbuf.h
+++ b/include/Lv2Evbuf.h
@@ -1,5 +1,5 @@
 /*
- * lv2_evbuf.h - Lv2 event buffer definitions
+ * Lv2Evbuf.h - Lv2 event buffer definitions
  *
  * Copyright (c) 2019-2020 Johannes Lorenz <jlsf2013$users.sourceforge.net, $=@>
  *
@@ -30,8 +30,8 @@
  * match the LMMS coding conventions.
  */
 
-#ifndef LV2_EVBUF_H
-#define LV2_EVBUF_H
+#ifndef LMMS_LV2_EVBUF_H
+#define LMMS_LV2_EVBUF_H
 
 #include "lmmsconfig.h"
 
@@ -155,4 +155,4 @@ lv2_evbuf_write(	LV2_Evbuf_Iterator* iter,
 
 #endif // LMMS_HAVE_LV2
 
-#endif // LV2_EVBUF_H
+#endif // LMMS_LV2_EVBUF_H
diff --git a/include/Lv2Features.h b/include/Lv2Features.h
index 033273f3148..b4fd6c06d42 100644
--- a/include/Lv2Features.h
+++ b/include/Lv2Features.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2FEATURES_H
-#define LV2FEATURES_H
+#ifndef LMMS_LV2_FEATURES_H
+#define LMMS_LV2_FEATURES_H
 
 #include "lmmsconfig.h"
 
@@ -84,4 +84,4 @@ class Lv2Features
 
 #endif // LMMS_HAVE_LV2
 
-#endif // LV2FEATURES_H
+#endif // LMMS_LV2_FEATURES_H
diff --git a/include/Lv2Manager.h b/include/Lv2Manager.h
index 7c4a4bcb799..b62e989cf46 100644
--- a/include/Lv2Manager.h
+++ b/include/Lv2Manager.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2MANAGER_H
-#define LV2MANAGER_H
+#ifndef LMMS_LV2_MANAGER_H
+#define LMMS_LV2_MANAGER_H
 
 #include "lmmsconfig.h"
 
@@ -166,4 +166,4 @@ class Lv2Manager
 
 #endif // LMMS_HAVE_LV2
 
-#endif // LV2MANAGER_H
+#endif // LMMS_LV2_MANAGER_H
diff --git a/include/Lv2Options.h b/include/Lv2Options.h
index 32225ea8918..ca4fe2b7f48 100644
--- a/include/Lv2Options.h
+++ b/include/Lv2Options.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2OPTIONS_H
-#define LV2OPTIONS_H
+#ifndef LMMS_LV2_OPTIONS_H
+#define LMMS_LV2_OPTIONS_H
 
 #include "lmmsconfig.h"
 
@@ -107,4 +107,4 @@ class Lv2Options
 
 #endif // LMMS_HAVE_LV2
 
-#endif // LV2OPTIONS_H
+#endif // LMMS_LV2_OPTIONS_H
diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h
index 07676fdd4e7..0f0b02913a2 100644
--- a/include/Lv2Ports.h
+++ b/include/Lv2Ports.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2PORTS_H
-#define LV2PORTS_H
+#ifndef LMMS_LV2PORTS_H
+#define LMMS_LV2PORTS_H
 
 #include "lmmsconfig.h"
 
@@ -270,4 +270,5 @@ const Target* dcast(const PortBase* base)
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2PORTS_H
+
+#endif // LMMS_LV2PORTS_H
diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h
index 31a69404437..7e6342ec4ac 100644
--- a/include/Lv2Proc.h
+++ b/include/Lv2Proc.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2PROC_H
-#define LV2PROC_H
+#ifndef LMMS_LV2_PROC_H
+#define LMMS_LV2_PROC_H
 
 #include "lmmsconfig.h"
 
@@ -220,4 +220,5 @@ class Lv2Proc : public LinkedModelGroup
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2PROC_H
+
+#endif // LMMS_LV2_PROC_H
diff --git a/include/Lv2SubPluginFeatures.h b/include/Lv2SubPluginFeatures.h
index 9ba2c76cb9d..497c72830e3 100644
--- a/include/Lv2SubPluginFeatures.h
+++ b/include/Lv2SubPluginFeatures.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LV2_SUBPLUGIN_FEATURES_H
-#define LV2_SUBPLUGIN_FEATURES_H
+#ifndef LMMS_LV2_SUBPLUGIN_FEATURES_H
+#define LMMS_LV2_SUBPLUGIN_FEATURES_H
 
 #include "lmmsconfig.h"
 
@@ -66,4 +66,4 @@ class LMMS_EXPORT Lv2SubPluginFeatures : public Plugin::Descriptor::SubPluginFea
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_SUBPLUGIN_FEATURES_H
diff --git a/include/Lv2UridCache.h b/include/Lv2UridCache.h
index bae42d3186c..b64003a2ee7 100644
--- a/include/Lv2UridCache.h
+++ b/include/Lv2UridCache.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2URIDCACHE_H
-#define LV2URIDCACHE_H
+#ifndef LMMS_LV2_URID_CACHE_H
+#define LMMS_LV2_URID_CACHE_H
 
 #include "lmmsconfig.h"
 
@@ -74,4 +74,5 @@ template<> struct Lv2UridCache::IdForType<std::int32_t> { static constexpr auto
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2URIDCACHE_H
+
+#endif // LMMS_LV2_URID_CACHE_H
diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h
index 9db9cb0c2ae..b8733023e5f 100644
--- a/include/Lv2UridMap.h
+++ b/include/Lv2UridMap.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LV2URIDMAP_H
-#define LV2URIDMAP_H
+#ifndef LMMS_LV2_URID_MAP_H
+#define LMMS_LV2_URID_MAP_H
 
 #include "lmmsconfig.h"
 
@@ -75,4 +75,5 @@ class UridMap
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2URIDMAP_H
+
+#endif // LMMS_LV2_URID_MAP_H
diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h
index 60544081496..d27f35cec32 100644
--- a/include/Lv2ViewBase.h
+++ b/include/Lv2ViewBase.h
@@ -22,15 +22,14 @@
  *
  */
 
-#ifndef LV2VIEWBASE_H
-#define LV2VIEWBASE_H
+#ifndef LMMS_GUI_LV2_VIEW_BASE_H
+#define LMMS_GUI_LV2_VIEW_BASE_H
 
 #include "lmmsconfig.h"
 
 #ifdef LMMS_HAVE_LV2
 
 
-
 #include "LinkedModelGroupViews.h"
 #include "lmms_export.h"
 #include "Lv2Basics.h"
@@ -109,4 +108,5 @@ class LMMS_EXPORT Lv2ViewBase : public LinkedModelGroupsView
 } // namespace lmms
 
 #endif // LMMS_HAVE_LV2
-#endif // LV2VIEWBASE_H
+
+#endif // LMMS_GUI_LV2_VIEW_BASE_H
diff --git a/include/MainApplication.h b/include/MainApplication.h
index 04bc82226de..98fcdef20d9 100644
--- a/include/MainApplication.h
+++ b/include/MainApplication.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MAINAPPLICATION_H
-#define MAINAPPLICATION_H
+#ifndef LMMS_GUI_MAIN_APPLICATION_H
+#define LMMS_GUI_MAIN_APPLICATION_H
 
 #include "lmmsconfig.h"
 
@@ -64,4 +64,4 @@ class MainApplication : public QApplication
 
 } // namespace lmms::gui
 
-#endif // MAINAPPLICATION_H
+#endif // LMMS_GUI_MAIN_APPLICATION_H
diff --git a/include/MainWindow.h b/include/MainWindow.h
index e093d108247..c4bbb676735 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MAIN_WINDOW_H
-#define MAIN_WINDOW_H
+#ifndef LMMS_GUI_MAIN_WINDOW_H
+#define LMMS_GUI_MAIN_WINDOW_H
 
 #include <QBasicTimer>
 #include <QTimer>
@@ -263,4 +263,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_MAIN_WINDOW_H
diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h
index 1def9d9c4dc..e709ffc8aad 100644
--- a/include/MemoryHelper.h
+++ b/include/MemoryHelper.h
@@ -21,9 +21,8 @@
  *
  */
 
-
-#ifndef MEMORY_HELPER_H
-#define MEMORY_HELPER_H
+#ifndef LMMS_MEMORY_HELPER_H
+#define LMMS_MEMORY_HELPER_H
 
 #include <cstddef>
 
@@ -47,5 +46,4 @@ class MemoryHelper {
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_MEMORY_HELPER_H
diff --git a/include/MemoryManager.h b/include/MemoryManager.h
index d50ad173d0c..fa2fe8110f4 100644
--- a/include/MemoryManager.h
+++ b/include/MemoryManager.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MEMORY_MANAGER_H
-#define MEMORY_MANAGER_H
+#ifndef LMMS_MEMORY_MANAGER_H
+#define LMMS_MEMORY_MANAGER_H
 
 #include <cstddef>
 #include <vector>
@@ -108,4 +108,4 @@ void MM_FREE(T* ptr)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MEMORY_MANAGER_H
diff --git a/include/MeterDialog.h b/include/MeterDialog.h
index 67dca2568ba..dca7e5de654 100644
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef METER_DIALOG_H
-#define METER_DIALOG_H
+#ifndef LMMS_GUI_METER_DIALOG_H
+#define LMMS_GUI_METER_DIALOG_H
 
 #include <QWidget>
 
@@ -54,4 +54,4 @@ class MeterDialog : public QWidget, public ModelView
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_METER_DIALOG_H
diff --git a/include/MeterModel.h b/include/MeterModel.h
index c2e715b79b9..6c0304e379f 100644
--- a/include/MeterModel.h
+++ b/include/MeterModel.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef METER_MODEL_H
-#define METER_MODEL_H
+#ifndef LMMS_METER_MODEL_H
+#define LMMS_METER_MODEL_H
 
 #include "AutomatableModel.h"
 
@@ -68,4 +68,4 @@ class LMMS_EXPORT MeterModel : public Model
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_METER_MODEL_H
diff --git a/include/MicroTimer.h b/include/MicroTimer.h
index ea74e964d50..cd03403dcdf 100644
--- a/include/MicroTimer.h
+++ b/include/MicroTimer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MICRO_TIMER_H
-#define MICRO_TIMER_H
+#ifndef LMMS_MICRO_TIMER_H
+#define LMMS_MICRO_TIMER_H
 
 #include <chrono>
 
@@ -48,4 +48,4 @@ class MicroTimer
 
 } // namespace lmms
 
-#endif // MICRO_TIMER_H
+#endif // LMMS_MICRO_TIMER_H
diff --git a/include/Microtuner.h b/include/Microtuner.h
index dff8f57730c..c92549581f9 100644
--- a/include/Microtuner.h
+++ b/include/Microtuner.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MICROTUNER_H
-#define MICROTUNER_H
+#ifndef LMMS_MICROTUNER_H
+#define LMMS_MICROTUNER_H
 
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
@@ -74,4 +74,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MICROTUNER_H
diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h
index 690587dd55a..0706a530f54 100644
--- a/include/MicrotunerConfig.h
+++ b/include/MicrotunerConfig.h
@@ -22,9 +22,8 @@
  *
  */
 
-#ifndef MICROTUNER_CONFIG_H
-#define MICROTUNER_CONFIG_H
-
+#ifndef LMMS_GUI_MICROTUNER_CONFIG_H
+#define LMMS_GUI_MICROTUNER_CONFIG_H
 
 #include <QWidget>
 
@@ -96,4 +95,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MICROTUNER_CONFIG_H
diff --git a/include/Midi.h b/include/Midi.h
index f75254d842f..21db021b3ef 100644
--- a/include/Midi.h
+++ b/include/Midi.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_H
-#define MIDI_H
+#ifndef LMMS_MIDI_H
+#define LMMS_MIDI_H
 
 #include "lmms_basics.h"
 
@@ -143,4 +143,4 @@ const int MidiMaxPitchBend = 16383;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_H
diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h
index 57a4772649f..345cdbd54d6 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_ALSA_RAW_H
-#define MIDI_ALSA_RAW_H
+#ifndef LMMS_MIDI_ALSA_RAW_H
+#define LMMS_MIDI_ALSA_RAW_H
 
 #include "lmmsconfig.h"
 
@@ -85,4 +85,4 @@ class MidiAlsaRaw : public QThread, public MidiClientRaw
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_MIDI_ALSA_RAW_H
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index fa287a409ef..006cdefc86b 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_ALSA_SEQ_H
-#define MIDI_ALSA_SEQ_H
+#ifndef LMMS_MIDI_ALSA_SEQ_H
+#define LMMS_MIDI_ALSA_SEQ_H
 
 #include "lmmsconfig.h"
 
@@ -158,5 +158,4 @@ private slots:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
-
+#endif // LMMS_MIDI_ALSA_SEQ_H
diff --git a/include/MidiApple.h b/include/MidiApple.h
index 794641e64f8..37d408d4d43 100644
--- a/include/MidiApple.h
+++ b/include/MidiApple.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef MIDI_APPLE_H
-#define MIDI_APPLE_H
+#ifndef LMMS_MIDI_APPLE_H
+#define LMMS_MIDI_APPLE_H
 
 #include "lmmsconfig.h"
 
@@ -155,5 +155,4 @@ class MidiApple : public QObject, public MidiClient
 
 #endif // LMMS_BUILD_APPLE
 
-
-#endif
+#endif // LMMS_MIDI_APPLE_H
diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h
index 59f1de020eb..4cb82b3d8eb 100644
--- a/include/MidiCCRackView.h
+++ b/include/MidiCCRackView.h
@@ -1,5 +1,29 @@
-#ifndef MIDI_CC_RACK_VIEW_H
-#define MIDI_CC_RACK_VIEW_H
+/*
+ * MidiCCRackView.h - declaration of the MIDI CC rack widget
+ *
+ * Copyright (c) 2020 Ian Caio <iancaio_dev/at/hotmail.com>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_GUI_MIDI_CC_RACK_VIEW_H
+#define LMMS_GUI_MIDI_CC_RACK_VIEW_H
 
 #include <QWidget>
 
@@ -49,4 +73,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_MIDI_CC_RACK_VIEW_H
diff --git a/include/MidiClient.h b/include/MidiClient.h
index 954cd5ef51f..3a64f709c53 100644
--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_CLIENT_H
-#define MIDI_CLIENT_H
+#ifndef LMMS_MIDI_CLIENT_H
+#define LMMS_MIDI_CLIENT_H
 
 #include <QStringList>
 #include <QVector>
@@ -173,5 +173,4 @@ class MidiClientRaw : public MidiClient
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_MIDI_CLIENT_H
diff --git a/include/MidiClip.h b/include/MidiClip.h
index 6433ba50725..bbb7d325d86 100644
--- a/include/MidiClip.h
+++ b/include/MidiClip.h
@@ -23,9 +23,8 @@
  *
  */
 
-#ifndef MIDI_CLIP_H
-#define MIDI_CLIP_H
-
+#ifndef LMMS_MIDI_CLIP_H
+#define LMMS_MIDI_CLIP_H
 
 #include "Clip.h"
 #include "Note.h"
@@ -155,4 +154,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_CLIP_H
diff --git a/include/MidiClipView.h b/include/MidiClipView.h
index 1a98097337c..6558688b49b 100644
--- a/include/MidiClipView.h
+++ b/include/MidiClipView.h
@@ -21,10 +21,10 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
-#ifndef MIDI_CLIP_VIEW_H
-#define MIDI_CLIP_VIEW_H
- 
+
+#ifndef LMMS_GUI_MIDI_CLIP_VIEW_H
+#define LMMS_GUI_MIDI_CLIP_VIEW_H
+
 #include <QStaticText>
 #include "ClipView.h"
 
@@ -43,7 +43,7 @@ class MidiClipView : public ClipView
 
 public:
 	MidiClipView( MidiClip* clip, TrackView* parent );
- 	~MidiClipView() override = default;
+	~MidiClipView() override = default;
 
 	Q_PROPERTY(QColor noteFillColor READ getNoteFillColor WRITE setNoteFillColor)
 	Q_PROPERTY(QColor noteBorderColor READ getNoteBorderColor WRITE setNoteBorderColor)
@@ -107,5 +107,5 @@ protected slots:
 } // namespace gui
 
 } // namespace lmms
- 
- #endif
+
+#endif // LMMS_GUI_MIDI_CLIP_VIEW_H
diff --git a/include/MidiController.h b/include/MidiController.h
index 500acc5f8dc..c4ef49590a6 100644
--- a/include/MidiController.h
+++ b/include/MidiController.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_CONTROLLER_H
-#define MIDI_CONTROLLER_H
+#ifndef LMMS_MIDI_CONTROLLER_H
+#define LMMS_MIDI_CONTROLLER_H
 
 #include <QWidget>
 
@@ -92,4 +92,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_CONTROLLER_H
diff --git a/include/MidiDummy.h b/include/MidiDummy.h
index 67a91e32673..b117bd13668 100644
--- a/include/MidiDummy.h
+++ b/include/MidiDummy.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_DUMMY_H
-#define MIDI_DUMMY_H
+#ifndef LMMS_MIDI_DUMMY_H
+#define LMMS_MIDI_DUMMY_H
 
 #include "MidiClient.h"
 
@@ -65,4 +65,4 @@ class MidiDummy : public MidiClientRaw
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_DUMMY_H
diff --git a/include/MidiEvent.h b/include/MidiEvent.h
index 6c2bfdd554c..956c33fb389 100644
--- a/include/MidiEvent.h
+++ b/include/MidiEvent.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_EVENT_H
-#define MIDI_EVENT_H
+#ifndef LMMS_MIDI_EVENT_H
+#define LMMS_MIDI_EVENT_H
 
 #include <cstdlib>
 #include "Midi.h"
@@ -221,4 +221,4 @@ class MidiEvent
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_EVENT_H
diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h
index 132a5fc42b5..1c45b3e3f5b 100644
--- a/include/MidiEventProcessor.h
+++ b/include/MidiEventProcessor.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_EVENT_PROCESSOR_H
-#define MIDI_EVENT_PROCESSOR_H
+#ifndef LMMS_MIDI_EVENT_PROCESSOR_H
+#define LMMS_MIDI_EVENT_PROCESSOR_H
 
 #include "MidiEvent.h"
 #include "MemoryManager.h"
@@ -49,4 +49,4 @@ class MidiEventProcessor
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_EVENT_PROCESSOR_H
diff --git a/include/MidiEventToByteSeq.h b/include/MidiEventToByteSeq.h
index f2e36f50a29..6490ae3857e 100644
--- a/include/MidiEventToByteSeq.h
+++ b/include/MidiEventToByteSeq.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDIEVENTTOBYTESEQ_H
-#define MIDIEVENTTOBYTESEQ_H
+#ifndef LMMS_MIDIEVENTTOBYTESEQ_H
+#define LMMS_MIDIEVENTTOBYTESEQ_H
 
 #include <cstddef>
 #include <cstdint>
@@ -51,4 +51,4 @@ std::size_t LMMS_EXPORT writeToByteSeq( const class MidiEvent& ev,
 
 } // namespace lmms
 
-#endif // MIDIEVENTTOBYTESEQ_H
+#endif // LMMS_MIDIEVENTTOBYTESEQ_H
diff --git a/include/MidiJack.h b/include/MidiJack.h
index a4a944b8159..e2b38e290b3 100644
--- a/include/MidiJack.h
+++ b/include/MidiJack.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDIJACK_H
-#define MIDIJACK_H
+#ifndef LMMS_MIDI_JACK_H
+#define LMMS_MIDI_JACK_H
 
 #include "lmmsconfig.h"
 
@@ -102,4 +102,4 @@ class MidiJack : public QThread, public MidiClientRaw
 
 #endif // LMMS_HAVE_JACK
 
-#endif // MIDIJACK_H
+#endif // LMMS_MIDI_JACK_H
diff --git a/include/MidiOss.h b/include/MidiOss.h
index 944359055dd..9acc0e8e63d 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_OSS_H
-#define MIDI_OSS_H
+#ifndef LMMS_MIDI_OSS_H
+#define LMMS_MIDI_OSS_H
 
 #include "lmmsconfig.h"
 
@@ -78,5 +78,4 @@ class MidiOss : public QThread, public MidiClientRaw
 
 #endif // LMMS_HAVE_OSS
 
-
-#endif
+#endif // LMMS_MIDI_OSS_H
diff --git a/include/MidiPort.h b/include/MidiPort.h
index 7ef9adf907e..6f759708e0c 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef MIDI_PORT_H
-#define MIDI_PORT_H
+#ifndef LMMS_MIDI_PORT_H
+#define LMMS_MIDI_PORT_H
 
 #include <QString>
 #include <QList>
@@ -190,4 +190,4 @@ using MidiPortList = QList<MidiPort*>;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_PORT_H
diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h
index 215a73d062e..0b3fc1b2fd3 100644
--- a/include/MidiPortMenu.h
+++ b/include/MidiPortMenu.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef MIDI_PORT_MENU_H
-#define MIDI_PORT_MENU_H
+#ifndef LMMS_GUI_MIDI_PORT_MENU_H
+#define LMMS_GUI_MIDI_PORT_MENU_H
 
 #include <QMenu>
 
@@ -61,4 +61,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIDI_PORT_MENU_H
diff --git a/include/MidiSetupWidget.h b/include/MidiSetupWidget.h
index 4021db1420d..a61b606ac21 100644
--- a/include/MidiSetupWidget.h
+++ b/include/MidiSetupWidget.h
@@ -22,9 +22,8 @@
  *
  */
 
-#ifndef MIDISETUPWIDGET_H
-#define MIDISETUPWIDGET_H
-
+#ifndef LMMS_GUI_MIDI_SETUP_WIDGET_H
+#define LMMS_GUI_MIDI_SETUP_WIDGET_H
 
 #include "TabWidget.h"
 
@@ -60,4 +59,4 @@ class MidiSetupWidget : public TabWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIDI_SETUP_WIDGET_H
diff --git a/include/MidiSndio.h b/include/MidiSndio.h
index 3ebd14d0577..5734745b909 100644
--- a/include/MidiSndio.h
+++ b/include/MidiSndio.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _MIDI_SNDIO_H
-#define _MIDI_SNDIO_H
+#ifndef LMMS_MIDI_SNDIO_H
+#define LMMS_MIDI_SNDIO_H
 
 #include "lmmsconfig.h"
 
@@ -75,4 +75,4 @@ class MidiSndio : public QThread, public MidiClientRaw
 
 #endif // LMMS_HAVE_SNDIO
 
-#endif	// _MIDI_SNDIO_H
+#endif // LMMS_MIDI_SNDIO_H
diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h
index 0f2bd0d5fe3..3a8edfbcd4a 100644
--- a/include/MidiWinMM.h
+++ b/include/MidiWinMM.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIDI_WINMM_H
-#define MIDI_WINMM_H
+#ifndef LMMS_MIDI_WINMM_H
+#define LMMS_MIDI_WINMM_H
 
 #include "lmmsconfig.h"
 
@@ -150,5 +150,4 @@ class MidiWinMM : public QObject, public MidiClient
 
 #endif // LMMS_BUILD_WIN32
 
-#endif
-
+#endif // LMMS_MIDI_WINMM_H
diff --git a/include/MixHelpers.h b/include/MixHelpers.h
index 6599b40ec0a..6458c65fcbe 100644
--- a/include/MixHelpers.h
+++ b/include/MixHelpers.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIX_HELPERS_H
-#define MIX_HELPERS_H
+#ifndef LMMS_MIX_HELPERS_H
+#define LMMS_MIX_HELPERS_H
 
 #include "lmms_basics.h"
 
@@ -81,5 +81,4 @@ void multiplyAndAddMultipliedJoined( sampleFrame* dst, const sample_t* srcLeft,
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_MIX_HELPERS_H
diff --git a/include/Mixer.h b/include/Mixer.h
index ecd864ae749..d84a1106328 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIXER_H
-#define MIXER_H
+#ifndef LMMS_MIXER_H
+#define LMMS_MIXER_H
 
 #include "Model.h"
 #include "EffectChain.h"
@@ -100,37 +100,37 @@ class MixerChannel : public ThreadableJob
 class MixerRoute : public QObject
 {
 	Q_OBJECT
-	public:		
-		MixerRoute( MixerChannel * from, MixerChannel * to, float amount );
-		~MixerRoute() override = default;
-		
+public:
+	MixerRoute( MixerChannel * from, MixerChannel * to, float amount );
+	~MixerRoute() override = default;
+
 	mix_ch_t senderIndex() const
 	{
 		return m_from->m_channelIndex;
 	}
-	
+
 	mix_ch_t receiverIndex() const
 	{
 		return m_to->m_channelIndex;
 	}
-	
+
 	FloatModel * amount()
 	{
 		return &m_amount;
 	}
-	
+
 	MixerChannel * sender() const
 	{
 		return m_from;
 	}
-	
+
 	MixerChannel * receiver() const
 	{
 		return m_to;
 	}
-	
+
 	void updateName();
-		
+
 	private:
 		MixerChannel * m_from;
 		MixerChannel * m_to;
@@ -226,4 +226,4 @@ class LMMS_EXPORT Mixer : public Model, public JournallingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIXER_H
diff --git a/include/MixerLine.h b/include/MixerLine.h
index decd5f3aa0c..68a61728c46 100644
--- a/include/MixerLine.h
+++ b/include/MixerLine.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef MIXERLINE_H
-#define MIXERLINE_H
+#ifndef LMMS_GUI_MIXER_LINE_H
+#define LMMS_GUI_MIXER_LINE_H
 
 #include <QWidget>
 
@@ -117,4 +117,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif // MIXERLINE_H
+#endif // LMMS_GUI_MIXER_LINE_H
diff --git a/include/MixerLineLcdSpinBox.h b/include/MixerLineLcdSpinBox.h
index bfd6cd5c962..1ae2813f292 100644
--- a/include/MixerLineLcdSpinBox.h
+++ b/include/MixerLineLcdSpinBox.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIXER_LINE_LCD_SPIN_BOX_H
-#define MIXER_LINE_LCD_SPIN_BOX_H
+#ifndef LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H
+#define LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H
 
 #include "LcdSpinBox.h"
 
@@ -56,4 +56,4 @@ class MixerLineLcdSpinBox : public LcdSpinBox
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H
diff --git a/include/MixerView.h b/include/MixerView.h
index a7b1b51919d..9dc5abeeea2 100644
--- a/include/MixerView.h
+++ b/include/MixerView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MIXER_VIEW_H
-#define MIXER_VIEW_H
+#ifndef LMMS_GUI_MIXER_VIEW_H
+#define LMMS_GUI_MIXER_VIEW_H
 
 #include <QWidget>
 #include <QHBoxLayout>
@@ -132,11 +132,11 @@ private slots:
 	QWidget * m_racksWidget;
 
 	void updateMaxChannelSelector();
-	
+
 	friend class MixerChannelView;
 } ;
 
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIXER_VIEW_H
diff --git a/include/Model.h b/include/Model.h
index 567d4ffd7b3..3e304297fc4 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MODEL_H
-#define MODEL_H
+#ifndef LMMS_MODEL_H
+#define LMMS_MODEL_H
 
 #include <QString>
 #include <QObject>
@@ -90,5 +90,4 @@ class LMMS_EXPORT Model : public QObject
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_MODEL_H
diff --git a/include/ModelView.h b/include/ModelView.h
index a858dc7ec1d..786a6812c21 100644
--- a/include/ModelView.h
+++ b/include/ModelView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MODEL_VIEW_H
-#define MODEL_VIEW_H
+#ifndef LMMS_GUI_MODEL_VIEW_H
+#define LMMS_GUI_MODEL_VIEW_H
 
 #include <QPointer>
 #include "Model.h"
@@ -85,5 +85,4 @@ class LMMS_EXPORT ModelView
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_MODEL_VIEW_H
diff --git a/include/ModelVisitor.h b/include/ModelVisitor.h
index 8805e30e21d..a4654e5291f 100644
--- a/include/ModelVisitor.h
+++ b/include/ModelVisitor.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MODELVISITOR_H
-#define MODELVISITOR_H
+#ifndef LMMS_MODEL_VISITOR_H
+#define LMMS_MODEL_VISITOR_H
 
 namespace lmms
 {
@@ -68,4 +68,4 @@ class ConstModelVisitor
 
 } // namespace lmms
 
-#endif // MODELVISITOR_H
+#endif // LMMS_MODEL_VISITOR_H
diff --git a/include/NStateButton.h b/include/NStateButton.h
index 4dac1a436df..a6b4c4d9ad1 100644
--- a/include/NStateButton.h
+++ b/include/NStateButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef NSTATE_BUTTON_H
-#define NSTATE_BUTTON_H
+#ifndef LMMS_GUI_NSTATE_BUTTON_H
+#define LMMS_GUI_NSTATE_BUTTON_H
 
 #include <QPixmap>
 #include <QVector>
@@ -78,4 +77,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_NSTATE_BUTTON_H
diff --git a/include/Note.h b/include/Note.h
index 464f3906f8e..15aeaa2ce62 100644
--- a/include/Note.h
+++ b/include/Note.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef NOTE_H
-#define NOTE_H
+#ifndef LMMS_NOTE_H
+#define LMMS_NOTE_H
 
 #include <optional>
 #include <QVector>
@@ -265,4 +265,4 @@ std::optional<NoteBounds> boundsForNotes(const NoteVector& notes);
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_NOTE_H
diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
index 4969fd84a63..29477705bc3 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef NOTE_PLAY_HANDLE_H
-#define NOTE_PLAY_HANDLE_H
+#ifndef LMMS_NOTE_PLAY_HANDLE_H
+#define LMMS_NOTE_PLAY_HANDLE_H
 
 #include <memory>
 
@@ -364,4 +364,4 @@ class NotePlayHandleManager
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_NOTE_PLAY_HANDLE_H
diff --git a/include/Oscillator.h b/include/Oscillator.h
index 8727ee39cc0..46d858032aa 100644
--- a/include/Oscillator.h
+++ b/include/Oscillator.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OSCILLATOR_H
-#define OSCILLATOR_H
+#ifndef LMMS_OSCILLATOR_H
+#define LMMS_OSCILLATOR_H
 
 #include <cassert>
 #include <fftw3.h>
@@ -313,4 +313,4 @@ class LMMS_EXPORT Oscillator
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_OSCILLATOR_H
diff --git a/include/OscillatorConstants.h b/include/OscillatorConstants.h
index 0450c2f1715..85ae38fe81c 100644
--- a/include/OscillatorConstants.h
+++ b/include/OscillatorConstants.h
@@ -1,5 +1,5 @@
 /*
- * OscillatorConstants.h - declaration of constants used in  Oscillator and SampleBuffer
+ * OscillatorConstants.h - declaration of constants used in Oscillator and SampleBuffer
  * for band limited wave tables
  *
  * Copyright (c) 2018      Dave French	<dave/dot/french3/at/googlemail/dot/com>
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OSCILLATORCONSTANTS_H
-#define OSCILLATORCONSTANTS_H
+#ifndef LMMS_OSCILLATORCONSTANTS_H
+#define LMMS_OSCILLATORCONSTANTS_H
 
 #include <array>
 
@@ -55,4 +55,4 @@ namespace lmms::OscillatorConstants
 
 } // namespace lmms::OscillatorConstants
 
-#endif // OSCILLATORCONSTANTS_H
+#endif // LMMS_OSCILLATORCONSTANTS_H
diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h
index db4cf2b4a28..209370ce034 100644
--- a/include/Oscilloscope.h
+++ b/include/Oscilloscope.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef OSCILLOSCOPE_H
-#define OSCILLOSCOPE_H
+#ifndef LMMS_GUI_OSCILLOSCOPE_H
+#define LMMS_GUI_OSCILLOSCOPE_H
 
 #include <QWidget>
 #include <QPixmap>
@@ -79,4 +78,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif // OSCILLOSCOPE_H
+#endif // LMMS_GUI_OSCILLOSCOPE_H
diff --git a/include/OutputSettings.h b/include/OutputSettings.h
index 03e3333acdf..12242e1bbe5 100644
--- a/include/OutputSettings.h
+++ b/include/OutputSettings.h
@@ -23,12 +23,11 @@
  *
  */
 
-#ifndef OUTPUT_SETTINGS_H
-#define OUTPUT_SETTINGS_H
+#ifndef LMMS_OUTPUT_SETTINGS_H
+#define LMMS_OUTPUT_SETTINGS_H
 
 #include "lmms_basics.h"
 
-
 namespace lmms
 {
 
@@ -120,4 +119,4 @@ class OutputSettings
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_OUTPUT_SETTINGS_H
diff --git a/include/PathUtil.h b/include/PathUtil.h
index 8b1ef10970b..9b410d014a0 100644
--- a/include/PathUtil.h
+++ b/include/PathUtil.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PATHUTIL_H
-#define PATHUTIL_H
+#ifndef LMMS_PATHUTIL_H
+#define LMMS_PATHUTIL_H
 
 #include "lmms_export.h"
 
@@ -70,4 +70,4 @@ namespace lmms::PathUtil
 
 } // namespace lmms::PathUtil
 
-#endif
+#endif // LMMS_PATHUTIL_H
diff --git a/include/PatternClip.h b/include/PatternClip.h
index f1d0e255770..968a0b198dc 100644
--- a/include/PatternClip.h
+++ b/include/PatternClip.h
@@ -21,10 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
 
-#ifndef PATTERN_CLIP_H
-#define PATTERN_CLIP_H
+#ifndef LMMS_PATTERN_CLIP_H
+#define LMMS_PATTERN_CLIP_H
 
 #include "Clip.h"
 
@@ -59,4 +58,4 @@ class PatternClip : public Clip
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_CLIP_H
diff --git a/include/PatternClipView.h b/include/PatternClipView.h
index d170e4bef1d..ee313f32ab2 100644
--- a/include/PatternClipView.h
+++ b/include/PatternClipView.h
@@ -21,11 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
-
-#ifndef PATTERN_CLIP_VIEW_H
-#define PATTERN_CLIP_VIEW_H
 
+#ifndef LMMS_GUI_PATTERN_CLIP_VIEW_H
+#define LMMS_GUI_PATTERN_CLIP_VIEW_H
 
 #include <QStaticText>
 
@@ -74,4 +72,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_CLIP_VIEW_H
diff --git a/include/PatternEditor.h b/include/PatternEditor.h
index ffe08e33507..5787f27ec12 100644
--- a/include/PatternEditor.h
+++ b/include/PatternEditor.h
@@ -22,10 +22,8 @@
  *
  */
 
-
-#ifndef PATTERN_EDITOR_H
-#define PATTERN_EDITOR_H
-
+#ifndef LMMS_GUI_PATTERN_EDITOR_H
+#define LMMS_GUI_PATTERN_EDITOR_H
 
 #include "Editor.h"
 #include "TrackContainerView.h"
@@ -99,4 +97,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_EDITOR_H
diff --git a/include/PatternStore.h b/include/PatternStore.h
index 7bd377941cc..fcb55e4117a 100644
--- a/include/PatternStore.h
+++ b/include/PatternStore.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef PATTERN_STORE_H
-#define PATTERN_STORE_H
+#ifndef LMMS_PATTERN_STORE_H
+#define LMMS_PATTERN_STORE_H
 
 #include "TrackContainer.h"
 #include "ComboBoxModel.h"
@@ -114,4 +113,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_STORE_H
diff --git a/include/PatternTrack.h b/include/PatternTrack.h
index 73ddd476674..1c0c610d255 100644
--- a/include/PatternTrack.h
+++ b/include/PatternTrack.h
@@ -22,10 +22,8 @@
  *
  */
 
-
-#ifndef PATTERN_TRACK_H
-#define PATTERN_TRACK_H
-
+#ifndef LMMS_PATTERN_TRACK_H
+#define LMMS_PATTERN_TRACK_H
 
 #include <QMap>
 
@@ -104,4 +102,4 @@ class LMMS_EXPORT PatternTrack : public Track
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_TRACK_H
diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h
index b6d33e444f7..09a1ba37be2 100644
--- a/include/PatternTrackView.h
+++ b/include/PatternTrackView.h
@@ -22,10 +22,8 @@
  *
  */
 
-
-#ifndef PATTERN_TRACK_VIEW_H
-#define PATTERN_TRACK_VIEW_H
-
+#ifndef LMMS_GUI_PATTERN_TRACK_VIEW_H
+#define LMMS_GUI_PATTERN_TRACK_VIEW_H
 
 #include "TrackView.h"
 
@@ -70,4 +68,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_TRACK_VIEW_H
diff --git a/include/PeakController.h b/include/PeakController.h
index 58d666dd0af..357e2a95d96 100644
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PEAK_CONTROLLER_H
-#define PEAK_CONTROLLER_H
+#ifndef LMMS_PEAK_CONTROLLER_H
+#define LMMS_PEAK_CONTROLLER_H
 
 #include "Controller.h"
 #include "ControllerDialog.h"
@@ -107,4 +107,4 @@ class PeakControllerDialog : public ControllerDialog
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PEAK_CONTROLLER_H
diff --git a/include/PerfLog.h b/include/PerfLog.h
index b8cc35f45b3..7b0b587f65f 100644
--- a/include/PerfLog.h
+++ b/include/PerfLog.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PERFLOG_H
-#define PERFLOG_H
+#ifndef LMMS_PERFLOG_H
+#define LMMS_PERFLOG_H
 
 #include <ctime>
 #include <QString>
@@ -77,4 +77,4 @@ class PerfLogTimer
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PERFLOG_H
diff --git a/include/Piano.h b/include/Piano.h
index 531bb65a666..96f37484031 100644
--- a/include/Piano.h
+++ b/include/Piano.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PIANO_H
-#define PIANO_H
+#ifndef LMMS_PIANO_H
+#define LMMS_PIANO_H
 
 #include "Note.h"
 #include "Model.h"
@@ -89,5 +89,4 @@ class Piano final : public Model
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_PIANO_H
diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index c1973f407b7..23fe7ddc6b9 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PIANO_ROLL_H
-#define PIANO_ROLL_H
+#ifndef LMMS_GUI_PIANO_ROLL_H
+#define LMMS_GUI_PIANO_ROLL_H
 
 #include <QVector>
 #include <QWidget>
@@ -573,4 +573,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PIANO_ROLL_H
diff --git a/include/PianoView.h b/include/PianoView.h
index 7f586809d27..6421ff4381c 100644
--- a/include/PianoView.h
+++ b/include/PianoView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PIANO_VIEW_H
-#define PIANO_VIEW_H
+#ifndef LMMS_GUI_PIANO_VIEW_H
+#define LMMS_GUI_PIANO_VIEW_H
 
 #include <QPixmap>
 #include <QScrollBar>
@@ -103,4 +103,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PIANO_VIEW_H
diff --git a/include/Pitch.h b/include/Pitch.h
index 6213ef3745f..1f721b5f10d 100644
--- a/include/Pitch.h
+++ b/include/Pitch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PITCH_H
-#define PITCH_H
+#ifndef LMMS_PITCH_H
+#define LMMS_PITCH_H
 
 #include <cstdint>
 
@@ -40,4 +40,4 @@ constexpr pitch_t DefaultPitch = 0;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PITCH_H
diff --git a/include/PixmapButton.h b/include/PixmapButton.h
index 6c37f911257..e8f546dc08e 100644
--- a/include/PixmapButton.h
+++ b/include/PixmapButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef PIXMAP_BUTTON_H
-#define PIXMAP_BUTTON_H
+#ifndef LMMS_GUI_PIXMAP_BUTTON_H
+#define LMMS_GUI_PIXMAP_BUTTON_H
 
 #include <QPixmap>
 
@@ -68,4 +67,4 @@ class LMMS_EXPORT PixmapButton : public AutomatableButton
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PIXMAP_BUTTON_H
diff --git a/include/PlayHandle.h b/include/PlayHandle.h
index 542d458710f..c64931ac051 100644
--- a/include/PlayHandle.h
+++ b/include/PlayHandle.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PLAY_HANDLE_H
-#define PLAY_HANDLE_H
+#ifndef LMMS_PLAY_HANDLE_H
+#define LMMS_PLAY_HANDLE_H
 
 #include <QList>
 #include <QMutex>
@@ -166,4 +166,4 @@ using ConstPlayHandleList = QList<const PlayHandle*>;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PLAY_HANDLE_H
diff --git a/include/Plugin.h b/include/Plugin.h
index 6a4d95bb456..b1982f98c44 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#ifndef LMMS_PLUGIN_H
+#define LMMS_PLUGIN_H
 
 #include <QStringList>
 #include <QMap>
@@ -312,4 +312,4 @@ class LMMS_EXPORT Plugin : public Model, public JournallingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PLUGIN_H
diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h
index 1f2041cf468..dd2e0a5cb1b 100644
--- a/include/PluginBrowser.h
+++ b/include/PluginBrowser.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PLUGIN_BROWSER_H
-#define PLUGIN_BROWSER_H
+#ifndef LMMS_GUI_PLUGIN_BROWSER_H
+#define LMMS_GUI_PLUGIN_BROWSER_H
 
 #include <QPixmap>
 
@@ -56,8 +56,6 @@ private slots:
 };
 
 
-
-
 class PluginDescWidget : public QWidget
 {
 	Q_OBJECT
@@ -85,4 +83,4 @@ class PluginDescWidget : public QWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PLUGIN_BROWSER_H
diff --git a/include/PluginFactory.h b/include/PluginFactory.h
index 8a8a22c685c..001ea190a19 100644
--- a/include/PluginFactory.h
+++ b/include/PluginFactory.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PLUGINFACTORY_H
-#define PLUGINFACTORY_H
+#ifndef LMMS_PLUGIN_FACTORY_H
+#define LMMS_PLUGIN_FACTORY_H
 
 #include <memory>
 #include <string>
@@ -112,4 +112,4 @@ LMMS_EXPORT PluginFactory* getPluginFactory();
 
 } // namespace lmms
 
-#endif // PLUGINFACTORY_H
+#endif // LMMS_PLUGIN_FACTORY_H
diff --git a/include/PluginIssue.h b/include/PluginIssue.h
index f0fa275f378..87e895113bc 100644
--- a/include/PluginIssue.h
+++ b/include/PluginIssue.h
@@ -22,13 +22,12 @@
  *
  */
 
-#ifndef PLUGINISSUE_H
-#define PLUGINISSUE_H
+#ifndef LMMS_PLUGIN_ISSUE_H
+#define LMMS_PLUGIN_ISSUE_H
 
 #include <QDebug>
 #include <string>
 
-
 namespace lmms
 {
 
@@ -85,5 +84,4 @@ QDebug operator<<(QDebug stream, const PluginIssue& iss);
 
 } // namespace lmms
 
-
-#endif // PLUGINISSUE_H
+#endif // LMMS_PLUGIN_ISSUE_H
diff --git a/include/PluginView.h b/include/PluginView.h
index 2c06b9ba23d..3c78cb00af2 100644
--- a/include/PluginView.h
+++ b/include/PluginView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PLUGIN_VIEW_H
-#define PLUGIN_VIEW_H
+#ifndef LMMS_GUI_PLUGIN_VIEW_H
+#define LMMS_GUI_PLUGIN_VIEW_H
 
 #include <QWidget>
 
@@ -47,4 +47,4 @@ class LMMS_EXPORT PluginView  : public QWidget, public ModelView
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PLUGIN_VIEW_H
diff --git a/include/PositionLine.h b/include/PositionLine.h
index cc1313e578e..3e798948fb3 100644
--- a/include/PositionLine.h
+++ b/include/PositionLine.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef POSITION_LINE_H
-#define POSITION_LINE_H
+#ifndef LMMS_GUI_POSITION_LINE_H
+#define LMMS_GUI_POSITION_LINE_H
 
 #include <QWidget>
 
@@ -51,4 +51,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_POSITION_LINE_H
diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h
index dfff0fc21d2..b8199a71bd5 100644
--- a/include/PresetPreviewPlayHandle.h
+++ b/include/PresetPreviewPlayHandle.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef PRESET_PREVIEW_PLAY_HANDLE_H
-#define PRESET_PREVIEW_PLAY_HANDLE_H
+#ifndef LMMS_PRESET_PREVIEW_PLAY_HANDLE_H
+#define LMMS_PRESET_PREVIEW_PLAY_HANDLE_H
 
 #include "NotePlayHandle.h"
 
@@ -69,4 +69,4 @@ class LMMS_EXPORT PresetPreviewPlayHandle : public PlayHandle
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PRESET_PREVIEW_PLAY_HANDLE_H
diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h
index 31a61755d8d..a4a26307846 100644
--- a/include/ProjectJournal.h
+++ b/include/ProjectJournal.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PROJECT_JOURNAL_H
-#define PROJECT_JOURNAL_H
+#ifndef LMMS_PROJECT_JOURNAL_H
+#define LMMS_PROJECT_JOURNAL_H
 
 #include <QHash>
 #include <QStack>
@@ -126,5 +126,4 @@ class ProjectJournal
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_PROJECT_JOURNAL_H
diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h
index 4b94766167d..861dcb4a847 100644
--- a/include/ProjectNotes.h
+++ b/include/ProjectNotes.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef PROJECT_NOTES_H
-#define PROJECT_NOTES_H
+#ifndef LMMS_GUI_PROJECT_NOTES_H
+#define LMMS_GUI_PROJECT_NOTES_H
 
 #include <QMainWindow>
 
@@ -94,4 +93,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PROJECT_NOTES_H
diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h
index 2ca20569b51..95a1f53ed29 100644
--- a/include/ProjectRenderer.h
+++ b/include/ProjectRenderer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef PROJECT_RENDERER_H
-#define PROJECT_RENDERER_H
+#ifndef LMMS_PROJECT_RENDERER_H
+#define LMMS_PROJECT_RENDERER_H
 
 #include "AudioFileDevice.h"
 #include "lmmsconfig.h"
@@ -103,4 +103,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PROJECT_RENDERER_H
diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h
index 5be259c9746..d9a459a433a 100644
--- a/include/ProjectVersion.h
+++ b/include/ProjectVersion.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef PROJECT_VERSION_H
-#define PROJECT_VERSION_H
+#ifndef LMMS_PROJECT_VERSION_H
+#define LMMS_PROJECT_VERSION_H
 
 #include <QString>
 #include <QStringList>
@@ -82,4 +81,4 @@ inline bool operator!=(const ProjectVersion & v1, const ProjectVersion & v2) { r
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PROJECT_VERSION_H
diff --git a/include/QuadratureLfo.h b/include/QuadratureLfo.h
index 42d4d32c03d..6f007e0725c 100644
--- a/include/QuadratureLfo.h
+++ b/include/QuadratureLfo.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef QUADRATURELFO_H
-#define QUADRATURELFO_H
+#ifndef LMMS_QUADRATURE_LFO_H
+#define LMMS_QUADRATURE_LFO_H
 
 #include "lmms_math.h"
 
@@ -100,4 +100,4 @@ class QuadratureLfo
 
 } // namespace lmms
 
-#endif // QUADRATURELFO_H
+#endif // LMMS_QUADRATURE_LFO_H
diff --git a/include/RaiiHelpers.h b/include/RaiiHelpers.h
index 0cfa2c4acbb..3108dc08024 100644
--- a/include/RaiiHelpers.h
+++ b/include/RaiiHelpers.h
@@ -19,10 +19,11 @@
  * License along with this program (see COPYING); if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
+ *
  */
 
-#ifndef RAII_HELPERS_H
-#define RAII_HELPERS_H
+#ifndef LMMS_RAII_HELPERS_H
+#define LMMS_RAII_HELPERS_H
 
 #include <cstddef>
 #include <memory>
@@ -63,4 +64,4 @@ using UniqueNullableResource = std::unique_ptr<T, NullableResourceDeleter<T, Nul
 
 } // namespace lmms
 
-#endif // RAII_HELPERS_H
+#endif // LMMS_RAII_HELPERS_H
diff --git a/include/RecentProjectsMenu.h b/include/RecentProjectsMenu.h
index ac363829843..27cdb68e5f0 100644
--- a/include/RecentProjectsMenu.h
+++ b/include/RecentProjectsMenu.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef RECENTPROJECTSMENU_H
-#define RECENTPROJECTSMENU_H
+#ifndef LMMS_GUI_RECENT_PROJECTS_MENU_H
+#define LMMS_GUI_RECENT_PROJECTS_MENU_H
 
 #include <QMenu>
 
@@ -45,4 +45,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif // RECENTPROJECTSMENU_H
+#endif // LMMS_GUI_RECENT_PROJECTS_MENU_H
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index 96c910d5d23..c5fcd7dd2c3 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef REMOTE_PLUGIN_H
-#define REMOTE_PLUGIN_H
+#ifndef LMMS_REMOTE_PLUGIN_H
+#define LMMS_REMOTE_PLUGIN_H
 
 #include "RemotePluginBase.h"
 #include "SharedMemory.h"
@@ -197,4 +197,4 @@ LMMS_EXPORT inline std::string QSTR_TO_STDSTR(QString const& qstr)
 
 } // namespace lmms
 
-#endif // REMOTE_PLUGIN_H
+#endif // LMMS_REMOTE_PLUGIN_H
diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h
index e309496bcfa..357be1bea25 100644
--- a/include/RemotePluginBase.h
+++ b/include/RemotePluginBase.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef REMOTE_PLUGIN_BASE_H
-#define REMOTE_PLUGIN_BASE_H
+#ifndef LMMS_REMOTE_PLUGIN_BASE_H
+#define LMMS_REMOTE_PLUGIN_BASE_H
 
 #include "MidiEvent.h"
 
@@ -673,4 +673,4 @@ class LMMS_EXPORT RemotePluginBase
 
 } // namespace lmms
 
-#endif // REMOTE_PLUGIN_BASE_H
+#endif // LMMS_REMOTE_PLUGIN_BASE_H
diff --git a/include/RemotePluginClient.h b/include/RemotePluginClient.h
index 4c5fcc06030..77eef68f035 100644
--- a/include/RemotePluginClient.h
+++ b/include/RemotePluginClient.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef REMOTE_PLUGIN_CLIENT_H
-#define REMOTE_PLUGIN_CLIENT_H
+#ifndef LMMS_REMOTE_PLUGIN_CLIENT_H
+#define LMMS_REMOTE_PLUGIN_CLIENT_H
 
 #include "RemotePluginBase.h"
 
@@ -355,4 +355,4 @@ void RemotePluginClient::doProcessing()
 
 } // namespace lmms
 
-#endif // REMOTE_PLUGIN_CLIENT_H
+#endif // LMMS_REMOTE_PLUGIN_CLIENT_H
diff --git a/include/RenameDialog.h b/include/RenameDialog.h
index b543963d760..1129f2bb570 100644
--- a/include/RenameDialog.h
+++ b/include/RenameDialog.h
@@ -23,13 +23,11 @@
  *
  */
 
-
-#ifndef RENAME_DIALOG_H
-#define RENAME_DIALOG_H
+#ifndef LMMS_GUI_RENAME_DIALOG_H
+#define LMMS_GUI_RENAME_DIALOG_H
 
 #include <QDialog>
 
-
 class QLineEdit;
 
 namespace lmms::gui
@@ -62,4 +60,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_RENAME_DIALOG_H
diff --git a/include/RenderManager.h b/include/RenderManager.h
index 9ec4c511e52..5240e96a830 100644
--- a/include/RenderManager.h
+++ b/include/RenderManager.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RENDER_MANAGER_H
-#define RENDER_MANAGER_H
+#ifndef LMMS_RENDER_MANAGER_H
+#define LMMS_RENDER_MANAGER_H
 
 #include <memory>
 
@@ -85,4 +85,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RENDER_MANAGER_H
diff --git a/include/RingBuffer.h b/include/RingBuffer.h
index c7db6b4e5a3..90a607a13a5 100644
--- a/include/RingBuffer.h
+++ b/include/RingBuffer.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef RINGBUFFER_H
-#define RINGBUFFER_H
+#ifndef LMMS_RING_BUFFER_H
+#define LMMS_RING_BUFFER_H
 
 #include <cmath>
 #include <QObject>
@@ -225,4 +224,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RING_BUFFER_H
diff --git a/include/RmsHelper.h b/include/RmsHelper.h
index 19b7da89cfc..fd2c0f9bbd2 100644
--- a/include/RmsHelper.h
+++ b/include/RmsHelper.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RMS_HELPER_H
-#define RMS_HELPER_H
+#ifndef LMMS_RMS_HELPER_H
+#define LMMS_RMS_HELPER_H
 
 #include "lmms_math.h"
 
@@ -98,4 +98,4 @@ class RmsHelper
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RMS_HELPER_H
diff --git a/include/RowTableView.h b/include/RowTableView.h
index 9934dbadeaf..3e1c1988d66 100644
--- a/include/RowTableView.h
+++ b/include/RowTableView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef ROW_TABLE_VIEW_H
-#define ROW_TABLE_VIEW_H
+#ifndef LMMS_GUI_ROW_TABLE_VIEW_H
+#define LMMS_GUI_ROW_TABLE_VIEW_H
 
 #include <QTableView>
 
@@ -56,4 +56,4 @@ class RowTableView : public QTableView
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_ROW_TABLE_VIEW_H
diff --git a/include/Rubberband.h b/include/Rubberband.h
index d35233b4f55..cfe36bb70ba 100644
--- a/include/Rubberband.h
+++ b/include/Rubberband.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef RUBBERBAND_H
-#define RUBBERBAND_H
+#ifndef LMMS_GUI_RUBBERBAND_H
+#define LMMS_GUI_RUBBERBAND_H
 
 #include <QRubberBand>
 #include <QVector>
@@ -94,5 +93,4 @@ class RubberBand : public QRubberBand
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_RUBBERBAND_H
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index f4d67859ea1..e2ed24b8190 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef SAMPLE_BUFFER_H
-#define SAMPLE_BUFFER_H
+#ifndef LMMS_SAMPLE_BUFFER_H
+#define LMMS_SAMPLE_BUFFER_H
 
 #include <memory>
 #include <QReadWriteLock>
@@ -356,4 +355,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_BUFFER_H
diff --git a/include/SampleClip.h b/include/SampleClip.h
index 51225ded8f4..c9e247328ca 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -21,9 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
-#ifndef SAMPLE_CLIP_H
-#define SAMPLE_CLIP_H
+
+#ifndef LMMS_SAMPLE_CLIP_H
+#define LMMS_SAMPLE_CLIP_H
 
 #include "Clip.h"
 
@@ -100,4 +100,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_CLIP_H
diff --git a/include/SampleClipView.h b/include/SampleClipView.h
index 74873dca7a9..b3f53d79092 100644
--- a/include/SampleClipView.h
+++ b/include/SampleClipView.h
@@ -22,13 +22,11 @@
  *
  */
 
-#ifndef SAMPLE_CLIP_VIEW_H
-#define SAMPLE_CLIP_VIEW_H
+#ifndef LMMS_GUI_SAMPLE_CLIP_VIEW_H
+#define LMMS_GUI_SAMPLE_CLIP_VIEW_H
 
 #include "ClipView.h"
 
-
-
 namespace lmms
 {
 
@@ -73,4 +71,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SAMPLE_CLIP_VIEW_H
diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h
index 69ee3b38d05..d016fcf0b48 100644
--- a/include/SamplePlayHandle.h
+++ b/include/SamplePlayHandle.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SAMPLE_PLAY_HANDLE_H
-#define SAMPLE_PLAY_HANDLE_H
+#ifndef LMMS_SAMPLE_PLAY_HANDLE_H
+#define LMMS_SAMPLE_PLAY_HANDLE_H
 
 #include "SampleBuffer.h"
 #include "AutomatableModel.h"
@@ -100,4 +100,4 @@ class SamplePlayHandle : public PlayHandle
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_PLAY_HANDLE_H
diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h
index 5b23f534531..de1ca19ba1a 100644
--- a/include/SampleRecordHandle.h
+++ b/include/SampleRecordHandle.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef SAMPLE_RECORD_HANDLE_H
-#define SAMPLE_RECORD_HANDLE_H
+#ifndef LMMS_SAMPLE_RECORD_HANDLE_H
+#define LMMS_SAMPLE_RECORD_HANDLE_H
 
 #include <QList>
 #include <QPair>
@@ -75,4 +74,4 @@ class SampleRecordHandle : public PlayHandle
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_RECORD_HANDLE_H
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index 8f424178a4d..f71f01cd1a7 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -22,9 +22,8 @@
  *
  */
 
-#ifndef SAMPLE_TRACK_H
-#define SAMPLE_TRACK_H
-
+#ifndef LMMS_SAMPLE_TRACK_H
+#define LMMS_SAMPLE_TRACK_H
 
 #include "AudioPort.h"
 #include "Track.h"
@@ -110,4 +109,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
\ No newline at end of file
+#endif // LMMS_SAMPLE_TRACK_H
diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h
index 9921aa735ba..b586df15edc 100644
--- a/include/SampleTrackView.h
+++ b/include/SampleTrackView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SAMPLE_TRACK_VIEW_H
-#define SAMPLE_TRACK_VIEW_H
+#ifndef LMMS_GUI_SAMPLE_TRACK_VIEW_H
+#define LMMS_GUI_SAMPLE_TRACK_VIEW_H
 
 
 #include "TrackView.h"
@@ -109,4 +109,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
\ No newline at end of file
+#endif // LMMS_GUI_SAMPLE_TRACK_VIEW_H
diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h
index d302b2c44f0..c2a722d53ab 100644
--- a/include/SampleTrackWindow.h
+++ b/include/SampleTrackWindow.h
@@ -21,12 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
- 
-#ifndef SAMPLE_TRACK_WINDOW_H
-#define SAMPLE_TRACK_WINDOW_H
-
 
+#ifndef LMMS_GUI_SAMPLE_TRACK_WINDOW_H
+#define LMMS_GUI_SAMPLE_TRACK_WINDOW_H
 
 #include <QWidget>
 
@@ -43,7 +40,7 @@ class EffectRackView;
 class Knob;
 class MixerLineLcdSpinBox;
 class SampleTrackView;
- 
+
 
 class SampleTrackWindow : public QWidget, public ModelView, public SerializingObjectHook
 {
@@ -102,5 +99,4 @@ public slots:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_SAMPLE_TRACK_WINDOW_H
diff --git a/include/Scale.h b/include/Scale.h
index 96159a53c6d..eeae5eb92a7 100644
--- a/include/Scale.h
+++ b/include/Scale.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SCALE_H
-#define SCALE_H
+#ifndef LMMS_SCALE_H
+#define LMMS_SCALE_H
 
 #include <cstdint>
 #include <vector>
@@ -89,4 +89,4 @@ class Scale : public QObject, public SerializingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SCALE_H
diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h
index ec4a90db37a..f1ee2dbca56 100644
--- a/include/SendButtonIndicator.h
+++ b/include/SendButtonIndicator.h
@@ -21,8 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
-#ifndef SENDBUTTONINDICATOR_H
-#define SENDBUTTONINDICATOR_H
+
+#ifndef LMMS_GUI_SEND_BUTTON_INDICATOR_H
+#define LMMS_GUI_SEND_BUTTON_INDICATOR_H
 
 #include <QLabel>
 
@@ -63,4 +64,4 @@ class SendButtonIndicator : public QLabel
 
 } // namespace lmms
 
-#endif // SENDBUTTONINDICATOR_H
+#endif // LMMS_GUI_SEND_BUTTON_INDICATOR_H
diff --git a/include/SerializingObject.h b/include/SerializingObject.h
index e32d5d04663..8f75d069e9e 100644
--- a/include/SerializingObject.h
+++ b/include/SerializingObject.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SERIALIZING_OBJECT_H
-#define SERIALIZING_OBJECT_H
+#ifndef LMMS_SERIALIZING_OBJECT_H
+#define LMMS_SERIALIZING_OBJECT_H
 
 #include <QString>
 
@@ -101,5 +101,4 @@ class SerializingObjectHook
 
 } // namespace lmms
 
-#endif
-
+#endif // LMMS_SERIALIZING_OBJECT_H
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
index 8973938bf1b..6a9986d648c 100644
--- a/include/SetupDialog.h
+++ b/include/SetupDialog.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef SETUP_DIALOG_H
-#define SETUP_DIALOG_H
+#ifndef LMMS_GUI_SETUP_DIALOG_H
+#define LMMS_GUI_SETUP_DIALOG_H
 
 #include <QDialog>
 #include <QMap>
@@ -214,4 +213,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SETUP_DIALOG_H
diff --git a/include/SharedMemory.h b/include/SharedMemory.h
index 32a40ff2590..c2790c78bfd 100644
--- a/include/SharedMemory.h
+++ b/include/SharedMemory.h
@@ -19,10 +19,11 @@
  * License along with this program (see COPYING); if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
+ *
  */
 
-#ifndef SHARED_MEMORY_H
-#define SHARED_MEMORY_H
+#ifndef LMMS_SHARED_MEMORY_H
+#define LMMS_SHARED_MEMORY_H
 
 #include <memory>
 #include <string>
@@ -148,4 +149,4 @@ class SharedMemory<T[]>
 
 } // namespace lmms
 
-#endif // SHARED_MEMORY_H
+#endif // LMMS_SHARED_MEMORY_H
diff --git a/include/SideBar.h b/include/SideBar.h
index 8755c660a3a..0dab7abd701 100644
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SIDE_BAR_H
-#define SIDE_BAR_H
+#ifndef LMMS_GUI_SIDE_BAR_H
+#define LMMS_GUI_SIDE_BAR_H
 
 #include <QMap>
 #include <QButtonGroup>
@@ -60,4 +60,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SIDE_BAR_H
diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h
index 5df3ccb7a3f..caf955327aa 100644
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SIDE_BAR_WIDGET_H
-#define SIDE_BAR_WIDGET_H
+#ifndef LMMS_GUI_SIDE_BAR_WIDGET_H
+#define LMMS_GUI_SIDE_BAR_WIDGET_H
 
 #include <QPixmap>
 #include <QVBoxLayout>
@@ -90,4 +90,4 @@ class SideBarWidget : public QWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SIDE_BAR_WIDGET_H
diff --git a/include/Song.h b/include/Song.h
index eacd2114fdd..c13fe0e9604 100644
--- a/include/Song.h
+++ b/include/Song.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SONG_H
-#define SONG_H
+#ifndef LMMS_SONG_H
+#define LMMS_SONG_H
 
 #include <memory>
 
@@ -532,4 +532,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SONG_H
diff --git a/include/SongEditor.h b/include/SongEditor.h
index ea57cc125b7..081b2cb61f6 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -23,10 +23,8 @@
  *
  */
 
-
-#ifndef SONG_EDITOR_H
-#define SONG_EDITOR_H
-
+#ifndef LMMS_GUI_SONG_EDITOR_H
+#define LMMS_GUI_SONG_EDITOR_H
 
 #include "Editor.h"
 #include "TrackContainerView.h"
@@ -228,4 +226,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SONG_EDITOR_H
diff --git a/include/StepRecorder.h b/include/StepRecorder.h
index b89fadb1544..456e69a6978 100644
--- a/include/StepRecorder.h
+++ b/include/StepRecorder.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef STEP_RECORDER_H
-#define STEP_RECORDER_H
+#ifndef LMMS_STEP_RECORDER_H
+#define LMMS_STEP_RECORDER_H
 
 #include <QColor>
 #include <QElapsedTimer>
@@ -152,4 +152,4 @@ class StepRecorder : public QObject
 
 } // namespace lmms
 
-#endif //STEP_RECORDER_H
+#endif // LMMS_STEP_RECORDER_H
diff --git a/include/StepRecorderWidget.h b/include/StepRecorderWidget.h
index 4067b00011c..48f1e0fb0cf 100644
--- a/include/StepRecorderWidget.h
+++ b/include/StepRecorderWidget.h
@@ -19,9 +19,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
-#ifndef STEP_RECOREDER_WIDGET_H
-#define STEP_RECOREDER_WIDGET_H
 
+#ifndef LMMS_GUI_STEP_RECOREDER_WIDGET_H
+#define LMMS_GUI_STEP_RECOREDER_WIDGET_H
 
 #include <QWidget>
 #include <QColor>
@@ -95,4 +95,4 @@ class StepRecorderWidget : public QWidget
 
 } // namespace lmms::gui
 
-#endif //STEP_RECOREDER_WIDGET_H
+#endif // LMMS_GUI_STEP_RECOREDER_WIDGET_H
diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h
index e58b88f90fe..c43996d76fb 100644
--- a/include/StringPairDrag.h
+++ b/include/StringPairDrag.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef STRING_PAIR_DRAG_H
-#define STRING_PAIR_DRAG_H
+#ifndef LMMS_GUI_STRING_PAIR_DRAG_H
+#define LMMS_GUI_STRING_PAIR_DRAG_H
 
 #include <QDrag>
 #include <QDragEnterEvent>
@@ -55,4 +55,4 @@ class LMMS_EXPORT StringPairDrag : public QDrag
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_STRING_PAIR_DRAG_H
diff --git a/include/SubWindow.h b/include/SubWindow.h
index 3c73a9ddefa..fdda6de4280 100644
--- a/include/SubWindow.h
+++ b/include/SubWindow.h
@@ -23,8 +23,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
-#ifndef SUBWINDOW_H
-#define SUBWINDOW_H
+
+#ifndef LMMS_GUI_SUBWINDOW_H
+#define LMMS_GUI_SUBWINDOW_H
 
 #include <QMdiSubWindow>
 #include <QString>
@@ -104,4 +105,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SUBWINDOW_H
diff --git a/include/SweepOscillator.h b/include/SweepOscillator.h
index f113ea0fad7..b5521da3bf1 100644
--- a/include/SweepOscillator.h
+++ b/include/SweepOscillator.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SWEEP_OSCILLATOR_H
-#define SWEEP_OSCILLATOR_H
+#ifndef LMMS_SWEEP_OSCILLATOR_H
+#define LMMS_SWEEP_OSCILLATOR_H
 
 #include "Oscillator.h"
 #include "DspEffectLibrary.h"
@@ -69,4 +69,4 @@ class SweepOscillator
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SWEEP_OSCILLATOR_H
diff --git a/include/TabBar.h b/include/TabBar.h
index 2395e15f583..fa27032873c 100644
--- a/include/TabBar.h
+++ b/include/TabBar.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TAB_BAR_H
-#define TAB_BAR_H
+#ifndef LMMS_GUI_TAB_BAR_H
+#define LMMS_GUI_TAB_BAR_H
 
 #include <QBoxLayout>
 #include <QMap>
@@ -91,4 +90,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_BAR_H
diff --git a/include/TabButton.h b/include/TabButton.h
index 938230a91a8..c12a2037f1d 100644
--- a/include/TabButton.h
+++ b/include/TabButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TAB_BUTTON_H
-#define TAB_BUTTON_H
+#ifndef LMMS_GUI_TAB_BUTTON_H
+#define LMMS_GUI_TAB_BUTTON_H
 
 #include <QPushButton>
 
@@ -67,4 +66,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_BUTTON_H
diff --git a/include/TabWidget.h b/include/TabWidget.h
index 27a35d2a88a..d28537df8fe 100644
--- a/include/TabWidget.h
+++ b/include/TabWidget.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TAB_WIDGET_H
-#define TAB_WIDGET_H
+#ifndef LMMS_GUI_TAB_WIDGET_H
+#define LMMS_GUI_TAB_WIDGET_H
 
 #include <QWidget>
 #include <QMap>
@@ -112,4 +111,4 @@ class TabWidget : public QWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_WIDGET_H
diff --git a/include/TemplatesMenu.h b/include/TemplatesMenu.h
index 7f425bd2f33..6e527c5710e 100644
--- a/include/TemplatesMenu.h
+++ b/include/TemplatesMenu.h
@@ -21,8 +21,9 @@
  * Boston, MA 02110-1301 USA.
  *
  */
-#ifndef TEMPLATESMENU_H
-#define TEMPLATESMENU_H
+
+#ifndef LMMS_GUI_TEMPLATES_MENU_H
+#define LMMS_GUI_TEMPLATES_MENU_H
 
 #include <QDir>
 #include <QMenu>
@@ -49,4 +50,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif // TEMPLATESMENU_H
+#endif // LMMS_GUI_TEMPLATES_MENU_H
diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h
index 25a3b7e3bef..a8e2eeb7e62 100644
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TEMPO_SYNC_KNOB_H
-#define TEMPO_SYNC_KNOB_H
+#ifndef LMMS_GUI_TEMPO_SYNC_KNOB_H
+#define LMMS_GUI_TEMPO_SYNC_KNOB_H
 
 #include <QPixmap>
 #include <QPointer>
@@ -84,4 +84,4 @@ protected slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TEMPO_SYNC_KNOB_H
diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h
index 1a18486ff61..59d7b5dc8e7 100644
--- a/include/TempoSyncKnobModel.h
+++ b/include/TempoSyncKnobModel.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TEMPO_SYNC_KNOB_MODEL_H
-#define TEMPO_SYNC_KNOB_MODEL_H
+#ifndef LMMS_TEMPO_SYNC_KNOB_MODEL_H
+#define LMMS_TEMPO_SYNC_KNOB_MODEL_H
 
 #include "MeterModel.h"
 
@@ -115,4 +115,4 @@ protected slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TEMPO_SYNC_KNOB_MODEL_H
diff --git a/include/TextFloat.h b/include/TextFloat.h
index 9fdabc06bfe..50dde98550d 100644
--- a/include/TextFloat.h
+++ b/include/TextFloat.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TEXT_FLOAT_H
-#define TEXT_FLOAT_H
+#ifndef LMMS_GUI_TEXT_FLOAT_H
+#define LMMS_GUI_TEXT_FLOAT_H
 
 #include <QWidget>
 #include <QPixmap>
@@ -82,4 +81,4 @@ class LMMS_EXPORT TextFloat : public QWidget
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TEXT_FLOAT_H
diff --git a/include/ThreadableJob.h b/include/ThreadableJob.h
index 8e714ae19cf..9d5a0beee0f 100644
--- a/include/ThreadableJob.h
+++ b/include/ThreadableJob.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef THREADABLE_JOB_H
-#define THREADABLE_JOB_H
+#ifndef LMMS_THREADABLE_JOB_H
+#define LMMS_THREADABLE_JOB_H
 
 #include "lmms_basics.h"
 
@@ -90,4 +90,4 @@ class ThreadableJob
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_THREADABLE_JOB_H
diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h
index 89466697096..9e74b57aa4c 100644
--- a/include/TimeDisplayWidget.h
+++ b/include/TimeDisplayWidget.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TIME_DISPLAY_WIDGET_H
-#define TIME_DISPLAY_WIDGET_H
+#ifndef LMMS_GUI_TIME_DISPLAY_WIDGET_H
+#define LMMS_GUI_TIME_DISPLAY_WIDGET_H
 
 #include <QWidget>
 #include <QHBoxLayout>
@@ -71,4 +71,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif // TIME_DISPLAY_WIDGET_H
+#endif // LMMS_GUI_TIME_DISPLAY_WIDGET_H
diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index bada25640a1..0f9b1e23a09 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TIMELINE_H
-#define TIMELINE_H
+#ifndef LMMS_GUI_TIMELINE_WIDGET_H
+#define LMMS_GUI_TIMELINE_WIDGET_H
 
 #include <QWidget>
 
@@ -262,4 +261,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TIMELINE_WIDGET_H
diff --git a/include/TimePos.h b/include/TimePos.h
index 808eede2587..b86d8eb0fa6 100644
--- a/include/TimePos.h
+++ b/include/TimePos.h
@@ -23,10 +23,8 @@
  *
  */
 
-
-#ifndef TIME_POS_H
-#define TIME_POS_H
-
+#ifndef LMMS_TIME_POS_H
+#define LMMS_TIME_POS_H
 
 #include "lmms_export.h"
 #include "lmms_basics.h"
@@ -118,4 +116,4 @@ class LMMS_EXPORT TimePos
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TIME_POS_H
diff --git a/include/ToolButton.h b/include/ToolButton.h
index c173a9052e4..6d947f7ad98 100644
--- a/include/ToolButton.h
+++ b/include/ToolButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TOOL_BUTTON_H
-#define TOOL_BUTTON_H
+#ifndef LMMS_GUI_TOOL_BUTTON_H
+#define LMMS_GUI_TOOL_BUTTON_H
 
 #include <QToolButton>
 
@@ -49,5 +48,4 @@ class ToolButton : public QToolButton
 
 } // namespace lmms::gui
 
-#endif
-
+#endif // LMMS_GUI_TOOL_BUTTON_H
diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h
index 38f4d87b1ba..e64afd055c9 100644
--- a/include/ToolPlugin.h
+++ b/include/ToolPlugin.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TOOL_PLUGIN_H
-#define TOOL_PLUGIN_H
+#ifndef LMMS_TOOL_PLUGIN_H
+#define LMMS_TOOL_PLUGIN_H
 
 #include "Plugin.h"
 
@@ -50,4 +50,4 @@ class LMMS_EXPORT ToolPlugin : public Plugin
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TOOL_PLUGIN_H
diff --git a/include/ToolPluginView.h b/include/ToolPluginView.h
index 0b702fd1bf7..b0654f125a3 100644
--- a/include/ToolPluginView.h
+++ b/include/ToolPluginView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TOOL_PLUGIN_VIEW_H
-#define TOOL_PLUGIN_VIEW_H
+#ifndef LMMS_GUI_TOOL_PLUGIN_VIEW_H
+#define LMMS_GUI_TOOL_PLUGIN_VIEW_H
 
 #include "PluginView.h"
 
@@ -49,4 +49,4 @@ class LMMS_EXPORT ToolPluginView : public PluginView
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TOOL_PLUGIN_VIEW_H
diff --git a/include/Track.h b/include/Track.h
index 8d756c914be..ff3c1ae0078 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -22,9 +22,8 @@
  *
  */
 
-#ifndef TRACK_H
-#define TRACK_H
-
+#ifndef LMMS_TRACK_H
+#define LMMS_TRACK_H
 
 #include <QVector>
 #include <QColor>
@@ -257,4 +256,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TRACK_H
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index ca9964e300a..f99273ba2b9 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TRACK_CONTAINER_H
-#define TRACK_CONTAINER_H
+#ifndef LMMS_TRACK_CONTAINER_H
+#define LMMS_TRACK_CONTAINER_H
 
 #include <QReadWriteLock>
 
@@ -118,4 +118,4 @@ class LMMS_EXPORT TrackContainer : public Model, public JournallingObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TRACK_CONTAINER_H
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index 444420d98d4..d53291c33d7 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TRACK_CONTAINER_VIEW_H
-#define TRACK_CONTAINER_VIEW_H
+#ifndef LMMS_GUI_TRACK_CONTAINER_VIEW_H
+#define LMMS_GUI_TRACK_CONTAINER_VIEW_H
 
 #include <QVector>
 #include <QScrollArea>
@@ -219,4 +218,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TRACK_CONTAINER_VIEW_H
diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index f4a44d2a645..1a3e14a0e4d 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef TRACK_CONTENT_WIDGET_H
-#define TRACK_CONTENT_WIDGET_H
+#ifndef LMMS_GUI_TRACK_CONTENT_WIDGET_H
+#define LMMS_GUI_TRACK_CONTENT_WIDGET_H
 
 #include <QWidget>
 
@@ -149,4 +149,4 @@ public slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TRACK_CONTENT_WIDGET_H
diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h
index 1a8d05e712c..0d1c6e163f4 100644
--- a/include/TrackLabelButton.h
+++ b/include/TrackLabelButton.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TRACK_LABEL_BUTTON_H
-#define TRACK_LABEL_BUTTON_H
+#ifndef LMMS_GUI_TRACK_LABEL_BUTTON_H
+#define LMMS_GUI_TRACK_LABEL_BUTTON_H
 
 #include <QToolButton>
 
@@ -72,4 +71,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_LABEL_BUTTON_H
diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h
index edd9796ac28..4dbb5353c5f 100644
--- a/include/TrackOperationsWidget.h
+++ b/include/TrackOperationsWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef TRACK_OPERATIONS_WIDGET_H
-#define TRACK_OPERATIONS_WIDGET_H
+#ifndef LMMS_GUI_TRACK_OPERATIONS_WIDGET_H
+#define LMMS_GUI_TRACK_OPERATIONS_WIDGET_H
 
 #include <QWidget>
 
@@ -80,4 +80,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_OPERATIONS_WIDGET_H
diff --git a/include/TrackRenameLineEdit.h b/include/TrackRenameLineEdit.h
index 4b13ff9b749..2f6a1f4fbb1 100644
--- a/include/TrackRenameLineEdit.h
+++ b/include/TrackRenameLineEdit.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef TRACK_RENAME_LINE_EDIT_H
-#define TRACK_RENAME_LINE_EDIT_H
+#ifndef LMMS_GUI_TRACK_RENAME_LINE_EDIT_H
+#define LMMS_GUI_TRACK_RENAME_LINE_EDIT_H
 
 #include <QLineEdit>
 
@@ -48,4 +47,4 @@ class TrackRenameLineEdit : public QLineEdit
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_RENAME_LINE_EDIT_H
diff --git a/include/TrackView.h b/include/TrackView.h
index 4b02c8015f8..efa4f4a0a53 100644
--- a/include/TrackView.h
+++ b/include/TrackView.h
@@ -22,10 +22,8 @@
  *
  */
 
-
-
-#ifndef TRACK_VIEW_H
-#define TRACK_VIEW_H
+#ifndef LMMS_GUI_TRACK_VIEW_H
+#define LMMS_GUI_TRACK_VIEW_H
 
 #include <QWidget>
 
@@ -34,7 +32,6 @@
 #include "TrackContentWidget.h"
 #include "TrackOperationsWidget.h"
 
-
 class QMenu;
 
 namespace lmms
@@ -179,4 +176,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TRACK_VIEW_H
diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h
index 950ad06f07a..683d17fb1ff 100644
--- a/include/ValueBuffer.h
+++ b/include/ValueBuffer.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VALUE_BUFFER_H
-#define VALUE_BUFFER_H
+#ifndef LMMS_VALUE_BUFFER_H
+#define LMMS_VALUE_BUFFER_H
 
 #include <vector>
 
@@ -57,4 +57,4 @@ class LMMS_EXPORT ValueBuffer : public std::vector<float>
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VALUE_BUFFER_H
diff --git a/include/VersionedSaveDialog.h b/include/VersionedSaveDialog.h
index 79ab516b0c2..6d707cd51bd 100644
--- a/include/VersionedSaveDialog.h
+++ b/include/VersionedSaveDialog.h
@@ -24,9 +24,8 @@
  *
  */
 
-
-#ifndef VERSIONEDSAVEDIALOG_H
-#define VERSIONEDSAVEDIALOG_H
+#ifndef LMMS_GUI_VERSIONED_SAVE_DIALOG_H
+#define LMMS_GUI_VERSIONED_SAVE_DIALOG_H
 
 #include "FileDialog.h"
 #include "Song.h"
@@ -69,4 +68,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif // VERSIONEDSAVEDIALOG_H
+#endif // LMMS_GUI_VERSIONED_SAVE_DIALOG_H
diff --git a/include/VstSyncController.h b/include/VstSyncController.h
index c70bc85c8bc..d3c6af0510b 100644
--- a/include/VstSyncController.h
+++ b/include/VstSyncController.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VST_SYNC_CONTROLLER_H
-#define VST_SYNC_CONTROLLER_H
+#ifndef LMMS_VST_SYNC_CONTROLLER_H
+#define LMMS_VST_SYNC_CONTROLLER_H
 
 #include <QObject>
 
@@ -62,4 +62,4 @@ private slots:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VST_SYNC_CONTROLLER_H
diff --git a/include/VstSyncData.h b/include/VstSyncData.h
index baf3fa7a84e..480bc7fb486 100644
--- a/include/VstSyncData.h
+++ b/include/VstSyncData.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VST_SYNC_DATA_H
-#define VST_SYNC_DATA_H
+#ifndef LMMS_VST_SYNC_DATA_H
+#define LMMS_VST_SYNC_DATA_H
 
 namespace lmms
 {
@@ -61,4 +61,4 @@ struct VstSyncData
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VST_SYNC_DATA_H
diff --git a/include/aeffectx.h b/include/aeffectx.h
index a06567ba750..2c69464cc5f 100644
--- a/include/aeffectx.h
+++ b/include/aeffectx.h
@@ -22,7 +22,6 @@
  *
  */
 
-
 #ifndef AEFFECTX_H
 #define AEFFECTX_H
 
@@ -298,4 +297,4 @@ class VstTimeInfo
 
 using audioMasterCallback = intptr_t (VST_CALL_CONV*)(AEffect*, int32_t, int32_t, intptr_t, void*, float);
 
-#endif
+#endif // AEFFECTX_H
diff --git a/include/base64.h b/include/base64.h
index f52d90d136e..42066d56436 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _BASE64_H
-#define _BASE64_H
+#ifndef LMMS_BASE64_H
+#define LMMS_BASE64_H
 
 #include <QByteArray>
 #include <QString>
@@ -53,4 +53,4 @@ namespace lmms::base64
 
 } // namespace lmms::base64
 
-#endif
+#endif // LMMS_BASE64_H
diff --git a/include/debug.h b/include/debug.h
index f2ea29cc159..7cf51acaa1a 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef LMMS_DEBUG_H
+#define LMMS_DEBUG_H
 
 #include "lmmsconfig.h"
 
@@ -39,4 +38,4 @@
 #include <cstdio>
 
 
-#endif
+#endif // LMMS_DEBUG_H
diff --git a/include/denormals.h b/include/denormals.h
index e99e767a39c..92b84c7dd69 100644
--- a/include/denormals.h
+++ b/include/denormals.h
@@ -1,8 +1,8 @@
-// Denormals stripping. 
+// Denormals stripping.
 // These snippets should be common enough to be considered public domain.
 
-#ifndef DENORMALS_H
-#define DENORMALS_H
+#ifndef LMMS_DENORMALS_H
+#define LMMS_DENORMALS_H
 
 #ifdef __SSE__
 #include <immintrin.h>
@@ -35,7 +35,7 @@ int inline can_we_daz()
 
 #endif // __SSE__
 
-// Set denormal protection for this thread. 
+// Set denormal protection for this thread.
 void inline disable_denormals()
 {
 #ifdef __SSE__
@@ -50,5 +50,4 @@ void inline disable_denormals()
 
 } // namespace lmms
 
-#endif // DENORMALS_H
-
+#endif // LMMS_DENORMALS_H
diff --git a/include/embed.h b/include/embed.h
index 03d767b43f4..7d69f7c7d58 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef EMBED_H
-#define EMBED_H
+#ifndef LMMS_EMBED_H
+#define LMMS_EMBED_H
 
 #include <QPixmap>
 #include <QString>
@@ -139,4 +139,4 @@ class PluginPixmapLoader : public PixmapLoader
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EMBED_H
diff --git a/include/endian_handling.h b/include/endian_handling.h
index b3d122fa359..7ddb22f224c 100644
--- a/include/endian_handling.h
+++ b/include/endian_handling.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef ENDIAN_HANDLING_H
-#define ENDIAN_HANDLING_H
+#ifndef LMMS_ENDIAN_HANDLING_H
+#define LMMS_ENDIAN_HANDLING_H
 
 #include <QSysInfo>
 
@@ -57,4 +57,4 @@ inline int32_t swap32IfBE( int32_t i )
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_ENDIAN_HANDLING_H
diff --git a/include/fenv.h b/include/fenv.h
index c9cc508f58f..665d881558f 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -45,4 +45,4 @@ inline int fedisableexcept(unsigned int excepts)
     return fesetenv(&fenv) ? -1 : old_excepts;
 }
 
-#endif
+#endif // defined(__APPLE__) && defined(__MACH__)
diff --git a/include/fft_helpers.h b/include/fft_helpers.h
index 8ba0fc7a0b6..2d2a8d19e1e 100644
--- a/include/fft_helpers.h
+++ b/include/fft_helpers.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef FFT_HELPERS_H
-#define FFT_HELPERS_H
+#ifndef LMMS_FFT_HELPERS_H
+#define LMMS_FFT_HELPERS_H
 
 #include "lmms_export.h"
 
@@ -109,4 +108,4 @@ int LMMS_EXPORT compressbands(const float * _absspec_buffer, float * _compressed
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_FFT_HELPERS_H
diff --git a/include/gui_templates.h b/include/gui_templates.h
index ee0ccdbf674..c0afbdfc0bb 100644
--- a/include/gui_templates.h
+++ b/include/gui_templates.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef GUI_TEMPLATES_H
-#define GUI_TEMPLATES_H
+#ifndef LMMS_GUI_TEMPLATES_H
+#define LMMS_GUI_TEMPLATES_H
 
 #include "lmmsconfig.h"
 
@@ -69,4 +68,4 @@ inline QFont pointSizeF( QFont _f, float SIZE )
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TEMPLATES_H
diff --git a/include/interpolation.h b/include/interpolation.h
index 3a74334e423..fd2c29a04dc 100644
--- a/include/interpolation.h
+++ b/include/interpolation.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef INTERPOLATION_H
-#define INTERPOLATION_H
+#ifndef LMMS_INTERPOLATION_H
+#define LMMS_INTERPOLATION_H
 
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
@@ -140,4 +139,4 @@ inline float lagrangeInterpolate( float v0, float v1, float v2, float v3, float
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INTERPOLATION_H
diff --git a/include/lmms_basics.h b/include/lmms_basics.h
index 59a6aa3596f..b566fa781ed 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef TYPES_H
-#define TYPES_H
+#ifndef LMMS_TYPES_H
+#define LMMS_TYPES_H
 
 #include <cstddef>
 #include <limits>
@@ -146,4 +145,4 @@ constexpr const char* UI_CTRL_KEY =
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TYPES_H
diff --git a/include/lmms_constants.h b/include/lmms_constants.h
index 7796f6bdfc1..e6fce9f4d16 100644
--- a/include/lmms_constants.h
+++ b/include/lmms_constants.h
@@ -103,4 +103,4 @@ constexpr int ARANGE_SILENT_END = -10;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CONSTANTS_H
diff --git a/include/lmms_math.h b/include/lmms_math.h
index db4502f1c50..1f896a683af 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -22,7 +22,6 @@
  *
  */
 
-
 #ifndef LMMS_MATH_H
 #define LMMS_MATH_H
 
@@ -329,4 +328,4 @@ static inline T absMin( T a, T b )
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MATH_H
diff --git a/include/panning.h b/include/panning.h
index 1521ec984b3..56ca04eee08 100644
--- a/include/panning.h
+++ b/include/panning.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef PANNING_H
-#define PANNING_H
+#ifndef LMMS_PANNING_H
+#define LMMS_PANNING_H
 
 #include "lmms_basics.h"
 #include "panning_constants.h"
@@ -56,4 +56,4 @@ inline int panningToMidi( panning_t _p )
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PANNING_H
diff --git a/include/panning_constants.h b/include/panning_constants.h
index 00a5c3291da..8f40219f8d4 100644
--- a/include/panning_constants.h
+++ b/include/panning_constants.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef PANNING_CONSTANTS_H
-#define PANNING_CONSTANTS_H
+#ifndef LMMS_PANNING_CONSTANTS_H
+#define LMMS_PANNING_CONSTANTS_H
 
 namespace lmms
 {
@@ -38,4 +38,4 @@ constexpr panning_t DefaultPanning = PanningCenter;
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PANNING_CONSTANTS_H
diff --git a/include/shared_object.h b/include/shared_object.h
index ac45d6cd7a0..e9fdb57a368 100644
--- a/include/shared_object.h
+++ b/include/shared_object.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARED_OBJECT_H
-#define SHARED_OBJECT_H
+#ifndef LMMS_SHARED_OBJECT_H
+#define LMMS_SHARED_OBJECT_H
 
 #include <atomic>
 
@@ -86,4 +86,4 @@ class sharedObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SHARED_OBJECT_H
diff --git a/include/versioninfo.h b/include/versioninfo.h
index 29bf3bea9d3..f224b62c53f 100644
--- a/include/versioninfo.h
+++ b/include/versioninfo.h
@@ -1,5 +1,5 @@
-#ifndef VERSION_INFO_H
-#define VERSION_INFO_H
+#ifndef LMMS_VERSION_INFO_H
+#define LMMS_VERSION_INFO_H
 
 #include "lmms_basics.h"
 
@@ -51,4 +51,4 @@ constexpr const char* LMMS_BUILDCONF_PLATFORM = "win32";
 constexpr const char* LMMS_BUILDCONF_PLATFORM = "Haiku";
 #endif
 
-#endif
+#endif // LMMS_VERSION_INFO_H
diff --git a/include/volume.h b/include/volume.h
index 5223bfa09c3..382f7678011 100644
--- a/include/volume.h
+++ b/include/volume.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VOLUME_H
-#define VOLUME_H
+#ifndef LMMS_VOLUME_H
+#define LMMS_VOLUME_H
 
 #include "lmms_basics.h"
 
@@ -43,4 +43,4 @@ struct StereoVolumeVector
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VOLUME_H
diff --git a/src/gui/widgets/CustomTextKnob.cpp b/src/gui/widgets/CustomTextKnob.cpp
index 9f6e19b90d5..ce880608ccc 100644
--- a/src/gui/widgets/CustomTextKnob.cpp
+++ b/src/gui/widgets/CustomTextKnob.cpp
@@ -1,3 +1,27 @@
+/*
+ * CustomTextKnob.cpp
+ *
+ * Copyright (c) 2020 Ibuki Sugiyama <main/at/fuwa.dev>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
 #include "CustomTextKnob.h"
 
 namespace lmms::gui