diff --git a/include/AboutDialog.h b/include/AboutDialog.h
index bb0c509a9..2fd01faf5 100644
--- a/include/AboutDialog.h
+++ b/include/AboutDialog.h
@@ -41,4 +41,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_ABOUT_DIALOG_H
diff --git a/include/ActionGroup.h b/include/ActionGroup.h
index 80a6d523e..e18f6fb23 100644
--- a/include/ActionGroup.h
+++ b/include/ActionGroup.h
@@ -58,4 +58,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_ACTION_GROUP_H
diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
index 263925286..975532071 100644
--- a/include/AudioAlsa.h
+++ b/include/AudioAlsa.h
@@ -108,4 +108,4 @@ private:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_AUDIO_ALSA_H
diff --git a/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h
index 068754b69..cbe99ba01 100644
--- a/include/AudioAlsaSetupWidget.h
+++ b/include/AudioAlsaSetupWidget.h
@@ -66,4 +66,4 @@ private:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H
diff --git a/include/AudioDevice.h b/include/AudioDevice.h
index 26cbbaccc..d1a9617cd 100644
--- a/include/AudioDevice.h
+++ b/include/AudioDevice.h
@@ -160,4 +160,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_DEVICE_H
diff --git a/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h
index 9c70859d2..f56fa07a6 100644
--- a/include/AudioDeviceSetupWidget.h
+++ b/include/AudioDeviceSetupWidget.h
@@ -45,4 +45,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H
diff --git a/include/AudioDummy.h b/include/AudioDummy.h
index 37363d501..e34260171 100644
--- a/include/AudioDummy.h
+++ b/include/AudioDummy.h
@@ -116,4 +116,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_DUMMY_H
diff --git a/include/AudioEngine.h b/include/AudioEngine.h
index 534182d69..d0f269d87 100644
--- a/include/AudioEngine.h
+++ b/include/AudioEngine.h
@@ -487,4 +487,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_H
diff --git a/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h
index 1f72939be..7b5191e76 100644
--- a/include/AudioEngineProfiler.h
+++ b/include/AudioEngineProfiler.h
@@ -62,4 +62,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_PROFILER_H
diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h
index 0f41982a1..112930808 100644
--- a/include/AudioEngineWorkerThread.h
+++ b/include/AudioEngineWorkerThread.h
@@ -121,4 +121,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_ENGINE_WORKER_THREAD_H
diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
index fb98315db..dc9a786a4 100644
--- a/include/AudioFileDevice.h
+++ b/include/AudioFileDevice.h
@@ -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 6750d264a..944e30478 100644
--- a/include/AudioFileFlac.h
+++ b/include/AudioFileFlac.h
@@ -77,4 +77,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_FILE_FLAC_H
diff --git a/include/AudioFileMP3.h b/include/AudioFileMP3.h
index 61406cced..4289ad211 100644
--- a/include/AudioFileMP3.h
+++ b/include/AudioFileMP3.h
@@ -75,4 +75,4 @@ private:
 
 #endif // LMMS_HAVE_MP3LAME
 
-#endif
+#endif // LMMS_AUDIO_FILE_MP3_H
diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h
index 981b61733..77be8ca1c 100644
--- a/include/AudioFileOgg.h
+++ b/include/AudioFileOgg.h
@@ -113,4 +113,4 @@ private:
 
 #endif // LMMS_HAVE_OGGVORBIS
 
-#endif
+#endif // LMMS_AUDIO_FILE_OGG_H
diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h
index 06b797cc6..c186aaaa7 100644
--- a/include/AudioFileWave.h
+++ b/include/AudioFileWave.h
@@ -71,4 +71,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_FILE_WAVE_H
diff --git a/include/AudioJack.h b/include/AudioJack.h
index 5e63074bd..2ef0f665c 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -144,4 +144,4 @@ signals:
 
 #endif // LMMS_HAVE_JACK
 
-#endif
+#endif // LMMS_AUDIO_JACK_H
diff --git a/include/AudioOss.h b/include/AudioOss.h
index 045cc6c56..55f64de85 100644
--- a/include/AudioOss.h
+++ b/include/AudioOss.h
@@ -92,4 +92,4 @@ private:
 
 #endif // LMMS_HAVE_OSS
 
-#endif
+#endif // LMMS_AUDIO_OSS_H
diff --git a/include/AudioPort.h b/include/AudioPort.h
index 38e495436..d9803d205 100644
--- a/include/AudioPort.h
+++ b/include/AudioPort.h
@@ -138,4 +138,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_PORT_H
diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index 8ab18ce6e..01b8f3fd7 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -163,4 +163,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_PORTAUDIO_H
diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h
index bb5541a30..b6a998274 100644
--- a/include/AudioPulseAudio.h
+++ b/include/AudioPulseAudio.h
@@ -104,4 +104,4 @@ private:
 
 #endif // LMMS_HAVE_PULSEAUDIO
 
-#endif
+#endif // LMMS_AUDIO_PULSEAUDIO_H
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
index 23c4643d8..8937ceb5e 100644
--- a/include/AudioSampleRecorder.h
+++ b/include/AudioSampleRecorder.h
@@ -59,4 +59,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUDIO_SAMPLE_RECORDER_H
diff --git a/include/AudioSdl.h b/include/AudioSdl.h
index bd7f4b960..62db8b68a 100644
--- a/include/AudioSdl.h
+++ b/include/AudioSdl.h
@@ -115,4 +115,4 @@ private:
 
 #endif // LMMS_HAVE_SDL
 
-#endif
+#endif // LMMS_AUDIO_SDL_H
diff --git a/include/AudioSndio.h b/include/AudioSndio.h
index b7f42aca2..594ca94e7 100644
--- a/include/AudioSndio.h
+++ b/include/AudioSndio.h
@@ -89,4 +89,4 @@ private:
 
 #endif // LMMS_HAVE_SNDIO
 
-#endif
+#endif // LMMS_AUDIO_SNDIO_H
diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h
index b29ff3779..b327f7d84 100644
--- a/include/AudioSoundIo.h
+++ b/include/AudioSoundIo.h
@@ -145,4 +145,4 @@ private:
 
 #endif // LMMS_HAVE_SOUNDIO
 
-#endif
+#endif // LMMS_AUDIO_SOUNDIO_H
diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h
index 4a695a677..3d78b8e9c 100644
--- a/include/AutomatableButton.h
+++ b/include/AutomatableButton.h
@@ -108,4 +108,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_AUTOMATABLE_BUTTON_H
diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
index 2fccf31f4..1e6d5eda3 100644
--- a/include/AutomatableModel.h
+++ b/include/AutomatableModel.h
@@ -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 e2475be48..12b2e4d49 100644
--- a/include/AutomatableModelView.h
+++ b/include/AutomatableModelView.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 9ec55c2df..cb1a6965f 100644
--- a/include/AutomatableSlider.h
+++ b/include/AutomatableSlider.h
@@ -76,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 7281af133..077c282f8 100644
--- a/include/AutomationClip.h
+++ b/include/AutomationClip.h
@@ -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 69d4943bc..a20e2ce28 100644
--- a/include/AutomationClipView.h
+++ b/include/AutomationClipView.h
@@ -85,4 +85,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_CLIP_VIEW_H
diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
index 8ead191a9..c2ab98092 100644
--- a/include/AutomationEditor.h
+++ b/include/AutomationEditor.h
@@ -304,4 +304,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_EDITOR_H
diff --git a/include/AutomationNode.h b/include/AutomationNode.h
index 9f4a4f219..a922109e6 100644
--- a/include/AutomationNode.h
+++ b/include/AutomationNode.h
@@ -156,4 +156,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUTOMATION_NODE_H
diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h
index 653174caa..64c2cc43a 100644
--- a/include/AutomationTrack.h
+++ b/include/AutomationTrack.h
@@ -62,4 +62,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_AUTOMATION_TRACK_H
diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h
index d948d762a..449e9bef8 100644
--- a/include/AutomationTrackView.h
+++ b/include/AutomationTrackView.h
@@ -52,4 +52,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_AUTOMATION_TRACK_VIEW_H
diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h
index 51e55c337..2a12c62e3 100644
--- a/include/BandLimitedWave.h
+++ b/include/BandLimitedWave.h
@@ -149,7 +149,8 @@ public:
 
 		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 @@ public:
 		const float ip2 = ( ( tlen - _wavelen ) / tlen - 0.5 ) * 2.0;
 
 		return linearInterpolate( s12, s34, ip2 );
-	*/
+		*/
 	};
 
 
@@ -174,4 +175,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BANDLIMITEDWAVE_H
diff --git a/include/BasicFilters.h b/include/BasicFilters.h
index 6912f3d36..c10c47489 100644
--- a/include/BasicFilters.h
+++ b/include/BasicFilters.h
@@ -917,4 +917,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BASIC_FILTERS_H
diff --git a/include/BufferManager.h b/include/BufferManager.h
index 8e93afc92..712e420ff 100644
--- a/include/BufferManager.h
+++ b/include/BufferManager.h
@@ -54,4 +54,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_BUFFER_MANAGER_H
diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
index a249cdc5e..904445c67 100644
--- a/include/CPULoadWidget.h
+++ b/include/CPULoadWidget.h
@@ -69,4 +69,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CPU_LOAD_WIDGET_H
diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h
index 87aedf133..4a8889a83 100644
--- a/include/CaptionMenu.h
+++ b/include/CaptionMenu.h
@@ -46,4 +46,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CAPTION_MENU_H
diff --git a/include/Clip.h b/include/Clip.h
index 75416ef94..8f4162d96 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -194,4 +194,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CLIP_H
diff --git a/include/ClipView.h b/include/ClipView.h
index a342590e1..32c5130b9 100644
--- a/include/ClipView.h
+++ b/include/ClipView.h
@@ -252,4 +252,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CLIP_VIEW_H
diff --git a/include/Clipboard.h b/include/Clipboard.h
index 3c38c90fe..c6ae66ee8 100644
--- a/include/Clipboard.h
+++ b/include/Clipboard.h
@@ -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 da4069f5d..0e85ea9bb 100644
--- a/include/ColorChooser.h
+++ b/include/ColorChooser.h
@@ -68,4 +68,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_COLOR_CHOOSER_H
diff --git a/include/ComboBox.h b/include/ComboBox.h
index ba2410491..8153451e8 100644
--- a/include/ComboBox.h
+++ b/include/ComboBox.h
@@ -82,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 a895b838f..8fd1f49f4 100644
--- a/include/ComboBoxModel.h
+++ b/include/ComboBoxModel.h
@@ -95,4 +95,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_COMBOBOX_MODEL_H
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index abeb5246f..eee069681 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -313,4 +313,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CONFIG_MANAGER_H
diff --git a/include/ControlLayout.h b/include/ControlLayout.h
index e78609a37..568ce1a85 100644
--- a/include/ControlLayout.h
+++ b/include/ControlLayout.h
@@ -141,4 +141,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CONTROL_LAYOUT_H
diff --git a/include/Controller.h b/include/Controller.h
index 0bb229d38..0a5eb0f36 100644
--- a/include/Controller.h
+++ b/include/Controller.h
@@ -183,4 +183,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CONTROLLER_H
diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
index d75d529f6..4473b68e0 100644
--- a/include/ControllerConnection.h
+++ b/include/ControllerConnection.h
@@ -127,4 +127,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_CONTROLLER_CONNECTION_H
diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
index 2e3446072..6fb9d45d0 100644
--- a/include/ControllerConnectionDialog.h
+++ b/include/ControllerConnectionDialog.h
@@ -110,4 +110,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
index 81a9a0eb6..0c53a8c84 100644
--- a/include/ControllerDialog.h
+++ b/include/ControllerDialog.h
@@ -61,4 +61,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_DIALOG_H
diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
index 1133e8ec8..303cc2b40 100644
--- a/include/ControllerRackView.h
+++ b/include/ControllerRackView.h
@@ -92,4 +92,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_RACK_VIEW_H
diff --git a/include/ControllerView.h b/include/ControllerView.h
index 44f362b70..d1ba533a1 100644
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -88,4 +88,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CONTROLLER_VIEW_H
diff --git a/include/Controls.h b/include/Controls.h
index 53c93a36f..5ed19027e 100644
--- a/include/Controls.h
+++ b/include/Controls.h
@@ -144,4 +144,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_CONTROLS_H
diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h
index 25bba1315..19768ec87 100644
--- a/include/CustomTextKnob.h
+++ b/include/CustomTextKnob.h
@@ -57,4 +57,4 @@ protected:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_CUSTOM_TEXT_KNOB_H
diff --git a/include/DataFile.h b/include/DataFile.h
index 18f9697b0..a91b37f9b 100644
--- a/include/DataFile.h
+++ b/include/DataFile.h
@@ -153,4 +153,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DATA_FILE_H
diff --git a/include/Delay.h b/include/Delay.h
index ef23d7be1..daa871baf 100644
--- a/include/Delay.h
+++ b/include/Delay.h
@@ -364,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 f1c68902b..b9be6d42f 100644
--- a/include/DeprecationHelper.h
+++ b/include/DeprecationHelper.h
@@ -66,4 +66,4 @@ inline QPoint position(QWheelEvent *wheelEvent)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DEPRECATIONHELPER_H
diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h
index 41723bee8..e5d5f5712 100644
--- a/include/DetuningHelper.h
+++ b/include/DetuningHelper.h
@@ -64,4 +64,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DETUNING_HELPER_H
diff --git a/include/DrumSynth.h b/include/DrumSynth.h
index 9b759ac1a..750055ddb 100644
--- a/include/DrumSynth.h
+++ b/include/DrumSynth.h
@@ -56,4 +56,4 @@ class DrumSynth {
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DRUM_SYNTH_H
diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h
index 0a19783f6..d8268fd8d 100644
--- a/include/DspEffectLibrary.h
+++ b/include/DspEffectLibrary.h
@@ -330,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 945738e1b..0a80b90a9 100644
--- a/include/DummyEffect.h
+++ b/include/DummyEffect.h
@@ -149,4 +149,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_EFFECT_H
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
index 19b6b6fbd..aefa035db 100644
--- a/include/DummyInstrument.h
+++ b/include/DummyInstrument.h
@@ -77,4 +77,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_INSTRUMENT_H
diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h
index ad517c1a9..3f6746b74 100644
--- a/include/DummyPlugin.h
+++ b/include/DummyPlugin.h
@@ -68,4 +68,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DUMMY_PLUGIN_H
diff --git a/include/Editor.h b/include/Editor.h
index ad330ac06..c5e9a2d05 100644
--- a/include/Editor.h
+++ b/include/Editor.h
@@ -113,4 +113,4 @@ protected:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_EDITOR_H
diff --git a/include/Effect.h b/include/Effect.h
index a9952d339..1f566e0e9 100644
--- a/include/Effect.h
+++ b/include/Effect.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 dad4de5e1..57cf8d547 100644
--- a/include/EffectChain.h
+++ b/include/EffectChain.h
@@ -85,4 +85,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EFFECT_CHAIN_H
diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
index bda845dc5..4bef5ee79 100644
--- a/include/EffectControlDialog.h
+++ b/include/EffectControlDialog.h
@@ -64,4 +64,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_EFFECT_CONTROL_DIALOG_H
diff --git a/include/EffectControls.h b/include/EffectControls.h
index dfecc0792..294f61027 100644
--- a/include/EffectControls.h
+++ b/include/EffectControls.h
@@ -82,4 +82,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EFFECT_CONTROLS_H
diff --git a/include/EffectRackView.h b/include/EffectRackView.h
index 96f70548a..a1e21be09 100644
--- a/include/EffectRackView.h
+++ b/include/EffectRackView.h
@@ -88,4 +88,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_EFFECT_RACK_VIEW_H
diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
index c31f96e14..493b07774 100644
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -70,5 +70,4 @@ private:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_EFFECT_SELECT_DIALOG_H
diff --git a/include/EffectView.h b/include/EffectView.h
index fb19d52dd..5b669114d 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -96,4 +96,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_EFFECT_VIEW_H
diff --git a/include/Engine.h b/include/Engine.h
index 0cb77315f..ed4cbd93c 100644
--- a/include/Engine.h
+++ b/include/Engine.h
@@ -155,4 +155,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_ENGINE_H
diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
index 0a90ec68b..a713a90f3 100644
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -190,4 +190,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_ENVELOPE_AND_LFO_PARAMETERS_H
diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h
index e927e9fcc..b5c7a67d4 100644
--- a/include/EnvelopeAndLfoView.h
+++ b/include/EnvelopeAndLfoView.h
@@ -104,4 +104,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H
diff --git a/include/ExportFilter.h b/include/ExportFilter.h
index 13a3c179d..acbdbb65e 100644
--- a/include/ExportFilter.h
+++ b/include/ExportFilter.h
@@ -69,4 +69,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EXPORT_FILTER_H
diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h
index af33d6766..56a9fc1f5 100644
--- a/include/ExportProjectDialog.h
+++ b/include/ExportProjectDialog.h
@@ -69,5 +69,4 @@ private:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_EXPORT_PROJECT_DIALOG_H
diff --git a/include/FadeButton.h b/include/FadeButton.h
index df0e2abf2..166ef5f21 100644
--- a/include/FadeButton.h
+++ b/include/FadeButton.h
@@ -76,4 +76,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_FADE_BUTTON_H
diff --git a/include/Fader.h b/include/Fader.h
index cfffba843..2847819a4 100644
--- a/include/Fader.h
+++ b/include/Fader.h
@@ -173,5 +173,4 @@ private:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_FADER_H
diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h
index 4b5682a51..cdb1df41f 100644
--- a/include/FifoBuffer.h
+++ b/include/FifoBuffer.h
@@ -94,4 +94,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_FIFO_BUFFER_H
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
index 387be38d1..51103b19f 100644
--- a/include/FileBrowser.h
+++ b/include/FileBrowser.h
@@ -297,4 +297,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_FILE_BROWSER_H
diff --git a/include/FileDialog.h b/include/FileDialog.h
index a999fff16..67ef1d8eb 100644
--- a/include/FileDialog.h
+++ b/include/FileDialog.h
@@ -56,4 +56,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_FILE_DIALOG_H
diff --git a/include/Graph.h b/include/Graph.h
index d04fd926c..f62215ac2 100644
--- a/include/Graph.h
+++ b/include/Graph.h
@@ -227,4 +227,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_GRAPH_H
diff --git a/include/GroupBox.h b/include/GroupBox.h
index bf2773e23..6a8f424f9 100644
--- a/include/GroupBox.h
+++ b/include/GroupBox.h
@@ -73,5 +73,4 @@ private:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_GROUP_BOX_H
diff --git a/include/GuiApplication.h b/include/GuiApplication.h
index dd87a5607..3a0851499 100644
--- a/include/GuiApplication.h
+++ b/include/GuiApplication.h
@@ -93,4 +93,4 @@ LMMS_EXPORT GuiApplication* getGUI();
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_GUI_APPLICATION_H
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index 587a62a78..9c73b3861 100644
--- a/include/ImportFilter.h
+++ b/include/ImportFilter.h
@@ -114,4 +114,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_IMPORT_FILTER_H
diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h
index fbecd2769..3e27e137b 100644
--- a/include/InlineAutomation.h
+++ b/include/InlineAutomation.h
@@ -99,4 +99,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INLINE_AUTOMATION_H
diff --git a/include/Instrument.h b/include/Instrument.h
index 3ea8bdf2f..1c42c970e 100644
--- a/include/Instrument.h
+++ b/include/Instrument.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 3abd8eae7..71a6e8aaa 100644
--- a/include/InstrumentFunctionViews.h
+++ b/include/InstrumentFunctionViews.h
@@ -99,4 +99,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_FUNCTION_VIEWS_H
diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h
index 5b6c1af6d..f62b74e9a 100644
--- a/include/InstrumentFunctions.h
+++ b/include/InstrumentFunctions.h
@@ -224,4 +224,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_FUNCTIONS_H
diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
index dd6e43151..7877229a2 100644
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -77,4 +77,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H
diff --git a/include/InstrumentMiscView.h b/include/InstrumentMiscView.h
index 9aee23676..28f3c6a8e 100644
--- a/include/InstrumentMiscView.h
+++ b/include/InstrumentMiscView.h
@@ -71,4 +71,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_MISC_VIEW_H
diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h
index b65f906ae..bbf53d16c 100644
--- a/include/InstrumentPlayHandle.h
+++ b/include/InstrumentPlayHandle.h
@@ -85,4 +85,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_PLAY_HANDLE_H
diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h
index 607871c85..6db3078ec 100644
--- a/include/InstrumentSoundShaping.h
+++ b/include/InstrumentSoundShaping.h
@@ -92,4 +92,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_SOUND_SHAPING_H
diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h
index f37cfaa55..8f671514a 100644
--- a/include/InstrumentSoundShapingView.h
+++ b/include/InstrumentSoundShapingView.h
@@ -73,4 +73,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H
diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h
index 6fa41b4a1..7c6d1d795 100644
--- a/include/InstrumentTrack.h
+++ b/include/InstrumentTrack.h
@@ -325,4 +325,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_INSTRUMENT_TRACK_H
diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h
index 66fb7804b..363f5b3ab 100644
--- a/include/InstrumentTrackView.h
+++ b/include/InstrumentTrackView.h
@@ -121,4 +121,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_TRACK_VIEW_H
diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h
index f50b138df..d41bbdac8 100644
--- a/include/InstrumentTrackWindow.h
+++ b/include/InstrumentTrackWindow.h
@@ -169,4 +169,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H
diff --git a/include/InstrumentView.h b/include/InstrumentView.h
index ff4b9cd66..40014a11f 100644
--- a/include/InstrumentView.h
+++ b/include/InstrumentView.h
@@ -75,4 +75,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_INSTRUMENT_VIEW_H
diff --git a/include/IoHelper.h b/include/IoHelper.h
index 423cbaab3..8043df9af 100644
--- a/include/IoHelper.h
+++ b/include/IoHelper.h
@@ -91,4 +91,4 @@ 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 15e071577..f3e134f34 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -103,4 +103,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_JOURNALLING_OBJECT_H
diff --git a/include/Keymap.h b/include/Keymap.h
index 88f0df428..967d80789 100644
--- a/include/Keymap.h
+++ b/include/Keymap.h
@@ -80,4 +80,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_KEYMAP_H
diff --git a/include/Knob.h b/include/Knob.h
index 94fb8b640..18b26f7e6 100644
--- a/include/Knob.h
+++ b/include/Knob.h
@@ -213,4 +213,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_KNOB_H
diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h
index d4fd12b2d..abb969124 100644
--- a/include/Ladspa2LMMS.h
+++ b/include/Ladspa2LMMS.h
@@ -81,4 +81,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_2_LMMS_H
diff --git a/include/LadspaBase.h b/include/LadspaBase.h
index 442d12293..51c0ca202 100644
--- a/include/LadspaBase.h
+++ b/include/LadspaBase.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 9bc83e352..e4f0cd745 100644
--- a/include/LadspaControl.h
+++ b/include/LadspaControl.h
@@ -131,4 +131,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_CONTROL_H
diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h
index 4638d5b5c..4f12c29e2 100644
--- a/include/LadspaControlView.h
+++ b/include/LadspaControlView.h
@@ -55,4 +55,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_LADSPA_CONTROL_VIEW_H
diff --git a/include/LadspaManager.h b/include/LadspaManager.h
index 7b8639779..8c00d2604 100644
--- a/include/LadspaManager.h
+++ b/include/LadspaManager.h
@@ -349,4 +349,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LADSPA_MANAGER_H
diff --git a/include/LcdFloatSpinBox.h b/include/LcdFloatSpinBox.h
index 3dcf500b9..74a870114 100644
--- a/include/LcdFloatSpinBox.h
+++ b/include/LcdFloatSpinBox.h
@@ -84,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 6dcb68c1b..aeccd2635 100644
--- a/include/LcdSpinBox.h
+++ b/include/LcdSpinBox.h
@@ -89,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 665668b3f..f19c2c583 100644
--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -116,4 +116,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LCD_WIDGET_H
diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h
index 12642ef3b..95016b87f 100644
--- a/include/LedCheckBox.h
+++ b/include/LedCheckBox.h
@@ -83,4 +83,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LED_CHECKBOX_H
diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h
index e752d44c0..49ad25ecf 100644
--- a/include/LeftRightNav.h
+++ b/include/LeftRightNav.h
@@ -51,4 +51,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LEFT_RIGHT_NAV_H
diff --git a/include/LfoController.h b/include/LfoController.h
index ccd5804c7..1c63ba698 100644
--- a/include/LfoController.h
+++ b/include/LfoController.h
@@ -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 08c25a8bb..cf5aabd0d 100644
--- a/include/LinkedModelGroupViews.h
+++ b/include/LinkedModelGroupViews.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LMMS_GUI_LINKEDMODELGROUPVIEWS_H
-#define LMMS_GUI_LINKEDMODELGROUPVIEWS_H
+#ifndef LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
+#define LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
 
 #include <cstddef>
 #include <memory>
@@ -118,4 +118,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H
diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h
index 11950d85e..3f274d10c 100644
--- a/include/LinkedModelGroups.h
+++ b/include/LinkedModelGroups.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LMMS_LINKEDMODELGROUPS_H
-#define LMMS_LINKEDMODELGROUPS_H
+#ifndef LMMS_LINKED_MODEL_GROUPS_H
+#define LMMS_LINKED_MODEL_GROUPS_H
 
 #include <cstddef>
 
@@ -176,4 +176,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LINKED_MODEL_GROUPS_H
diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h
index 68cd2d2ab..91a469de0 100644
--- a/include/LmmsPalette.h
+++ b/include/LmmsPalette.h
@@ -87,4 +87,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LMMS_PALETTE_H
diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h
index c560b5be8..b3be03952 100644
--- a/include/LmmsStyle.h
+++ b/include/LmmsStyle.h
@@ -95,4 +95,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_LMMS_STYLE_H
diff --git a/include/LocaleHelper.h b/include/LocaleHelper.h
index 61298f42b..9c829fcaa 100644
--- a/include/LocaleHelper.h
+++ b/include/LocaleHelper.h
@@ -67,4 +67,4 @@ inline float toFloat(QString str, bool* ok = nullptr)
 
 } // namespace lmms::LocaleHelper
 
-#endif
+#endif // LMMS_LOCALEHELPER_H
diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h
index f1b3dea40..d44b99543 100644
--- a/include/LocklessAllocator.h
+++ b/include/LocklessAllocator.h
@@ -84,4 +84,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LOCKLESS_ALLOCATOR_H
diff --git a/include/LocklessList.h b/include/LocklessList.h
index e5c5cce71..4a0c27de0 100644
--- a/include/LocklessList.h
+++ b/include/LocklessList.h
@@ -97,4 +97,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LOCKLESS_LIST_H
diff --git a/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h
index 904e54f9c..99c48cc90 100644
--- a/include/LocklessRingBuffer.h
+++ b/include/LocklessRingBuffer.h
@@ -89,4 +89,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_LOCKLESS_RING_BUFFER_H
diff --git a/include/Lv2Basics.h b/include/Lv2Basics.h
index 73f006b46..3dae4c9f2 100644
--- a/include/Lv2Basics.h
+++ b/include/Lv2Basics.h
@@ -68,4 +68,4 @@ std::string stdStringFromPortName(const LilvPlugin* plug, const LilvPort* port);
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2BASICS_H
diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h
index dcb90f27a..93b3b21ef 100644
--- a/include/Lv2ControlBase.h
+++ b/include/Lv2ControlBase.h
@@ -164,4 +164,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_CONTROL_BASE_H
diff --git a/include/Lv2Evbuf.h b/include/Lv2Evbuf.h
index ecf61ec99..319bdf9ce 100644
--- a/include/Lv2Evbuf.h
+++ b/include/Lv2Evbuf.h
@@ -155,4 +155,4 @@ lv2_evbuf_write(	LV2_Evbuf_Iterator* iter,
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_EVBUF_H
diff --git a/include/Lv2Features.h b/include/Lv2Features.h
index 99a5762b0..b4fd6c06d 100644
--- a/include/Lv2Features.h
+++ b/include/Lv2Features.h
@@ -84,4 +84,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_FEATURES_H
diff --git a/include/Lv2Manager.h b/include/Lv2Manager.h
index 45ca868dd..b62e989cf 100644
--- a/include/Lv2Manager.h
+++ b/include/Lv2Manager.h
@@ -166,4 +166,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_MANAGER_H
diff --git a/include/Lv2Options.h b/include/Lv2Options.h
index c81e4b953..ca4fe2b7f 100644
--- a/include/Lv2Options.h
+++ b/include/Lv2Options.h
@@ -107,4 +107,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_OPTIONS_H
diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h
index 7283ebbd3..0f0b02913 100644
--- a/include/Lv2Ports.h
+++ b/include/Lv2Ports.h
@@ -271,4 +271,4 @@ const Target* dcast(const PortBase* base)
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2PORTS_H
diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h
index eea4e7c0e..7e6342ec4 100644
--- a/include/Lv2Proc.h
+++ b/include/Lv2Proc.h
@@ -221,4 +221,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_PROC_H
diff --git a/include/Lv2SubPluginFeatures.h b/include/Lv2SubPluginFeatures.h
index f8fbf55df..497c72830 100644
--- a/include/Lv2SubPluginFeatures.h
+++ b/include/Lv2SubPluginFeatures.h
@@ -66,4 +66,4 @@ public:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_SUBPLUGIN_FEATURES_H
diff --git a/include/Lv2UridCache.h b/include/Lv2UridCache.h
index ab80760b0..b64003a2e 100644
--- a/include/Lv2UridCache.h
+++ b/include/Lv2UridCache.h
@@ -75,4 +75,4 @@ template<> struct Lv2UridCache::IdForType<std::int32_t> { static constexpr auto
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_URID_CACHE_H
diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h
index ec23f4c6d..b8733023e 100644
--- a/include/Lv2UridMap.h
+++ b/include/Lv2UridMap.h
@@ -76,4 +76,4 @@ public:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_URID_MAP_H
diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h
index e84c6c5dc..f6d97d6aa 100644
--- a/include/Lv2ViewBase.h
+++ b/include/Lv2ViewBase.h
@@ -109,4 +109,4 @@ private:
 
 #endif // LMMS_HAVE_LV2
 
-#endif
+#endif // LMMS_LV2_VIEW_BASE_H
diff --git a/include/MainApplication.h b/include/MainApplication.h
index 0ab2877e7..98fcdef20 100644
--- a/include/MainApplication.h
+++ b/include/MainApplication.h
@@ -64,4 +64,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MAIN_APPLICATION_H
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 78d7f48d8..c4bbb6767 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -263,4 +263,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_MAIN_WINDOW_H
diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h
index 22ab10a6c..e709ffc8a 100644
--- a/include/MemoryHelper.h
+++ b/include/MemoryHelper.h
@@ -46,4 +46,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MEMORY_HELPER_H
diff --git a/include/MemoryManager.h b/include/MemoryManager.h
index 6e172468b..fa2fe8110 100644
--- a/include/MemoryManager.h
+++ b/include/MemoryManager.h
@@ -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 425590807..dca7e5de6 100644
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -54,4 +54,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_METER_DIALOG_H
diff --git a/include/MeterModel.h b/include/MeterModel.h
index 9a6ec8015..6c0304e37 100644
--- a/include/MeterModel.h
+++ b/include/MeterModel.h
@@ -68,4 +68,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_METER_MODEL_H
diff --git a/include/MicroTimer.h b/include/MicroTimer.h
index e5c8e2f61..cd03403dc 100644
--- a/include/MicroTimer.h
+++ b/include/MicroTimer.h
@@ -48,4 +48,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MICRO_TIMER_H
diff --git a/include/Microtuner.h b/include/Microtuner.h
index 795748b39..c92549581 100644
--- a/include/Microtuner.h
+++ b/include/Microtuner.h
@@ -74,4 +74,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MICROTUNER_H
diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h
index 3a5130b60..0706a530f 100644
--- a/include/MicrotunerConfig.h
+++ b/include/MicrotunerConfig.h
@@ -95,4 +95,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MICROTUNER_CONFIG_H
diff --git a/include/Midi.h b/include/Midi.h
index 839d0b684..21db021b3 100644
--- a/include/Midi.h
+++ b/include/Midi.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 a2b8c4e69..345cdbd54 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -85,4 +85,4 @@ private:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_MIDI_ALSA_RAW_H
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index d6f488c82..006cdefc8 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -158,4 +158,4 @@ signals:
 
 #endif // LMMS_HAVE_ALSA
 
-#endif
+#endif // LMMS_MIDI_ALSA_SEQ_H
diff --git a/include/MidiApple.h b/include/MidiApple.h
index 1b0d59218..37d408d4d 100644
--- a/include/MidiApple.h
+++ b/include/MidiApple.h
@@ -155,4 +155,4 @@ signals:
 
 #endif // LMMS_BUILD_APPLE
 
-#endif
+#endif // LMMS_MIDI_APPLE_H
diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h
index ca99a7ce5..4cb82b3d8 100644
--- a/include/MidiCCRackView.h
+++ b/include/MidiCCRackView.h
@@ -73,4 +73,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_MIDI_CC_RACK_VIEW_H
diff --git a/include/MidiClient.h b/include/MidiClient.h
index 45ba54ee5..3a64f709c 100644
--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -173,4 +173,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_CLIENT_H
diff --git a/include/MidiClip.h b/include/MidiClip.h
index 2dbedc0dd..bbb7d325d 100644
--- a/include/MidiClip.h
+++ b/include/MidiClip.h
@@ -154,4 +154,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_CLIP_H
diff --git a/include/MidiClipView.h b/include/MidiClipView.h
index dd83f98b8..6558688b4 100644
--- a/include/MidiClipView.h
+++ b/include/MidiClipView.h
@@ -108,4 +108,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_MIDI_CLIP_VIEW_H
diff --git a/include/MidiController.h b/include/MidiController.h
index 19577281f..c4ef49590 100644
--- a/include/MidiController.h
+++ b/include/MidiController.h
@@ -92,4 +92,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_CONTROLLER_H
diff --git a/include/MidiDummy.h b/include/MidiDummy.h
index 03deaf7bc..b117bd136 100644
--- a/include/MidiDummy.h
+++ b/include/MidiDummy.h
@@ -65,4 +65,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_DUMMY_H
diff --git a/include/MidiEvent.h b/include/MidiEvent.h
index 03d3be604..956c33fb3 100644
--- a/include/MidiEvent.h
+++ b/include/MidiEvent.h
@@ -221,4 +221,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_EVENT_H
diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h
index 3e51d1177..1c45b3e3f 100644
--- a/include/MidiEventProcessor.h
+++ b/include/MidiEventProcessor.h
@@ -49,4 +49,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDI_EVENT_PROCESSOR_H
diff --git a/include/MidiEventToByteSeq.h b/include/MidiEventToByteSeq.h
index 03308d7b8..6490ae385 100644
--- a/include/MidiEventToByteSeq.h
+++ b/include/MidiEventToByteSeq.h
@@ -51,4 +51,4 @@ std::size_t LMMS_EXPORT writeToByteSeq( const class MidiEvent& ev,
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIDIEVENTTOBYTESEQ_H
diff --git a/include/MidiJack.h b/include/MidiJack.h
index 265abedfc..e2b38e290 100644
--- a/include/MidiJack.h
+++ b/include/MidiJack.h
@@ -102,4 +102,4 @@ private:
 
 #endif // LMMS_HAVE_JACK
 
-#endif
+#endif // LMMS_MIDI_JACK_H
diff --git a/include/MidiOss.h b/include/MidiOss.h
index dba0a9a71..9acc0e8e6 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -78,4 +78,4 @@ private:
 
 #endif // LMMS_HAVE_OSS
 
-#endif
+#endif // LMMS_MIDI_OSS_H
diff --git a/include/MidiPort.h b/include/MidiPort.h
index a03b8477c..6f759708e 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -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 88328e734..0b3fc1b2f 100644
--- a/include/MidiPortMenu.h
+++ b/include/MidiPortMenu.h
@@ -61,4 +61,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIDI_PORT_MENU_H
diff --git a/include/MidiSetupWidget.h b/include/MidiSetupWidget.h
index 492a5bb85..a61b606ac 100644
--- a/include/MidiSetupWidget.h
+++ b/include/MidiSetupWidget.h
@@ -59,4 +59,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIDI_SETUP_WIDGET_H
diff --git a/include/MidiSndio.h b/include/MidiSndio.h
index 3d7226431..5734745b9 100644
--- a/include/MidiSndio.h
+++ b/include/MidiSndio.h
@@ -75,4 +75,4 @@ private:
 
 #endif // LMMS_HAVE_SNDIO
 
-#endif
+#endif // LMMS_MIDI_SNDIO_H
diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h
index ca1850347..3a8edfbcd 100644
--- a/include/MidiWinMM.h
+++ b/include/MidiWinMM.h
@@ -150,4 +150,4 @@ signals:
 
 #endif // LMMS_BUILD_WIN32
 
-#endif
+#endif // LMMS_MIDI_WINMM_H
diff --git a/include/MixHelpers.h b/include/MixHelpers.h
index 76242dd7a..6458c65fc 100644
--- a/include/MixHelpers.h
+++ b/include/MixHelpers.h
@@ -81,4 +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 d49d950ea..d84a11063 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -226,4 +226,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MIXER_H
diff --git a/include/MixerLine.h b/include/MixerLine.h
index 0121717cf..68a61728c 100644
--- a/include/MixerLine.h
+++ b/include/MixerLine.h
@@ -117,4 +117,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIXER_LINE_H
diff --git a/include/MixerLineLcdSpinBox.h b/include/MixerLineLcdSpinBox.h
index 0d3b182b0..1ae2813f2 100644
--- a/include/MixerLineLcdSpinBox.h
+++ b/include/MixerLineLcdSpinBox.h
@@ -56,4 +56,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H
diff --git a/include/MixerView.h b/include/MixerView.h
index e73e2e391..9dc5abeee 100644
--- a/include/MixerView.h
+++ b/include/MixerView.h
@@ -139,4 +139,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MIXER_VIEW_H
diff --git a/include/Model.h b/include/Model.h
index 0b8142659..3e304297f 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -90,4 +90,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MODEL_H
diff --git a/include/ModelView.h b/include/ModelView.h
index 89e60c3a6..786a6812c 100644
--- a/include/ModelView.h
+++ b/include/ModelView.h
@@ -85,4 +85,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_MODEL_VIEW_H
diff --git a/include/ModelVisitor.h b/include/ModelVisitor.h
index 59928d04b..a4654e529 100644
--- a/include/ModelVisitor.h
+++ b/include/ModelVisitor.h
@@ -68,4 +68,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_MODEL_VISITOR_H
diff --git a/include/NStateButton.h b/include/NStateButton.h
index dd1c06a66..a6b4c4d9a 100644
--- a/include/NStateButton.h
+++ b/include/NStateButton.h
@@ -77,4 +77,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_NSTATE_BUTTON_H
diff --git a/include/Note.h b/include/Note.h
index 9eecd585f..15aeaa2ce 100644
--- a/include/Note.h
+++ b/include/Note.h
@@ -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 89fc7e570..29477705b 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -364,4 +364,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_NOTE_PLAY_HANDLE_H
diff --git a/include/Oscillator.h b/include/Oscillator.h
index 025404c41..46d858032 100644
--- a/include/Oscillator.h
+++ b/include/Oscillator.h
@@ -313,4 +313,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_OSCILLATOR_H
diff --git a/include/OscillatorConstants.h b/include/OscillatorConstants.h
index ef12636d4..85ae38fe8 100644
--- a/include/OscillatorConstants.h
+++ b/include/OscillatorConstants.h
@@ -55,4 +55,4 @@ namespace lmms::OscillatorConstants
 
 } // namespace lmms::OscillatorConstants
 
-#endif
+#endif // LMMS_OSCILLATORCONSTANTS_H
diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h
index c7a52cef9..209370ce0 100644
--- a/include/Oscilloscope.h
+++ b/include/Oscilloscope.h
@@ -78,4 +78,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_OSCILLOSCOPE_H
diff --git a/include/OutputSettings.h b/include/OutputSettings.h
index 0b10d2b01..12242e1bb 100644
--- a/include/OutputSettings.h
+++ b/include/OutputSettings.h
@@ -119,4 +119,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_OUTPUT_SETTINGS_H
diff --git a/include/PathUtil.h b/include/PathUtil.h
index 9efd73096..9b410d014 100644
--- a/include/PathUtil.h
+++ b/include/PathUtil.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 3f9d07cb6..968a0b198 100644
--- a/include/PatternClip.h
+++ b/include/PatternClip.h
@@ -58,4 +58,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_CLIP_H
diff --git a/include/PatternClipView.h b/include/PatternClipView.h
index f2e2208bd..ee313f32a 100644
--- a/include/PatternClipView.h
+++ b/include/PatternClipView.h
@@ -72,4 +72,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_CLIP_VIEW_H
diff --git a/include/PatternEditor.h b/include/PatternEditor.h
index fd9a1b254..5787f27ec 100644
--- a/include/PatternEditor.h
+++ b/include/PatternEditor.h
@@ -97,4 +97,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_EDITOR_H
diff --git a/include/PatternStore.h b/include/PatternStore.h
index 024505b83..fcb55e411 100644
--- a/include/PatternStore.h
+++ b/include/PatternStore.h
@@ -113,4 +113,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_STORE_H
diff --git a/include/PatternTrack.h b/include/PatternTrack.h
index 8e319216a..1c0c610d2 100644
--- a/include/PatternTrack.h
+++ b/include/PatternTrack.h
@@ -102,4 +102,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PATTERN_TRACK_H
diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h
index b4d373b5d..09a1ba37b 100644
--- a/include/PatternTrackView.h
+++ b/include/PatternTrackView.h
@@ -68,4 +68,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PATTERN_TRACK_VIEW_H
diff --git a/include/PeakController.h b/include/PeakController.h
index ebdf49cb0..357e2a95d 100644
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -107,4 +107,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PEAK_CONTROLLER_H
diff --git a/include/PerfLog.h b/include/PerfLog.h
index f786de1cc..7b0b587f6 100644
--- a/include/PerfLog.h
+++ b/include/PerfLog.h
@@ -77,4 +77,4 @@ class PerfLogTimer
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PERFLOG_H
diff --git a/include/Piano.h b/include/Piano.h
index e22710bba..96f374840 100644
--- a/include/Piano.h
+++ b/include/Piano.h
@@ -89,4 +89,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PIANO_H
diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index 5013e3e1b..23fe7ddc6 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -573,4 +573,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PIANO_ROLL_H
diff --git a/include/PianoView.h b/include/PianoView.h
index 1d5cd4be4..6421ff438 100644
--- a/include/PianoView.h
+++ b/include/PianoView.h
@@ -103,4 +103,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_PIANO_VIEW_H
diff --git a/include/Pitch.h b/include/Pitch.h
index 537941700..1f721b5f1 100644
--- a/include/Pitch.h
+++ b/include/Pitch.h
@@ -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 b9568e5ad..e8f546dc0 100644
--- a/include/PixmapButton.h
+++ b/include/PixmapButton.h
@@ -67,4 +67,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PIXMAP_BUTTON_H
diff --git a/include/PlayHandle.h b/include/PlayHandle.h
index 005ef17a0..c64931ac0 100644
--- a/include/PlayHandle.h
+++ b/include/PlayHandle.h
@@ -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 0a7b68a55..b1982f98c 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -312,4 +312,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PLUGIN_H
diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h
index 262732398..dd2e0a5cb 100644
--- a/include/PluginBrowser.h
+++ b/include/PluginBrowser.h
@@ -83,4 +83,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PLUGIN_BROWSER_H
diff --git a/include/PluginFactory.h b/include/PluginFactory.h
index 8ea020073..ad09b74ed 100644
--- a/include/PluginFactory.h
+++ b/include/PluginFactory.h
@@ -111,4 +111,4 @@ LMMS_EXPORT PluginFactory* getPluginFactory();
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PLUGIN_FACTORY_H
diff --git a/include/PluginIssue.h b/include/PluginIssue.h
index c3f3e5dbe..87e895113 100644
--- a/include/PluginIssue.h
+++ b/include/PluginIssue.h
@@ -84,5 +84,4 @@ QDebug operator<<(QDebug stream, const PluginIssue& iss);
 
 } // namespace lmms
 
-
-#endif
+#endif // LMMS_PLUGIN_ISSUE_H
diff --git a/include/PluginView.h b/include/PluginView.h
index 75576a8c8..3c78cb00a 100644
--- a/include/PluginView.h
+++ b/include/PluginView.h
@@ -47,4 +47,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PLUGIN_VIEW_H
diff --git a/include/PositionLine.h b/include/PositionLine.h
index 8c1d7d60a..3e798948f 100644
--- a/include/PositionLine.h
+++ b/include/PositionLine.h
@@ -51,4 +51,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_POSITION_LINE_H
diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h
index e37e976e0..b8199a71b 100644
--- a/include/PresetPreviewPlayHandle.h
+++ b/include/PresetPreviewPlayHandle.h
@@ -69,4 +69,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PRESET_PREVIEW_PLAY_HANDLE_H
diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h
index 655d64a17..a4a263078 100644
--- a/include/ProjectJournal.h
+++ b/include/ProjectJournal.h
@@ -126,4 +126,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PROJECT_JOURNAL_H
diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h
index 51577f0b2..861dcb4a8 100644
--- a/include/ProjectNotes.h
+++ b/include/ProjectNotes.h
@@ -93,4 +93,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_PROJECT_NOTES_H
diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h
index d9309d3db..95a1f53ed 100644
--- a/include/ProjectRenderer.h
+++ b/include/ProjectRenderer.h
@@ -103,4 +103,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_PROJECT_RENDERER_H
diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h
index 5401e7126..d9a459a43 100644
--- a/include/ProjectVersion.h
+++ b/include/ProjectVersion.h
@@ -81,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 59ff81ba7..6f007e072 100644
--- a/include/QuadratureLfo.h
+++ b/include/QuadratureLfo.h
@@ -100,4 +100,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_QUADRATURE_LFO_H
diff --git a/include/RaiiHelpers.h b/include/RaiiHelpers.h
index 827cc955d..3108dc080 100644
--- a/include/RaiiHelpers.h
+++ b/include/RaiiHelpers.h
@@ -64,4 +64,4 @@ using UniqueNullableResource = std::unique_ptr<T, NullableResourceDeleter<T, Nul
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RAII_HELPERS_H
diff --git a/include/RecentProjectsMenu.h b/include/RecentProjectsMenu.h
index 8db229dc9..27cdb68e5 100644
--- a/include/RecentProjectsMenu.h
+++ b/include/RecentProjectsMenu.h
@@ -45,4 +45,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_RECENT_PROJECTS_MENU_H
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index af15d7d14..c5fcd7dd2 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -197,4 +197,4 @@ LMMS_EXPORT inline std::string QSTR_TO_STDSTR(QString const& qstr)
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_REMOTE_PLUGIN_H
diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h
index 2c5e5054e..357be1bea 100644
--- a/include/RemotePluginBase.h
+++ b/include/RemotePluginBase.h
@@ -673,4 +673,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_REMOTE_PLUGIN_BASE_H
diff --git a/include/RemotePluginClient.h b/include/RemotePluginClient.h
index 38c311129..77eef68f0 100644
--- a/include/RemotePluginClient.h
+++ b/include/RemotePluginClient.h
@@ -355,4 +355,4 @@ void RemotePluginClient::doProcessing()
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_REMOTE_PLUGIN_CLIENT_H
diff --git a/include/RenameDialog.h b/include/RenameDialog.h
index e7e5b662f..1129f2bb5 100644
--- a/include/RenameDialog.h
+++ b/include/RenameDialog.h
@@ -60,4 +60,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_RENAME_DIALOG_H
diff --git a/include/RenderManager.h b/include/RenderManager.h
index 0787db6d7..5240e96a8 100644
--- a/include/RenderManager.h
+++ b/include/RenderManager.h
@@ -85,4 +85,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RENDER_MANAGER_H
diff --git a/include/RingBuffer.h b/include/RingBuffer.h
index 17f06fc00..90a607a13 100644
--- a/include/RingBuffer.h
+++ b/include/RingBuffer.h
@@ -224,4 +224,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RING_BUFFER_H
diff --git a/include/RmsHelper.h b/include/RmsHelper.h
index 1d739ee0b..fd2c0f9bb 100644
--- a/include/RmsHelper.h
+++ b/include/RmsHelper.h
@@ -98,4 +98,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_RMS_HELPER_H
diff --git a/include/RowTableView.h b/include/RowTableView.h
index 04272026e..3e1c1988d 100644
--- a/include/RowTableView.h
+++ b/include/RowTableView.h
@@ -56,4 +56,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_ROW_TABLE_VIEW_H
diff --git a/include/Rubberband.h b/include/Rubberband.h
index 4805d1d31..cfe36bb70 100644
--- a/include/Rubberband.h
+++ b/include/Rubberband.h
@@ -93,4 +93,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_RUBBERBAND_H
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index 3fac28168..e2ed24b81 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -355,4 +355,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_BUFFER_H
diff --git a/include/SampleClip.h b/include/SampleClip.h
index 427a2bf8b..c9e247328 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -100,4 +100,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_CLIP_H
diff --git a/include/SampleClipView.h b/include/SampleClipView.h
index 7f09ec022..b3f53d790 100644
--- a/include/SampleClipView.h
+++ b/include/SampleClipView.h
@@ -71,4 +71,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SAMPLE_CLIP_VIEW_H
diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h
index c0ff656db..d016fcf0b 100644
--- a/include/SamplePlayHandle.h
+++ b/include/SamplePlayHandle.h
@@ -100,4 +100,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_PLAY_HANDLE_H
diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h
index deb415537..de1ca19ba 100644
--- a/include/SampleRecordHandle.h
+++ b/include/SampleRecordHandle.h
@@ -74,4 +74,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_RECORD_HANDLE_H
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index 94d1413b7..f71f01cd1 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -109,4 +109,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SAMPLE_TRACK_H
diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h
index 12f95bd19..b586df15e 100644
--- a/include/SampleTrackView.h
+++ b/include/SampleTrackView.h
@@ -109,4 +109,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SAMPLE_TRACK_VIEW_H
diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h
index 02d5cacb0..c2a722d53 100644
--- a/include/SampleTrackWindow.h
+++ b/include/SampleTrackWindow.h
@@ -99,5 +99,4 @@ private:
 
 } // namespace lmms::gui
 
-
-#endif
+#endif // LMMS_GUI_SAMPLE_TRACK_WINDOW_H
diff --git a/include/Scale.h b/include/Scale.h
index e36a5e08d..eeae5eb92 100644
--- a/include/Scale.h
+++ b/include/Scale.h
@@ -89,4 +89,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SCALE_H
diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h
index 78fe23852..f1ee2dbca 100644
--- a/include/SendButtonIndicator.h
+++ b/include/SendButtonIndicator.h
@@ -64,4 +64,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SEND_BUTTON_INDICATOR_H
diff --git a/include/SerializingObject.h b/include/SerializingObject.h
index bbbbaafcc..8f75d069e 100644
--- a/include/SerializingObject.h
+++ b/include/SerializingObject.h
@@ -101,4 +101,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SERIALIZING_OBJECT_H
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
index 962804a9c..6a9986d64 100644
--- a/include/SetupDialog.h
+++ b/include/SetupDialog.h
@@ -213,4 +213,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SETUP_DIALOG_H
diff --git a/include/SharedMemory.h b/include/SharedMemory.h
index 0a6d3bf89..c2790c78b 100644
--- a/include/SharedMemory.h
+++ b/include/SharedMemory.h
@@ -149,4 +149,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SHARED_MEMORY_H
diff --git a/include/SideBar.h b/include/SideBar.h
index 0ca597b5a..0dab7abd7 100644
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -60,4 +60,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SIDE_BAR_H
diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h
index 2d7cce15a..caf955327 100644
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -90,4 +90,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_SIDE_BAR_WIDGET_H
diff --git a/include/Song.h b/include/Song.h
index 2e4736ea5..a9df353da 100644
--- a/include/Song.h
+++ b/include/Song.h
@@ -528,4 +528,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SONG_H
diff --git a/include/SongEditor.h b/include/SongEditor.h
index ab71b7fa7..081b2cb61 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -226,4 +226,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_SONG_EDITOR_H
diff --git a/include/StepRecorder.h b/include/StepRecorder.h
index 7cd568a79..456e69a69 100644
--- a/include/StepRecorder.h
+++ b/include/StepRecorder.h
@@ -152,4 +152,4 @@ class StepRecorder : public QObject
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_STEP_RECORDER_H
diff --git a/include/StepRecorderWidget.h b/include/StepRecorderWidget.h
index ec6a37330..48f1e0fb0 100644
--- a/include/StepRecorderWidget.h
+++ b/include/StepRecorderWidget.h
@@ -95,4 +95,4 @@ signals:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_STEP_RECOREDER_WIDGET_H
diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h
index 4763122be..c43996d76 100644
--- a/include/StringPairDrag.h
+++ b/include/StringPairDrag.h
@@ -55,4 +55,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_STRING_PAIR_DRAG_H
diff --git a/include/SubWindow.h b/include/SubWindow.h
index 95bd6c59e..fdda6de42 100644
--- a/include/SubWindow.h
+++ b/include/SubWindow.h
@@ -105,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 3463851c4..b5521da3b 100644
--- a/include/SweepOscillator.h
+++ b/include/SweepOscillator.h
@@ -69,4 +69,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SWEEP_OSCILLATOR_H
diff --git a/include/TabBar.h b/include/TabBar.h
index b8334c1f5..fa2703287 100644
--- a/include/TabBar.h
+++ b/include/TabBar.h
@@ -90,4 +90,4 @@ signals:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_BAR_H
diff --git a/include/TabButton.h b/include/TabButton.h
index c09d1ed8a..c12a2037f 100644
--- a/include/TabButton.h
+++ b/include/TabButton.h
@@ -66,4 +66,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_BUTTON_H
diff --git a/include/TabWidget.h b/include/TabWidget.h
index 942b08738..d28537df8 100644
--- a/include/TabWidget.h
+++ b/include/TabWidget.h
@@ -111,4 +111,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TAB_WIDGET_H
diff --git a/include/TemplatesMenu.h b/include/TemplatesMenu.h
index 660d3c760..6e527c571 100644
--- a/include/TemplatesMenu.h
+++ b/include/TemplatesMenu.h
@@ -50,4 +50,4 @@ private slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TEMPLATES_MENU_H
diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h
index 0987e1903..a8e2eeb7e 100644
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -84,4 +84,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TEMPO_SYNC_KNOB_H
diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h
index 7b1a10b5e..59d7b5dc8 100644
--- a/include/TempoSyncKnobModel.h
+++ b/include/TempoSyncKnobModel.h
@@ -115,4 +115,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TEMPO_SYNC_KNOB_MODEL_H
diff --git a/include/TextFloat.h b/include/TextFloat.h
index 7ba38d141..50dde9855 100644
--- a/include/TextFloat.h
+++ b/include/TextFloat.h
@@ -81,4 +81,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TEXT_FLOAT_H
diff --git a/include/ThreadableJob.h b/include/ThreadableJob.h
index efb4b3dc7..9d5a0beee 100644
--- a/include/ThreadableJob.h
+++ b/include/ThreadableJob.h
@@ -90,4 +90,4 @@ protected:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_THREADABLE_JOB_H
diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h
index 269c24978..9e74b57aa 100644
--- a/include/TimeDisplayWidget.h
+++ b/include/TimeDisplayWidget.h
@@ -71,4 +71,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TIME_DISPLAY_WIDGET_H
diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 882e9453c..0f9b1e23a 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -261,4 +261,4 @@ signals:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TIMELINE_WIDGET_H
diff --git a/include/TimePos.h b/include/TimePos.h
index 61769de35..b86d8eb0f 100644
--- a/include/TimePos.h
+++ b/include/TimePos.h
@@ -116,4 +116,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TIME_POS_H
diff --git a/include/ToolButton.h b/include/ToolButton.h
index aeb88a7e5..6d947f7ad 100644
--- a/include/ToolButton.h
+++ b/include/ToolButton.h
@@ -48,4 +48,4 @@ public:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TOOL_BUTTON_H
diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h
index 4d7107582..e64afd055 100644
--- a/include/ToolPlugin.h
+++ b/include/ToolPlugin.h
@@ -50,4 +50,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TOOL_PLUGIN_H
diff --git a/include/ToolPluginView.h b/include/ToolPluginView.h
index 201a4b165..b0654f125 100644
--- a/include/ToolPluginView.h
+++ b/include/ToolPluginView.h
@@ -49,4 +49,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TOOL_PLUGIN_VIEW_H
diff --git a/include/Track.h b/include/Track.h
index 555850f88..ff3c1ae00 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -25,7 +25,6 @@
 #ifndef LMMS_TRACK_H
 #define LMMS_TRACK_H
 
-
 #include <QVector>
 #include <QColor>
 
@@ -257,4 +256,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TRACK_H
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index d0c116f3a..5ca831dbe 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -124,4 +124,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_TRACK_CONTAINER_H
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index df61666b8..d53291c33 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -218,4 +218,4 @@ signals:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TRACK_CONTAINER_VIEW_H
diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index 09239b392..1a3e14a0e 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -149,4 +149,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_GUI_TRACK_CONTENT_WIDGET_H
diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h
index e7f159798..0d1c6e163 100644
--- a/include/TrackLabelButton.h
+++ b/include/TrackLabelButton.h
@@ -71,4 +71,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_LABEL_BUTTON_H
diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h
index 39e59ac98..4dbb5353c 100644
--- a/include/TrackOperationsWidget.h
+++ b/include/TrackOperationsWidget.h
@@ -80,4 +80,4 @@ signals:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_OPERATIONS_WIDGET_H
diff --git a/include/TrackRenameLineEdit.h b/include/TrackRenameLineEdit.h
index 48fb96092..2f6a1f4fb 100644
--- a/include/TrackRenameLineEdit.h
+++ b/include/TrackRenameLineEdit.h
@@ -47,4 +47,4 @@ private:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_TRACK_RENAME_LINE_EDIT_H
diff --git a/include/TrackView.h b/include/TrackView.h
index a46c15d75..efa4f4a0a 100644
--- a/include/TrackView.h
+++ b/include/TrackView.h
@@ -176,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 9e80b7ead..683d17fb1 100644
--- a/include/ValueBuffer.h
+++ b/include/ValueBuffer.h
@@ -57,4 +57,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VALUE_BUFFER_H
diff --git a/include/VersionedSaveDialog.h b/include/VersionedSaveDialog.h
index 326b11fde..6d707cd51 100644
--- a/include/VersionedSaveDialog.h
+++ b/include/VersionedSaveDialog.h
@@ -68,4 +68,4 @@ public slots:
 
 } // namespace lmms::gui
 
-#endif
+#endif // LMMS_GUI_VERSIONED_SAVE_DIALOG_H
diff --git a/include/VstSyncController.h b/include/VstSyncController.h
index f63bafc41..d3c6af051 100644
--- a/include/VstSyncController.h
+++ b/include/VstSyncController.h
@@ -62,4 +62,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VST_SYNC_CONTROLLER_H
diff --git a/include/VstSyncData.h b/include/VstSyncData.h
index 11da91d8d..480bc7fb4 100644
--- a/include/VstSyncData.h
+++ b/include/VstSyncData.h
@@ -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 188feae9f..a7f6002b8 100644
--- a/include/aeffectx.h
+++ b/include/aeffectx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef AEFFECTX_H
-#define AEFFECTX_H
+#ifndef LMMS_AEFFECTX_H
+#define LMMS_AEFFECTX_H
 
 #include <stdint.h>
 #include <type_traits>
@@ -297,4 +297,4 @@ public:
 
 using audioMasterCallback = intptr_t (VST_CALL_CONV*)(AEffect*, int32_t, int32_t, intptr_t, void*, float);
 
-#endif
+#endif // LMMS_AEFFECTX_H
diff --git a/include/base64.h b/include/base64.h
index 01116e4cd..42066d564 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -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 efabd4522..7cf51acaa 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -38,4 +38,4 @@
 #include <cstdio>
 
 
-#endif
+#endif // LMMS_DEBUG_H
diff --git a/include/denormals.h b/include/denormals.h
index cfb0d5c92..92b84c7dd 100644
--- a/include/denormals.h
+++ b/include/denormals.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,4 +50,4 @@ void inline disable_denormals()
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_DENORMALS_H
diff --git a/include/embed.h b/include/embed.h
index b3d1cbc21..7d69f7c7d 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -139,4 +139,4 @@ public:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_EMBED_H
diff --git a/include/endian_handling.h b/include/endian_handling.h
index 96bf11704..7ddb22f22 100644
--- a/include/endian_handling.h
+++ b/include/endian_handling.h
@@ -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 c9cc508f5..665d88155 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 ab4238409..2d2a8d19e 100644
--- a/include/fft_helpers.h
+++ b/include/fft_helpers.h
@@ -108,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 7a61ccfed..c0afbdfc0 100644
--- a/include/gui_templates.h
+++ b/include/gui_templates.h
@@ -68,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 9f3b3913d..fd2c29a04 100644
--- a/include/interpolation.h
+++ b/include/interpolation.h
@@ -139,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 71cc4ce53..b566fa781 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -145,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 7796f6bdf..e6fce9f4d 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 a010a9d3e..1f896a683 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -328,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 52698677c..56ca04eee 100644
--- a/include/panning.h
+++ b/include/panning.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 6e894e9d8..8f40219f8 100644
--- a/include/panning_constants.h
+++ b/include/panning_constants.h
@@ -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 dfc94b96a..e9fdb57a3 100644
--- a/include/shared_object.h
+++ b/include/shared_object.h
@@ -86,4 +86,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_SHARED_OBJECT_H
diff --git a/include/versioninfo.h b/include/versioninfo.h
index de852b59c..f224b62c5 100644
--- a/include/versioninfo.h
+++ b/include/versioninfo.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 4d26cc815..382f76780 100644
--- a/include/volume.h
+++ b/include/volume.h
@@ -43,4 +43,4 @@ struct StereoVolumeVector
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_VOLUME_H