diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h
index df6343696fe..53bb0ad66f6 100644
--- a/include/Lv2Proc.h
+++ b/include/Lv2Proc.h
@@ -48,6 +48,8 @@
 namespace lmms
 {
 
+class AutomatableModel;
+class MidiEvent;
 class PluginIssue;
 class SampleFrame;
 
@@ -161,13 +163,13 @@ class LMMS_EXPORT Lv2Proc : public ModelGroup
 	//! Run the Lv2 plugin instance for @param frames frames
 	void run(fpp_t frames);
 
-	void handleMidiInputEvent(const class MidiEvent &event,
+	void handleMidiInputEvent(const MidiEvent &event,
 		const TimePos &time, f_cnt_t offset);
 
 	/*
 		misc
 	 */
-	class AutomatableModel *modelAtPort(const QString &uri); // unused currently
+	AutomatableModel *modelAtPort(const QString &uri); // unused currently
 	std::size_t controlCount() const { return ModelGroup::size(); }
 	bool hasNoteInput() const;
 	const LilvPlugin* getPlugin() const { return m_plugin; }
diff --git a/include/ModelGroup.h b/include/ModelGroup.h
index f4c9501dd3f..f5d2c18dc83 100644
--- a/include/ModelGroup.h
+++ b/include/ModelGroup.h
@@ -88,8 +88,8 @@ class LMMS_EXPORT ModelGroup
 	{
 	}
 
-	void saveSettings(class QDomDocument& doc, class QDomElement& that);
-	void loadSettings(const class QDomElement& that);
+	void saveSettings(QDomDocument& doc, QDomElement& that);
+	void loadSettings(const QDomElement& that);
 
 	std::size_t size() const { return m_models.size(); }
 
diff --git a/include/ModelGroupView.h b/include/ModelGroupView.h
index 040c22c458f..d8a981209f6 100644
--- a/include/ModelGroupView.h
+++ b/include/ModelGroupView.h
@@ -25,9 +25,13 @@
 #ifndef LMMS_GUI_MODEL_GROUP_VIEWS_H
 #define LMMS_GUI_MODEL_GROUP_VIEWS_H
 
-#include <QWidget>
 #include <cstddef>
+#include <map>
 #include <memory>
+#include <string>
+
+class QString;
+class QWidget;
 
 namespace lmms {
 
@@ -36,6 +40,7 @@ class ModelGroup;
 namespace gui {
 
 class Control;
+class ControlLayout;
 
 /**
 	@file ModelGroupView.h
@@ -61,12 +66,12 @@ class ModelGroupView
 	void removeFocusFromSearchBar();
 
 private:
-	class ModelGroup* m_model;
+	ModelGroup* m_model;
 
 	//! column number in surrounding grid in ModelGroupView
 	std::size_t m_colNum;
-	class ControlLayout* m_layout;
-	std::map<std::string, std::unique_ptr<class Control>> m_widgets;
+	ControlLayout* m_layout;
+	std::map<std::string, std::unique_ptr<Control>> m_widgets;
 };
 
 } // namespace gui