diff --git a/src/equalizer/equalizerwidget.cpp b/src/equalizer/equalizerwidget.cpp
index 3ec770b..6744a29 100644
--- a/src/equalizer/equalizerwidget.cpp
+++ b/src/equalizer/equalizerwidget.cpp
@@ -22,7 +22,7 @@
 #include "mainwindow.h"
 #include "pixmapbutton.h"
 #include "pixmapslider.h"
-#include "Skin.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 
diff --git a/src/mainwindow/clutterbar.cpp b/src/mainwindow/clutterbar.cpp
index 8a0bc1e..fea051c 100644
--- a/src/mainwindow/clutterbar.cpp
+++ b/src/mainwindow/clutterbar.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "clutterbar.h"
-#include "Skin.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QMouseEvent>
diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp
index f703e57..7f0b32d 100644
--- a/src/mainwindow/maindisplay.cpp
+++ b/src/mainwindow/maindisplay.cpp
@@ -19,24 +19,24 @@
 #include "xconfig.h"
 #include "volumehandler.h"
 
-#include "application.h"
 #include "maindisplay.h"
-#include "mainwindow.h"
 
+#include "application.h"
+#include "clutterbar.h"
+#include "equalizerwindow.h"
+#include "mainwindow.h"
 #include "pixmapbutton.h"
-#include "pixmapslider.h"
-#include "titlebar.h"
-#include "textscroller.h"
-#include "timedisplay.h"
-#include "Skin.h"
-#include "skinmanager.h"
 #include "pixmapnumberdisplay.h"
-#include "stereomono.h"
-#include "posbar.h"
+#include "pixmapslider.h"
 #include "playstatus.h"
 #include "playlistwindow.h"
-#include "equalizerwindow.h"
-#include "clutterbar.h"
+#include "posbar.h"
+#include "skin.h"
+#include "skinmanager.h"
+#include "stereomono.h"
+#include "textscroller.h"
+#include "titlebar.h"
+#include "timedisplay.h"
 
 #include <QFileDialog>
 #include <QSettings>
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index 444ac5b..c26e2f7 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -23,18 +23,16 @@
 #endif
 
 #include "application.h"
-#include "playlistwindow.h"
-#include "maindisplay.h"
-#include "shadeddisplay.h"
 #include "equalizerwindow.h"
-#include "Skin.h"
+#include "maindisplay.h"
+#include "playlistwindow.h"
+#include "shadeddisplay.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QSettings>
 #include <QIcon>
-#include <QPluginLoader>
 #include <QMouseEvent>
-#include <qplugin.h>
 
 MainWindow::MainWindow (QWidget *parent) : BaseWindow (parent)
 {
diff --git a/src/mainwindow/playstatus.cpp b/src/mainwindow/playstatus.cpp
index 4ddfcc5..73d821d 100644
--- a/src/mainwindow/playstatus.cpp
+++ b/src/mainwindow/playstatus.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "playstatus.h"
-#include "Skin.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QPainter>
diff --git a/src/mainwindow/posbar.cpp b/src/mainwindow/posbar.cpp
index 01b9103..51eca99 100644
--- a/src/mainwindow/posbar.cpp
+++ b/src/mainwindow/posbar.cpp
@@ -14,7 +14,8 @@
  */
 
 #include "posbar.h"
-#include "Skin.h"
+
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QWidget>
diff --git a/src/mainwindow/shadeddisplay.cpp b/src/mainwindow/shadeddisplay.cpp
index 30bbc78..5972975 100644
--- a/src/mainwindow/shadeddisplay.cpp
+++ b/src/mainwindow/shadeddisplay.cpp
@@ -17,16 +17,16 @@
 #include "xclientcache.h"
 #include "xplayback.h"
 
-#include "application.h"
 #include "shadeddisplay.h"
+
+#include "application.h"
+#include "mainwindow.h"
+#include "pixmapbutton.h"
+#include "skin.h"
 #include "skinmanager.h"
 #include "titlebar.h"
-#include "pixmapbutton.h"
-
 #include "timedisplay.h"
 #include "textscroller.h"
-#include "Skin.h"
-#include "mainwindow.h"
 
 ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
 {
diff --git a/src/mainwindow/skindisplay.cpp b/src/mainwindow/skindisplay.cpp
index 4aa692e..b6fc614 100644
--- a/src/mainwindow/skindisplay.cpp
+++ b/src/mainwindow/skindisplay.cpp
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2008 XMMS2 Team
+ *  Copyright (C) 2005-2010 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,10 +16,10 @@
 #include "xclient.h"
 #include "xcollection.h"
 
+#include "skindisplay.h"
+
 #include "application.h"
 #include "mainwindow.h"
-#include "skindisplay.h"
-#include "Skin.h"
 
 #include "titlebar.h"
 #include "FileDialog.h"
diff --git a/src/mainwindow/stereomono.cpp b/src/mainwindow/stereomono.cpp
index f02c128..c4b1c6b 100644
--- a/src/mainwindow/stereomono.cpp
+++ b/src/mainwindow/stereomono.cpp
@@ -14,7 +14,8 @@
  */
 
 #include "stereomono.h"
-#include "Skin.h"
+
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QPainter>
diff --git a/src/mainwindow/textscroller.cpp b/src/mainwindow/textscroller.cpp
index 0504768..849cc04 100644
--- a/src/mainwindow/textscroller.cpp
+++ b/src/mainwindow/textscroller.cpp
@@ -13,10 +13,11 @@
  *  GNU General Public License for more details.
  */
 
+#include <application.h>
+#include "skin.h"
 #include "skindisplay.h"
-#include "textscroller.h"
-#include "Skin.h"
 #include "skinmanager.h"
+#include "textscroller.h"
 
 #include <QBrush>
 #include <QFont>
@@ -27,8 +28,6 @@
 #include <QSettings>
 #include <QTimer>
 
-#include <application.h>
-
 #include "promoe_config.h"
 
 TextScroller::TextScroller (QWidget *parent, uint w,
diff --git a/src/mainwindow/titlebar.cpp b/src/mainwindow/titlebar.cpp
index e0a422b..50aec8e 100644
--- a/src/mainwindow/titlebar.cpp
+++ b/src/mainwindow/titlebar.cpp
@@ -13,16 +13,17 @@
  *  GNU General Public License for more details.
  */
 
-#include "mainwindow.h"
 #include "titlebar.h"
-#include "skindisplay.h"
-#include "SkinChooser.h"
-// #include "MedialibWindow.h"
-#include "settingsdialog.h"
-#include "pixmapbutton.h"
+
 #include "BrowseDialog.h"
-#include "Skin.h"
+#include "mainwindow.h"
 #include "skinmanager.h"
+#include "pixmapbutton.h"
+#include "settingsdialog.h"
+#include "skin.h"
+#include "SkinChooser.h"
+#include "skindisplay.h"
+// #include "MedialibWindow.h"
 
 #include <QMenu>
 #include <QPainter>
diff --git a/src/playlist/playlistmenu.cpp b/src/playlist/playlistmenu.cpp
index de60949..f279970 100644
--- a/src/playlist/playlistmenu.cpp
+++ b/src/playlist/playlistmenu.cpp
@@ -14,7 +14,8 @@
  */
 
 #include "playlistmenu.h"
-#include "Skin.h"
+
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QMouseEvent>
diff --git a/src/playlist/playlistmenu.h b/src/playlist/playlistmenu.h
index c6e7f95..22e520f 100644
--- a/src/playlist/playlistmenu.h
+++ b/src/playlist/playlistmenu.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2008 XMMS2 Team
+ *  Copyright (C) 2005-2010 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,9 @@
 #ifndef __PLAYLISTMENU_H__
 #define __PLAYLISTMENU_H__
 
+#include <skin.h>
+
 #include <QWidget>
-#include "Skin.h"
 
 class PlaylistMenu;
 
diff --git a/src/playlist/playlistshade.cpp b/src/playlist/playlistshade.cpp
index ca8454f..9b32737 100644
--- a/src/playlist/playlistshade.cpp
+++ b/src/playlist/playlistshade.cpp
@@ -17,10 +17,10 @@
 #include "xclientcache.h"
 
 #include "application.h"
+#include "pixmapbutton.h"
 #include "playlistshade.h"
 #include "playlistwindow.h"
-#include "pixmapbutton.h"
-#include "Skin.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QSettings>
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 7d9c12e..b43ac76 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -17,11 +17,11 @@
 #include "xplayback.h"
 
 #include "application.h"
+#include "entryinfo.h"
 #include "playlistview.h"
 #include "playlistmodel.h"
 #include "playlistwidget.h"
-#include "Skin.h"
-#include "entryinfo.h"
+#include "skin.h"
 #include "skinmanager.h"
 
 #include <QColor>
diff --git a/src/skin/SkinChooser.cpp b/src/skin/SkinChooser.cpp
index 0763160..90bce8e 100644
--- a/src/skin/SkinChooser.cpp
+++ b/src/skin/SkinChooser.cpp
@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "Skin.h"
+#include "skin.h"
 #include "SkinChooser.h"
 #include "skinmanager.h"
 
diff --git a/src/skin/Skin.cpp b/src/skin/skin.cpp
similarity index 99%
rename from src/skin/Skin.cpp
rename to src/skin/skin.cpp
index 8f0785b..19fa433 100644
--- a/src/skin/Skin.cpp
+++ b/src/skin/skin.cpp
@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "Skin.h"
+#include "skin.h"
 
 #include <QDir>
 #include <QPainter>
@@ -839,4 +839,4 @@ Skin::setPositions ()
 //	m_positions.insert (SLIDER_EQUALIZER_BGS, QPoint ());
 }
 
-#include "Skin.moc"
+#include "skin.moc"
diff --git a/src/skin/Skin.h b/src/skin/skin.h
similarity index 100%
rename from src/skin/Skin.h
rename to src/skin/skin.h
diff --git a/src/skin/skinmanager.cpp b/src/skin/skinmanager.cpp
index 1e8a0a8..874d11c 100644
--- a/src/skin/skinmanager.cpp
+++ b/src/skin/skinmanager.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "skinmanager.h"
-#include "Skin.h"
+#include "skin.h"
 
 #include <QSettings>
 #include <QDebug>