diff --git a/README b/README
index 006e45e..c3305e6 100644
--- a/README
+++ b/README
@@ -15,11 +15,18 @@ Compiling:
 	5) ????
 	6) profit
 
-Compilation Errors:
+Compilation problems:
 	- Errormessage "WARNING: Found potential symbol conflict of <somefile>"
 	  -> make sure you use uic from Qt4 (uic -version)
 	     (on debian systems it's sufficant if uic-qt4 exists)
 
+	- Errormessage "error: xmmsclient/xmmsclient++.h: No such file or directory"
+	  followed by a bunch of other errors
+	  -> You don't have the xmms2-c++ header files installed
+	     (package libxmmsclient++-dev on debian)
+	     After installing the headerfiles run 'make distclean' and start again 
+		 from 'Compiling 1)'
+
 Reporting Bugs:
 	preferred way to report bugs is through xmms2's bugtracker at
 	'http://bugs.xmms2.xmms.se/' at project 'Client - Promoe'
diff --git a/src/SkinChooser.cpp b/src/SkinChooser.cpp
index 68200ec..65a241e 100644
--- a/src/SkinChooser.cpp
+++ b/src/SkinChooser.cpp
@@ -18,9 +18,11 @@
 #include "SkinChooser.h"
 
 #include <QDir>
-#include <QIcon>
 #include <QFile>
+#include <QIcon>
+#include <QLabel>
 #include <QSettings>
+#include <QVBoxLayout>
 
 SkinChooser::SkinChooser (QWidget *parent) : QMainWindow (parent)
 {
diff --git a/src/SkinChooser.h b/src/SkinChooser.h
index 49cf4c4..181c66b 100644
--- a/src/SkinChooser.h
+++ b/src/SkinChooser.h
@@ -15,9 +15,9 @@
 
 
 #include <QListWidget>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QMainWindow>
+class QLabel;
+class QVBoxLayout;
 
 class MainWindow;
 
diff --git a/src/SmallNumberDisplay.cpp b/src/SmallNumberDisplay.cpp
index 4507c97..6552d1d 100644
--- a/src/SmallNumberDisplay.cpp
+++ b/src/SmallNumberDisplay.cpp
@@ -16,6 +16,8 @@
 #include "SmallNumberDisplay.h"
 #include "Skin.h"
 
+#include <QPainter>
+
 SmallNumberDisplay::SmallNumberDisplay (QWidget *parent, int w) : PixWidget (parent)
 {
 	m_w = w;
diff --git a/src/SmallNumberDisplay.h b/src/SmallNumberDisplay.h
index 08b1c41..7b92914 100644
--- a/src/SmallNumberDisplay.h
+++ b/src/SmallNumberDisplay.h
@@ -17,7 +17,6 @@
 #define __SMALLNUMBERDISPLAY_H__
 
 #include "PixWidget.h"
-#include <QPainter>
 
 
 class SmallNumberDisplay : public PixWidget