diff --git a/plugins/wtsynth/CMakeLists.txt b/plugins/wtsynth/CMakeLists.txt
index 82e03fcd9..71085901f 100644
--- a/plugins/wtsynth/CMakeLists.txt
+++ b/plugins/wtsynth/CMakeLists.txt
@@ -1,3 +1,4 @@
 INCLUDE(BuildPlugin)
 
 BUILD_PLUGIN(wtsynth WTSynth.cpp WTSynth.h MOCFILES WTSynth.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
+
diff --git a/plugins/wtsynth/WTSynth.cpp b/plugins/wtsynth/WTSynth.cpp
index 85a9f8d6e..c343c56e3 100644
--- a/plugins/wtsynth/WTSynth.cpp
+++ b/plugins/wtsynth/WTSynth.cpp
@@ -24,7 +24,8 @@
 
 #include <QtXml/QDomElement>
 #include <QtGlobal>
-#include <QPixmap>
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>
 
 #include "WTSynth.h"
 #include "engine.h"
@@ -36,14 +37,13 @@
 
 #include "embed.h"
 
-
 extern "C"
 {
 
 Plugin::Descriptor PLUGIN_EXPORT wtsynth_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
-	"wtsynth",
+	"WTSynth",
 	QT_TRANSLATE_NOOP( "pluginBrowser",
 				"4-oscillator modulatable wavetable synth" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
@@ -512,21 +512,6 @@ void WTSynthInstrument::updateTunes( int _osc )
 }
 
 
-
-
-
-
-#define makeknob( name, x, y, hint, unit, oname ) 		\
-	name = new knob( knobBright_26, this); 			\
-	name ->move( x, y );								\
-	name ->setHintText( tr( hint ) + " ", unit );		\
-	name ->setObjectName( oname );
-
-#define A1ROW 25
-#define A2ROW 47
-#define B1ROW 69
-#define B2ROW 91
-
 WTSynthView::WTSynthView( Instrument * _instrument,
 					QWidget * _parent ) :
 	InstrumentView( _instrument, _parent )
diff --git a/plugins/wtsynth/WTSynth.h b/plugins/wtsynth/WTSynth.h
index b53eb77c5..5512d1911 100644
--- a/plugins/wtsynth/WTSynth.h
+++ b/plugins/wtsynth/WTSynth.h
@@ -36,6 +36,18 @@
 #include "pixmap_button.h"
 
 
+#define makeknob( name, x, y, hint, unit, oname ) 		\
+	name = new knob( knobBright_26, this); 				\
+	name ->move( x, y );								\
+	name ->setHintText( tr( hint ) + " ", unit );		\
+	name ->setObjectName( oname );
+
+#define A1ROW 25
+#define A2ROW 47
+#define B1ROW 69
+#define B2ROW 91
+
+
 const int WAVELEN = 220;
 
 const int	MOD_MIX = 0;
@@ -50,8 +62,6 @@ const int	B1_OSC = 2;
 const int	B2_OSC = 3;
 const int	NUM_OSCS = 4;
 
-class WTSynthInstrument;
-class WTSynthView;
 
 class WTSynthObject
 {
@@ -86,12 +96,15 @@ private:
 
 	const sample_rate_t m_samplerate;
 	NotePlayHandle * m_nph;
-	
+
 	float m_lphase [NUM_OSCS];
 	float m_rphase [NUM_OSCS];
-	
+
 	float m_lfreq [NUM_OSCS];
 	float m_rfreq [NUM_OSCS];
+	
+	friend class WTSynthInstrument;
+	friend class WTSynthView;
 };
 
 class WTSynthInstrument : public Instrument
@@ -159,7 +172,7 @@ private:
 	FloatModel a2_rtune;
 	FloatModel b1_rtune;
 	FloatModel b2_rtune;
-	
+
 	graphModel a1_graph;
 	graphModel a2_graph;
 	graphModel b1_graph;
@@ -168,9 +181,9 @@ private:
 	FloatModel m_abmix;
 	IntModel m_amod;
 	IntModel m_bmod;
-	
+
 	IntModel m_selectedGraph;
-	
+
 	bool m_volChanged [NUM_OSCS];
 	bool m_multChanged [NUM_OSCS];
 	bool m_tuneChanged [NUM_OSCS];
@@ -236,13 +249,11 @@ private:
 	automatableButtonGroup * m_aModGroup;
 	automatableButtonGroup * m_bModGroup;
 
-	static QPixmap * s_artwork;
-
 	graph * a1_graph;
 	graph * a2_graph;
 	graph * b1_graph;
 	graph * b2_graph;
-	
+
 	pixmapButton * m_sinWaveButton;
 	pixmapButton * m_triWaveButton;
 	pixmapButton * m_sawWaveButton;
@@ -253,6 +264,8 @@ private:
 	pixmapButton * m_phaseLeftButton;
 	pixmapButton * m_phaseRightButton;
 	
+	friend class WTSynthInstrument;
+
 };
 
 #endif