diff --git a/plugins/WaveAnalyzer/WaveAnalyzer.cpp b/plugins/WaveAnalyzer/WaveAnalyzer.cpp
index 39e75a81f2d..f6604baf6ff 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzer.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzer.cpp
@@ -31,15 +31,18 @@
 #include "lmms_math.h"
 #include "plugin_export.h"
 
+namespace lmms
+{
+
 extern "C" {
 	Plugin::Descriptor PLUGIN_EXPORT WaveAnalyzer_plugin_descriptor = 
 	{
-		STRINGIFY(PLUGIN_NAME),
+		LMMS_STRINGIFY(PLUGIN_NAME),
 		"Wave Analyzer",
 		QT_TRANSLATE_NOOP("PluginBrowser", "A simple oscilloscope effect."),
 		"Ian Caio <iancaio_dev/at/hotmail.com>",
 		0x0112,
-		Plugin::Effect,
+		Plugin::Type::Effect,
 		new PluginPixmapLoader("logo"),
 		nullptr,
 		nullptr
@@ -117,3 +120,5 @@ extern "C"
 		return new WaveAnalyzerEffect(parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(data));
 	}
 }
+
+}
\ No newline at end of file
diff --git a/plugins/WaveAnalyzer/WaveAnalyzer.h b/plugins/WaveAnalyzer/WaveAnalyzer.h
index b57e6865494..9b119bc3234 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzer.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzer.h
@@ -28,6 +28,9 @@
 #include "Effect.h"
 #include "WaveAnalyzerControls.h"
 
+namespace lmms
+{
+
 class WaveAnalyzerEffect : public Effect
 {
 public:
@@ -46,4 +49,6 @@ class WaveAnalyzerEffect : public Effect
 	const unsigned int m_maxBufferSize = 4096;
 };
 
+}
+
 #endif
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.cpp b/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.cpp
index ff3c2729d07..7be94fda675 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.cpp
@@ -32,6 +32,9 @@
 
 #include "embed.h"
 
+namespace lmms::gui
+{
+
 WaveAnalyzerClipIndicator::WaveAnalyzerClipIndicator(WaveAnalyzerControls* controls, QWidget* parent) :
 	QWidget(parent),
 	m_controls(controls)
@@ -91,3 +94,5 @@ void WaveAnalyzerClipIndicator::paintClipLeds(QPaintEvent* pe, QPainter & painte
 		painter.drawPixmap(rightLed, *m_clipLedsPixmap, rightLed);
 	}
 }
+
+}
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.h b/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.h
index aba63419f5a..c13d09f6274 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzerClipIndicator.h
@@ -30,8 +30,14 @@
 #include <QWidget>
 #include <QMouseEvent>
 
+namespace lmms
+{
+
 class WaveAnalyzerControls;
 
+namespace gui
+{
+
 class WaveAnalyzerClipIndicator : public QWidget
 {
 	Q_OBJECT
@@ -51,4 +57,8 @@ class WaveAnalyzerClipIndicator : public QWidget
 	QPixmap* m_clipLedsPixmap;
 };
 
+}
+
+}
+
 #endif
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.cpp b/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.cpp
index bdb6a657b1e..cd9412ca047 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.cpp
@@ -37,6 +37,9 @@
 #include "PixmapButton.h"
 #include "WaveAnalyzerControls.h"
 
+namespace lmms::gui
+{
+
 WaveAnalyzerControlDialog::WaveAnalyzerControlDialog(WaveAnalyzerControls* controls) :
 	EffectControlDialog(controls)
 {
@@ -94,7 +97,7 @@ WaveAnalyzerControlDialog::WaveAnalyzerControlDialog(WaveAnalyzerControls* contr
 	comboBoxLayout->addWidget(drawingMode);
 
 	// Adds numberOfFrames Knob
-	Knob* framesKnob = new Knob(knobBright_26);
+	Knob* framesKnob = new Knob(KnobType::Bright26);
 	framesKnob->setLabel("Frames");
 	framesKnob->setModel(&controls->m_numberOfFrames);
 
@@ -141,3 +144,5 @@ WaveAnalyzerControlDialog::WaveAnalyzerControlDialog(WaveAnalyzerControls* contr
 WaveAnalyzerControlDialog::~WaveAnalyzerControlDialog()
 {
 }
+
+}
\ No newline at end of file
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.h b/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.h
index f9d36db861d..1cfc00fd184 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzerControlDialog.h
@@ -27,8 +27,14 @@
 
 #include "EffectControlDialog.h"
 
+namespace lmms
+{
+
 class WaveAnalyzerControls;
 
+namespace gui
+{
+
 class WaveAnalyzerControlDialog : public EffectControlDialog
 {
 	Q_OBJECT
@@ -37,4 +43,8 @@ class WaveAnalyzerControlDialog : public EffectControlDialog
 	virtual ~WaveAnalyzerControlDialog();
 };
 
+}
+
+}
+
 #endif
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerControls.cpp b/plugins/WaveAnalyzer/WaveAnalyzerControls.cpp
index 6a5712c3abc..1f48891fa32 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerControls.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzerControls.cpp
@@ -28,6 +28,9 @@
 
 #include "WaveAnalyzer.h"
 
+namespace lmms
+{
+
 WaveAnalyzerControls::WaveAnalyzerControls(WaveAnalyzerEffect* effect) :
 	EffectControls(effect),
 	m_effect(effect),
@@ -77,3 +80,5 @@ void WaveAnalyzerControls::loadSettings(const QDomElement & _this)
 void WaveAnalyzerControls::saveSettings(QDomDocument & doc, QDomElement & parent)
 {
 }
+
+}
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerControls.h b/plugins/WaveAnalyzer/WaveAnalyzerControls.h
index 0b18ab493df..9ae22735f8b 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerControls.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzerControls.h
@@ -31,6 +31,18 @@
 #include "EffectControls.h"
 #include "WaveAnalyzerControlDialog.h"
 
+namespace lmms
+{
+
+namespace gui
+{
+	class WaveAnalyzerControlDialog;
+	class WaveAnalyzerLevelIndicator;
+	class WaveAnalyzerClipIndicator;
+	class WaveAnalyzerOsc;
+	class WaveAnalyzerWaveform;
+}
+
 class WaveAnalyzerEffect;
 
 class WaveAnalyzerControls : public EffectControls
@@ -55,9 +67,9 @@ class WaveAnalyzerControls : public EffectControls
 		return 2;
 	}
 
-	virtual EffectControlDialog* createView()
+	virtual lmms::gui::EffectControlDialog* createView()
 	{
-		return new WaveAnalyzerControlDialog(this);
+		return new lmms::gui::WaveAnalyzerControlDialog(this);
 	}
 
 signals:
@@ -90,11 +102,13 @@ class WaveAnalyzerControls : public EffectControls
 	float m_ampBufferR[BUFFER_MAX_SIZE];
 
 	friend class WaveAnalyzerEffect;
-	friend class WaveAnalyzerControlDialog;
-	friend class WaveAnalyzerLevelIndicator;
-	friend class WaveAnalyzerClipIndicator;
-	friend class WaveAnalyzerOsc;
-	friend class WaveAnalyzerWaveform;
+	friend class gui::WaveAnalyzerControlDialog;
+	friend class gui::WaveAnalyzerLevelIndicator;
+	friend class gui::WaveAnalyzerClipIndicator;
+	friend class gui::WaveAnalyzerOsc;
+	friend class gui::WaveAnalyzerWaveform;
 };
 
+}
+
 #endif
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.cpp b/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.cpp
index bb902bed730..8c596e7d887 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.cpp
@@ -33,6 +33,9 @@
 #include "embed.h"
 #include "lmms_math.h"
 
+namespace lmms::gui
+{
+
 WaveAnalyzerLevelIndicator::WaveAnalyzerLevelIndicator(WaveAnalyzerControls* controls, QWidget* parent) :
 	QWidget(parent),
 	m_controls(controls),
@@ -103,3 +106,5 @@ void WaveAnalyzerLevelIndicator::paintPeaks(QPaintEvent* pe, QPainter & painter)
 	QRect rightLevel(0, height, rightSize, height);
 	painter.drawPixmap(rightLevel, *m_levelsPixmap, rightLevel);
 }
+
+}
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.h b/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.h
index 7fd6028c5f4..ca29d6f36ad 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzerLevelIndicator.h
@@ -29,8 +29,14 @@
 #include <QPixmap>
 #include <QWidget>
 
+namespace lmms
+{
+
 class WaveAnalyzerControls;
 
+namespace gui
+{
+
 class WaveAnalyzerLevelIndicator : public QWidget
 {
 	Q_OBJECT
@@ -52,4 +58,8 @@ class WaveAnalyzerLevelIndicator : public QWidget
 	QPixmap* m_levelsPixmap;
 };
 
+}
+
+}
+
 #endif
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerOsc.cpp b/plugins/WaveAnalyzer/WaveAnalyzerOsc.cpp
index b8def5308aa..515228ca23c 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerOsc.cpp
+++ b/plugins/WaveAnalyzer/WaveAnalyzerOsc.cpp
@@ -32,6 +32,9 @@
 #include <QPainter>
 #include <QPainterPath>
 
+namespace lmms::gui
+{
+
 WaveAnalyzerOsc::WaveAnalyzerOsc(WaveAnalyzerControls* controls, QWidget* parent) :
 	QWidget(parent),
 	m_controls(controls)
@@ -489,3 +492,5 @@ void WaveAnalyzerWaveform::paintEvent(QPaintEvent* pe)
 			return;
 	}
 }
+
+}
diff --git a/plugins/WaveAnalyzer/WaveAnalyzerOsc.h b/plugins/WaveAnalyzer/WaveAnalyzerOsc.h
index 5b76b0e8db5..19167c1e1bd 100644
--- a/plugins/WaveAnalyzer/WaveAnalyzerOsc.h
+++ b/plugins/WaveAnalyzer/WaveAnalyzerOsc.h
@@ -48,8 +48,14 @@
 // Sizes
 #define labelFontSize 12
 
+namespace lmms
+{
+
 class WaveAnalyzerControls;
 
+namespace gui
+{
+
 class WaveAnalyzerWaveform : public QWidget
 {
 	Q_OBJECT
@@ -107,4 +113,8 @@ class WaveAnalyzerOsc : public QWidget
 	WaveAnalyzerControls* m_controls;
 };
 
+}
+
+}
+
 #endif