diff --git a/src/AccountFactoryWrapper.cpp b/src/AccountFactoryWrapper.cpp
index 634f9c25f..b4eb785ef 100644
--- a/src/AccountFactoryWrapper.cpp
+++ b/src/AccountFactoryWrapper.cpp
@@ -22,7 +22,7 @@
 #include "accounts/AccountManager.h"
 #include "guihelpers.h"
 #include "AccountFactoryWrapperDelegate.h"
-#include "delegateconfigwrapper.h"
+#include "DelegateConfigWrapper.h"
 #include "ui_AccountFactoryWrapper.h"
 
 using namespace Tomahawk::Accounts;
diff --git a/src/audiocontrols.cpp b/src/AudioControls.cpp
similarity index 99%
rename from src/audiocontrols.cpp
rename to src/AudioControls.cpp
index 085d2703d..08b9fe6cf 100644
--- a/src/audiocontrols.cpp
+++ b/src/AudioControls.cpp
@@ -17,8 +17,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "audiocontrols.h"
-#include "ui_audiocontrols.h"
+#include "AudioControls.h"
+#include "ui_AudioControls.h"
 
 #include <QtNetwork/QNetworkReply>
 #include <QtGui/QDropEvent>
diff --git a/src/audiocontrols.h b/src/AudioControls.h
similarity index 100%
rename from src/audiocontrols.h
rename to src/AudioControls.h
diff --git a/src/audiocontrols.ui b/src/AudioControls.ui
similarity index 100%
rename from src/audiocontrols.ui
rename to src/AudioControls.ui
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c34e9f487..08b5f72d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,17 +39,17 @@ ENDIF()
 SET( tomahawkSources ${tomahawkSources}
      web/api_v1.cpp
 
-     musicscanner.cpp
-     shortcuthandler.cpp
-     scanmanager.cpp
-     ubuntuunityhack.cpp
-     tomahawkapp.cpp
+     MusicScanner.cpp
+     ShortcutHandler.cpp
+     ScanManager.cpp
+     UbuntuUnityHack.cpp
+     TomahawkApp.cpp
      main.cpp
 )
 
 IF(LIBLASTFM_FOUND)
     SET(tomahawkSources ${tomahawkSources}
-        scrobbler.cpp
+        Scrobbler.cpp
     )
 ENDIF(LIBLASTFM_FOUND)
 
@@ -78,14 +78,14 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      accounts/spotify/SpotifyAccountConfig.cpp
      accounts/spotify/SpotifyPlaylistUpdater.cpp
 
-     tomahawktrayicon.cpp
-     audiocontrols.cpp
-     settingsdialog.cpp
-     diagnosticsdialog.cpp
+     TomahawkTrayIcon.cpp
+     AudioControls.cpp
+     SettingsDialog.cpp
+     DiagnosticsDialog.cpp
      AccountDelegate.cpp
-     settingslistdelegate.cpp
-     delegateconfigwrapper.cpp
-     tomahawkwindow.cpp
+     SettingsListDelegate.cpp
+     DelegateConfigWrapper.cpp
+     TomahawkWindow.cpp
      LoadXSPFDialog.cpp
      AccountFactoryWrapper.cpp
      AccountFactoryWrapperDelegate.cpp
@@ -97,15 +97,15 @@ IF( WITH_BREAKPAD )
 ENDIF()
 
 SET( tomahawkUI ${tomahawkUI}
-     tomahawkwindow.ui
-     diagnosticsdialog.ui
-     stackedsettingsdialog.ui
-     proxydialog.ui
+     TomahawkWindow.ui
+     DiagnosticsDialog.ui
+     StackedSettingsDialog.ui
+     ProxyDialog.ui
 
      accounts/lastfm/LastFmConfig.ui
      accounts/spotify/SpotifyAccountConfig.ui
 
-     audiocontrols.ui
+     AudioControls.ui
      LoadXSPFDialog.ui
      AccountFactoryWrapper.ui
      SocialWidget.ui
@@ -166,7 +166,7 @@ IF(QCA2_FOUND)
 ENDIF(QCA2_FOUND)
 
 INCLUDE(GNUInstallDirs)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
diff --git a/src/config.h.in b/src/Config.h.in
similarity index 100%
rename from src/config.h.in
rename to src/Config.h.in
diff --git a/src/configdelegatebase.h b/src/ConfigDelegateBase.h
similarity index 100%
rename from src/configdelegatebase.h
rename to src/ConfigDelegateBase.h
diff --git a/src/delegateconfigwrapper.cpp b/src/DelegateConfigWrapper.cpp
similarity index 99%
rename from src/delegateconfigwrapper.cpp
rename to src/DelegateConfigWrapper.cpp
index 0a90024f6..abd1de5ad 100644
--- a/src/delegateconfigwrapper.cpp
+++ b/src/DelegateConfigWrapper.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
-#include "delegateconfigwrapper.h"
+#include "DelegateConfigWrapper.h"
 #include <QMessageBox>
 
 
diff --git a/src/delegateconfigwrapper.h b/src/DelegateConfigWrapper.h
similarity index 100%
rename from src/delegateconfigwrapper.h
rename to src/DelegateConfigWrapper.h
diff --git a/src/diagnosticsdialog.cpp b/src/DiagnosticsDialog.cpp
similarity index 97%
rename from src/diagnosticsdialog.cpp
rename to src/DiagnosticsDialog.cpp
index 7b5956836..03454705e 100644
--- a/src/diagnosticsdialog.cpp
+++ b/src/DiagnosticsDialog.cpp
@@ -17,8 +17,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "diagnosticsdialog.h"
-#include "ui_diagnosticsdialog.h"
+#include "DiagnosticsDialog.h"
+#include "ui_DiagnosticsDialog.h"
 
 #include "config.h"
 
@@ -124,7 +124,7 @@ void DiagnosticsDialog::updateLogView()
 
 //         Q_FOREACH( const QString &peerId, sip->peersOnline() )
 //         {
-//             /* enable this again, when we check the source has this peerId
+//             /* enable this again, when we check the Source.has this peerId
 //             bool connected = false;
 //             Q_FOREACH( const Tomahawk::source_ptr &source, sources )
 //             {
diff --git a/src/diagnosticsdialog.h b/src/DiagnosticsDialog.h
similarity index 100%
rename from src/diagnosticsdialog.h
rename to src/DiagnosticsDialog.h
diff --git a/src/diagnosticsdialog.ui b/src/DiagnosticsDialog.ui
similarity index 100%
rename from src/diagnosticsdialog.ui
rename to src/DiagnosticsDialog.ui
diff --git a/src/headlesscheck.h b/src/HeadlessCheck.h
similarity index 97%
rename from src/headlesscheck.h
rename to src/HeadlessCheck.h
index 0829f0a32..046d6d712 100644
--- a/src/headlesscheck.h
+++ b/src/HeadlessCheck.h
@@ -29,7 +29,7 @@
 
 #define TOMAHAWK_APPLICATION QApplication
 #include <QApplication>
-#include "tomahawkwindow.h"
+#include "TomahawkWindow.h"
 
 #endif
 
diff --git a/src/musicscanner.cpp b/src/MusicScanner.cpp
similarity index 99%
rename from src/musicscanner.cpp
rename to src/MusicScanner.cpp
index 06a0cf2c6..349305e17 100644
--- a/src/musicscanner.cpp
+++ b/src/MusicScanner.cpp
@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "musicscanner.h"
+#include "MusicScanner.h"
 
 #include <QtCore/QCoreApplication>
 
diff --git a/src/musicscanner.h b/src/MusicScanner.h
similarity index 100%
rename from src/musicscanner.h
rename to src/MusicScanner.h
diff --git a/src/proxydialog.ui b/src/ProxyDialog.ui
similarity index 100%
rename from src/proxydialog.ui
rename to src/ProxyDialog.ui
diff --git a/src/resolverconfigdelegate.cpp b/src/ResolverConfigDelegate.cpp
similarity index 98%
rename from src/resolverconfigdelegate.cpp
rename to src/ResolverConfigDelegate.cpp
index 96f2274f2..d76b2db0a 100644
--- a/src/resolverconfigdelegate.cpp
+++ b/src/ResolverConfigDelegate.cpp
@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resolverconfigdelegate.h"
+#include "ResolverConfigDelegate.h"
 
 // #include "resolversmodel.h"
 #include "ExternalResolverGui.h"
@@ -68,7 +68,7 @@ ResolverConfigDelegate::paint( QPainter* painter, const QStyleOptionViewItem& op
     int rightSplit = itemRect.width();
     QRect confRect = QRect( rightSplit - ICONSIZE - 2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
 
-    // if the resolver has a config widget, paint it first (right-aligned)
+    // if the Resolver.has a config widget, paint it first (right-aligned)
     if( index.data( ResolversModel::HasConfig ).toBool() ) {
         QStyleOptionToolButton topt;
         topt.rect = confRect;
diff --git a/src/resolverconfigdelegate.h b/src/ResolverConfigDelegate.h
similarity index 97%
rename from src/resolverconfigdelegate.h
rename to src/ResolverConfigDelegate.h
index a6c8f32d8..9736fc788 100644
--- a/src/resolverconfigdelegate.h
+++ b/src/ResolverConfigDelegate.h
@@ -20,7 +20,7 @@
 #ifndef RESOLVERCONFIGDELEGATE_H
 #define RESOLVERCONFIGDELEGATE_H
 
-#include "configdelegatebase.h"
+#include "ConfigDelegateBase.h"
 
 class ResolverConfigDelegate : public ConfigDelegateBase
 {
diff --git a/src/scanmanager.cpp b/src/ScanManager.cpp
similarity index 99%
rename from src/scanmanager.cpp
rename to src/ScanManager.cpp
index cf3c8a7bd..9b7ae4cd9 100644
--- a/src/scanmanager.cpp
+++ b/src/ScanManager.cpp
@@ -17,13 +17,13 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scanmanager.h"
+#include "ScanManager.h"
 
 #include <QtCore/QThread>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 
-#include "musicscanner.h"
+#include "MusicScanner.h"
 #include "tomahawksettings.h"
 #include "utils/tomahawkutils.h"
 #include "libtomahawk/sourcelist.h"
diff --git a/src/scanmanager.h b/src/ScanManager.h
similarity index 100%
rename from src/scanmanager.h
rename to src/ScanManager.h
diff --git a/src/scrobbler.cpp b/src/Scrobbler.cpp
similarity index 99%
rename from src/scrobbler.cpp
rename to src/Scrobbler.cpp
index 666e4eb93..c67eb8236 100644
--- a/src/scrobbler.cpp
+++ b/src/Scrobbler.cpp
@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scrobbler.h"
+#include "Scrobbler.h"
 
 #include <QDir>
 #include <QSettings>
diff --git a/src/scrobbler.h b/src/Scrobbler.h
similarity index 100%
rename from src/scrobbler.h
rename to src/Scrobbler.h
diff --git a/src/searchbox.ui b/src/SearchBox.ui
similarity index 100%
rename from src/searchbox.ui
rename to src/SearchBox.ui
diff --git a/src/settingsdialog.cpp b/src/SettingsDialog.cpp
similarity index 98%
rename from src/settingsdialog.cpp
rename to src/SettingsDialog.cpp
index 31b2084bd..79d804bf9 100644
--- a/src/settingsdialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -18,7 +18,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settingsdialog.h"
+#include "SettingsDialog.h"
 #include "config.h"
 
 #include <QtGui/QDesktopServices>
@@ -30,17 +30,17 @@
 #include <QtGui/QSizeGrip>
 
 #include "AtticaManager.h"
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 #include "tomahawksettings.h"
-#include "delegateconfigwrapper.h"
-#include "musicscanner.h"
+#include "DelegateConfigWrapper.h"
+#include "MusicScanner.h"
 #include "pipeline.h"
-#include "resolver.h"
+#include "Resolver.h"
 #include "ExternalResolverGui.h"
 #include "utils/tomahawkutilsgui.h"
 #include "guihelpers.h"
-#include "scanmanager.h"
-#include "settingslistdelegate.h"
+#include "ScanManager.h"
+#include "SettingsListDelegate.h"
 #include "AccountDelegate.h"
 #include "database/database.h"
 #include "network/servent.h"
@@ -53,8 +53,8 @@
 #include "utils/logger.h"
 #include "AccountFactoryWrapper.h"
 
-#include "ui_proxydialog.h"
-#include "ui_stackedsettingsdialog.h"
+#include "ui_ProxyDialog.h"
+#include "ui_StackedSettingsDialog.h"
 
 using namespace Tomahawk;
 using namespace Accounts;
diff --git a/src/settingsdialog.h b/src/SettingsDialog.h
similarity index 100%
rename from src/settingsdialog.h
rename to src/SettingsDialog.h
diff --git a/src/settingslistdelegate.cpp b/src/SettingsListDelegate.cpp
similarity index 98%
rename from src/settingslistdelegate.cpp
rename to src/SettingsListDelegate.cpp
index 03080e661..3279016ce 100644
--- a/src/settingslistdelegate.cpp
+++ b/src/SettingsListDelegate.cpp
@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settingslistdelegate.h"
+#include "SettingsListDelegate.h"
 #include "utils/logger.h"
 
 #include <QPainter>
diff --git a/src/settingslistdelegate.h b/src/SettingsListDelegate.h
similarity index 100%
rename from src/settingslistdelegate.h
rename to src/SettingsListDelegate.h
diff --git a/src/shortcuthandler.cpp b/src/ShortcutHandler.cpp
similarity index 97%
rename from src/shortcuthandler.cpp
rename to src/ShortcutHandler.cpp
index 766b971be..8263ee28a 100644
--- a/src/shortcuthandler.cpp
+++ b/src/ShortcutHandler.cpp
@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "shortcuthandler.h"
+#include "ShortcutHandler.h"
 
 using namespace Tomahawk;
 
diff --git a/src/shortcuthandler.h b/src/ShortcutHandler.h
similarity index 100%
rename from src/shortcuthandler.h
rename to src/ShortcutHandler.h
diff --git a/src/stackedsettingsdialog.ui b/src/StackedSettingsDialog.ui
similarity index 100%
rename from src/stackedsettingsdialog.ui
rename to src/StackedSettingsDialog.ui
diff --git a/src/tomahawkapp.cpp b/src/TomahawkApp.cpp
similarity index 99%
rename from src/tomahawkapp.cpp
rename to src/TomahawkApp.cpp
index 33ca53f5c..bea33cef7 100644
--- a/src/tomahawkapp.cpp
+++ b/src/TomahawkApp.cpp
@@ -18,7 +18,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 
 #include <iostream>
 
@@ -48,12 +48,12 @@
 #include "network/servent.h"
 #include "web/api_v1.h"
 #include "sourcelist.h"
-#include "shortcuthandler.h"
-#include "scanmanager.h"
+#include "ShortcutHandler.h"
+#include "ScanManager.h"
 #include "tomahawksettings.h"
 #include "globalactionmanager.h"
 #include "database/localcollection.h"
-#include "musicscanner.h"
+#include "MusicScanner.h"
 #include "pipeline.h"
 #include "dropjob.h"
 #include "EchonestCatalogSynchronizer.h"
@@ -75,8 +75,8 @@
     #include "resolvers/scriptresolver.h"
     #include "utils/spotifyparser.h"
     #include "AtticaManager.h"
-    #include "tomahawkwindow.h"
-    #include "settingsdialog.h"
+    #include "TomahawkWindow.h"
+    #include "SettingsDialog.h"
     #include "actioncollection.h"
     #include <QtGui/QMessageBox>
     #include "widgets/HeaderLabel.h"
diff --git a/src/tomahawkapp.h b/src/TomahawkApp.h
similarity index 98%
rename from src/tomahawkapp.h
rename to src/TomahawkApp.h
index 2c76e641c..71ab3e9af 100644
--- a/src/tomahawkapp.h
+++ b/src/TomahawkApp.h
@@ -23,7 +23,7 @@
 
 #define APP TomahawkApp::instance()
 
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 #include "config.h"
 
 #include <QtCore/QRegExp>
@@ -64,7 +64,7 @@ namespace Tomahawk
 
 #ifdef LIBLASTFM_FOUND
 #include <lastfm/NetworkAccessManager>
-#include "scrobbler.h"
+#include "Scrobbler.h"
 #endif
 
 #ifndef TOMAHAWK_HEADLESS
diff --git a/src/tomahawktrayicon.cpp b/src/TomahawkTrayIcon.cpp
similarity index 98%
rename from src/tomahawktrayicon.cpp
rename to src/TomahawkTrayIcon.cpp
index a95570c7d..296ed7d06 100644
--- a/src/tomahawktrayicon.cpp
+++ b/src/TomahawkTrayIcon.cpp
@@ -17,15 +17,15 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tomahawktrayicon.h"
+#include "TomahawkTrayIcon.h"
 
 #include <QtGui/QWheelEvent>
 
 #include "artist.h"
 
 #include "audio/audioengine.h"
-#include "tomahawkapp.h"
-#include "tomahawkwindow.h"
+#include "TomahawkApp.h"
+#include "TomahawkWindow.h"
 
 #include "utils/logger.h"
 #include <actioncollection.h>
diff --git a/src/tomahawktrayicon.h b/src/TomahawkTrayIcon.h
similarity index 100%
rename from src/tomahawktrayicon.h
rename to src/TomahawkTrayIcon.h
diff --git a/src/tomahawkwindow.cpp b/src/TomahawkWindow.cpp
similarity index 99%
rename from src/tomahawkwindow.cpp
rename to src/TomahawkWindow.cpp
index 89322a5da..d20d83582 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/TomahawkWindow.cpp
@@ -18,8 +18,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tomahawkwindow.h"
-#include "ui_tomahawkwindow.h"
+#include "TomahawkWindow.h"
+#include "ui_TomahawkWindow.h"
 
 #include <QAction>
 #include <QCloseEvent>
@@ -53,17 +53,17 @@
 #include "playlist/playlistview.h"
 #include "playlist/queueview.h"
 
-#include "audiocontrols.h"
-#include "settingsdialog.h"
-#include "diagnosticsdialog.h"
+#include "AudioControls.h"
+#include "SettingsDialog.h"
+#include "DiagnosticsDialog.h"
 #include "tomahawksettings.h"
 #include "sourcelist.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
 #include "jobview/ErrorStatusMessage.h"
-#include "tomahawktrayicon.h"
-#include "scanmanager.h"
-#include "tomahawkapp.h"
+#include "TomahawkTrayIcon.h"
+#include "ScanManager.h"
+#include "TomahawkApp.h"
 
 #ifdef Q_WS_WIN
 #include <qtsparkle/Updater>
diff --git a/src/tomahawkwindow.h b/src/TomahawkWindow.h
similarity index 100%
rename from src/tomahawkwindow.h
rename to src/TomahawkWindow.h
diff --git a/src/tomahawkwindow.ui b/src/TomahawkWindow.ui
similarity index 100%
rename from src/tomahawkwindow.ui
rename to src/TomahawkWindow.ui
diff --git a/src/ubuntuunityhack.cpp b/src/UbuntuUnityHack.cpp
similarity index 98%
rename from src/ubuntuunityhack.cpp
rename to src/UbuntuUnityHack.cpp
index 21696d46e..8faa178ec 100644
--- a/src/ubuntuunityhack.cpp
+++ b/src/UbuntuUnityHack.cpp
@@ -15,7 +15,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ubuntuunityhack.h"
+#include "UbuntuUnityHack.h"
 #include "utils/logger.h"
 
 #include <QProcess>
diff --git a/src/ubuntuunityhack.h b/src/UbuntuUnityHack.h
similarity index 100%
rename from src/ubuntuunityhack.h
rename to src/UbuntuUnityHack.h
diff --git a/src/accounts/accountdllmacro.h b/src/accounts/AccountDllMacro.h
similarity index 100%
rename from src/accounts/accountdllmacro.h
rename to src/accounts/AccountDllMacro.h
diff --git a/src/accounts/twitter/sip/twittersip.h b/src/accounts/twitter/sip/twittersip.h
index b4d657fab..ac360c99a 100644
--- a/src/accounts/twitter/sip/twittersip.h
+++ b/src/accounts/twitter/sip/twittersip.h
@@ -34,7 +34,7 @@
 #include <QTweetLib/qtweetmentions.h>
 #include <QTweetLib/qtweetdmstatus.h>
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 #include "sip/SipPlugin.h"
 #include "accounts/Account.h"
 #include "accounts/twitter/tomahawkoauthtwitter.h"
diff --git a/src/accounts/twitter/tomahawkoauthtwitter.h b/src/accounts/twitter/tomahawkoauthtwitter.h
index 1c869a898..34fbe5e92 100644
--- a/src/accounts/twitter/tomahawkoauthtwitter.h
+++ b/src/accounts/twitter/tomahawkoauthtwitter.h
@@ -20,7 +20,7 @@
 #ifndef TOMAHAWKOAUTHTWITTERACCOUNT
 #define TOMAHAWKOAUTHTWITTERACCOUNT
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 #include <utils/tomahawkutils.h>
 
 #include <QTweetLib/qtweetlib_global.h>
diff --git a/src/accounts/twitter/twitteraccount.h b/src/accounts/twitter/twitteraccount.h
index 2ec8e4079..6614a3727 100644
--- a/src/accounts/twitter/twitteraccount.h
+++ b/src/accounts/twitter/twitteraccount.h
@@ -26,7 +26,7 @@
 
 #include "sip/twittersip.h"
 #include "twitterinfoplugin.h"
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 #include "accounts/Account.h"
 
 #define MYNAME "ACCOUNTTWITTER"
diff --git a/src/accounts/twitter/twitterconfigwidget.h b/src/accounts/twitter/twitterconfigwidget.h
index 623d985e6..52f4279e8 100644
--- a/src/accounts/twitter/twitterconfigwidget.h
+++ b/src/accounts/twitter/twitterconfigwidget.h
@@ -20,7 +20,7 @@
 #ifndef TWITTERACCOUNTCONFIGWIDGET_H
 #define TWITTERACCOUNTCONFIGWIDGET_H
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 #include <QTweetLib/qtweetstatus.h>
 #include <QTweetLib/qtweetdmstatus.h>
diff --git a/src/accounts/xmpp/CMakeLists.txt b/src/accounts/xmpp/CMakeLists.txt
index 03313b8df..cd02b7cdc 100644
--- a/src/accounts/xmpp/CMakeLists.txt
+++ b/src/accounts/xmpp/CMakeLists.txt
@@ -7,27 +7,27 @@ add_definitions( -DQT_SHARED )
 add_definitions( -DACCOUNTDLLEXPORT_PRO )
 
 set( xmppAccountSources
-    xmppaccount.cpp
-    xmppconfigwidget.cpp
-    sip/xmppsip.cpp
-    sip/tomahawkxmppmessage.cpp
-    sip/tomahawkxmppmessagefactory.cpp
+    XmppAccount.cpp
+    XmppConfigWidget.cpp
+    sip/XmppSip.cpp
+    sip/TomahawkXmppMessage.cpp
+    sip/TomahawkXmppMessageFactory.cpp
     sip/avatarmanager.cpp
     sip/xmlconsole.cpp
     XmppInfoPlugin.cpp
 )
 
 set( xmppAccountHeaders
-    xmppaccount.h
-    xmppconfigwidget.h
-    sip/xmppsip.h
+    XmppAccount.h
+    XmppConfigWidget.h
+    sip/XmppSip.h
     sip/avatarmanager.h
     sip/xmlconsole.h
     XmppInfoPlugin.h
 )
 
 set( xmppAccountUI
-    xmppconfigwidget.ui
+    XmppConfigWidget.ui
     sip/xmlconsole.ui
 )
 
diff --git a/src/accounts/xmpp/xmppaccount.cpp b/src/accounts/xmpp/XmppAccount.cpp
similarity index 97%
rename from src/accounts/xmpp/xmppaccount.cpp
rename to src/accounts/xmpp/XmppAccount.cpp
index 1d40ae397..afe8d8f7f 100644
--- a/src/accounts/xmpp/xmppaccount.cpp
+++ b/src/accounts/xmpp/XmppAccount.cpp
@@ -18,10 +18,9 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "xmppaccount.h"
-#include "xmppconfigwidget.h"
+#include "XmppAccount.h"
+#include "XmppConfigWidget.h"
 #include "sip/SipPlugin.h"
-#include "ui_xmppconfigwidget.h"
 #include "XmppInfoPlugin.h"
 
 #include <QtCore/QtPlugin>
diff --git a/src/accounts/xmpp/xmppaccount.h b/src/accounts/xmpp/XmppAccount.h
similarity index 97%
rename from src/accounts/xmpp/xmppaccount.h
rename to src/accounts/xmpp/XmppAccount.h
index 03037aacc..2de8852d1 100644
--- a/src/accounts/xmpp/xmppaccount.h
+++ b/src/accounts/xmpp/XmppAccount.h
@@ -22,8 +22,8 @@
 #ifndef XMPPACCOUNT_H
 #define XMPPACCOUNT_H
 
-#include "sip/xmppsip.h"
-#include "accounts/accountdllmacro.h"
+#include "sip/XmppSip.h"
+#include "accounts/AccountDllMacro.h"
 #include "accounts/Account.h"
 
 #define MYNAME "ACCOUNTJABBER"
diff --git a/src/accounts/xmpp/xmppconfigwidget.cpp b/src/accounts/xmpp/XmppConfigWidget.cpp
similarity index 98%
rename from src/accounts/xmpp/xmppconfigwidget.cpp
rename to src/accounts/xmpp/XmppConfigWidget.cpp
index c03fe2287..3e9b9ffc4 100644
--- a/src/accounts/xmpp/xmppconfigwidget.cpp
+++ b/src/accounts/xmpp/XmppConfigWidget.cpp
@@ -17,9 +17,9 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "xmppaccount.h"
-#include "xmppconfigwidget.h"
-#include "ui_xmppconfigwidget.h"
+#include "XmppAccount.h"
+#include "XmppConfigWidget.h"
+#include "ui_XmppConfigWidget.h"
 
 #include <QMessageBox>
 
diff --git a/src/accounts/xmpp/xmppconfigwidget.h b/src/accounts/xmpp/XmppConfigWidget.h
similarity index 97%
rename from src/accounts/xmpp/xmppconfigwidget.h
rename to src/accounts/xmpp/XmppConfigWidget.h
index aafb9355b..25521b786 100644
--- a/src/accounts/xmpp/xmppconfigwidget.h
+++ b/src/accounts/xmpp/XmppConfigWidget.h
@@ -20,7 +20,7 @@
 #ifndef JABBERACCOUNTCONFIGWIDGET_H
 #define JABBERACCOUNTCONFIGWIDGET_H
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 #include <QWidget>
 
diff --git a/src/accounts/xmpp/xmppconfigwidget.ui b/src/accounts/xmpp/XmppConfigWidget.ui
similarity index 100%
rename from src/accounts/xmpp/xmppconfigwidget.ui
rename to src/accounts/xmpp/XmppConfigWidget.ui
diff --git a/src/accounts/xmpp/XmppInfoPlugin.cpp b/src/accounts/xmpp/XmppInfoPlugin.cpp
index b1d822a68..63d438d6c 100644
--- a/src/accounts/xmpp/XmppInfoPlugin.cpp
+++ b/src/accounts/xmpp/XmppInfoPlugin.cpp
@@ -21,7 +21,7 @@
 #include "XmppInfoPlugin.h"
 
 #include "globalactionmanager.h"
-#include "sip/xmppsip.h"
+#include "sip/XmppSip.h"
 #include "utils/logger.h"
 
 
diff --git a/src/accounts/xmpp/googlewrapper/CMakeLists.txt b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
index a6c1a7ce3..565c947e0 100644
--- a/src/accounts/xmpp/googlewrapper/CMakeLists.txt
+++ b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
@@ -2,20 +2,20 @@
 # fake google plugin
 
 set( googleHeaders
-    ../xmppaccount.h
-    ../xmppconfigwidget.h
-    ../sip/xmppsip.h
+    ../XmppAccount.h
+    ../XmppConfigWidget.h
+    ../sip/XmppSip.h
     ../sip/avatarmanager.h
     ../sip/xmlconsole.h
     ../XmppInfoPlugin.h
     googlewrapper.h )
 
 set( googleSources
-    ../xmppaccount.cpp
-    ../xmppconfigwidget.cpp
-    ../sip/xmppsip.cpp
-    ../sip/tomahawkxmppmessage.cpp
-    ../sip/tomahawkxmppmessagefactory.cpp
+    ../XmppAccount.cpp
+    ../XmppConfigWidget.cpp
+    ../sip/XmppSip.cpp
+    ../sip/TomahawkXmppMessage.cpp
+    ../sip/TomahawkXmppMessageFactory.cpp
     ../sip/avatarmanager.cpp
     ../sip/xmlconsole.cpp
     ../XmppInfoPlugin.cpp
diff --git a/src/accounts/xmpp/googlewrapper/googlewrapper.cpp b/src/accounts/xmpp/googlewrapper/googlewrapper.cpp
index 1eb340b8c..6f3f6c5ae 100644
--- a/src/accounts/xmpp/googlewrapper/googlewrapper.cpp
+++ b/src/accounts/xmpp/googlewrapper/googlewrapper.cpp
@@ -19,8 +19,8 @@
 
 
 #include "googlewrapper.h"
-#include "xmppconfigwidget.h"
-#include "ui_xmppconfigwidget.h"
+#include "XmppConfigWidget.h"
+#include "ui_XmppConfigWidget.h"
 
 #include "utils/tomahawkutilsgui.h"
 
diff --git a/src/accounts/xmpp/googlewrapper/googlewrapper.h b/src/accounts/xmpp/googlewrapper/googlewrapper.h
index a10c0a81d..da7211e38 100644
--- a/src/accounts/xmpp/googlewrapper/googlewrapper.h
+++ b/src/accounts/xmpp/googlewrapper/googlewrapper.h
@@ -20,7 +20,7 @@
 #ifndef GOOGLEWRAPPER_H
 #define GOOGLEWRAPPER_H
 
-#include "xmppaccount.h"
+#include "XmppAccount.h"
 
 namespace Tomahawk
 {
diff --git a/src/accounts/xmpp/sip/tomahawkxmppmessage.cpp b/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp
similarity index 100%
rename from src/accounts/xmpp/sip/tomahawkxmppmessage.cpp
rename to src/accounts/xmpp/sip/TomahawkXmppMessage.cpp
diff --git a/src/accounts/xmpp/sip/tomahawkxmppmessagefactory.cpp b/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
similarity index 100%
rename from src/accounts/xmpp/sip/tomahawkxmppmessagefactory.cpp
rename to src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
diff --git a/src/accounts/xmpp/sip/xmppsip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp
similarity index 99%
rename from src/accounts/xmpp/sip/xmppsip.cpp
rename to src/accounts/xmpp/sip/XmppSip.cpp
index a36d3fb1e..783aca7ba 100644
--- a/src/accounts/xmpp/sip/xmppsip.cpp
+++ b/src/accounts/xmpp/sip/XmppSip.cpp
@@ -19,7 +19,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "xmppsip.h"
+#include "XmppSip.h"
 
 #include "config.h"
 
diff --git a/src/accounts/xmpp/sip/xmppsip.h b/src/accounts/xmpp/sip/XmppSip.h
similarity index 99%
rename from src/accounts/xmpp/sip/xmppsip.h
rename to src/accounts/xmpp/sip/XmppSip.h
index 1e570928d..01d88f338 100644
--- a/src/accounts/xmpp/sip/xmppsip.h
+++ b/src/accounts/xmpp/sip/XmppSip.h
@@ -51,7 +51,7 @@
 #define TOMAHAWK_FEATURE QLatin1String( "tomahawk:sip:v1" )
 #define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" )
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 #include "XmppInfoPlugin.h"
 
diff --git a/src/accounts/xmpp/sip/avatarmanager.h b/src/accounts/xmpp/sip/avatarmanager.h
index 3080f1ec3..31ab900cf 100644
--- a/src/accounts/xmpp/sip/avatarmanager.h
+++ b/src/accounts/xmpp/sip/avatarmanager.h
@@ -25,7 +25,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QDir>
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 class ACCOUNTDLLEXPORT AvatarManager : public QObject
 {
diff --git a/src/accounts/xmpp/sip/tomahawkxmppmessage.h b/src/accounts/xmpp/sip/tomahawkxmppmessage.h
index d512e2c40..d26ac30ae 100644
--- a/src/accounts/xmpp/sip/tomahawkxmppmessage.h
+++ b/src/accounts/xmpp/sip/tomahawkxmppmessage.h
@@ -24,7 +24,7 @@
 
 #define TOMAHAWK_SIP_MESSAGE_NS QLatin1String("http://www.tomhawk-player.org/sip/transports")
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 class TomahawkXmppMessagePrivate;
 class ACCOUNTDLLEXPORT TomahawkXmppMessage : public Jreen::Payload
diff --git a/src/accounts/xmpp/sip/tomahawkxmppmessagefactory.h b/src/accounts/xmpp/sip/tomahawkxmppmessagefactory.h
index 771481220..23c43b2a9 100644
--- a/src/accounts/xmpp/sip/tomahawkxmppmessagefactory.h
+++ b/src/accounts/xmpp/sip/tomahawkxmppmessagefactory.h
@@ -24,7 +24,7 @@
 
 #include <jreen/stanzaextension.h>
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 class ACCOUNTDLLEXPORT TomahawkXmppMessageFactory : public Jreen::PayloadFactory<TomahawkXmppMessage>
 {
diff --git a/src/accounts/xmpp/sip/xmlconsole.h b/src/accounts/xmpp/sip/xmlconsole.h
index 3e6b8cc80..135e8c6a1 100644
--- a/src/accounts/xmpp/sip/xmlconsole.h
+++ b/src/accounts/xmpp/sip/xmlconsole.h
@@ -33,7 +33,7 @@ namespace Ui {
 class XmlConsole;
 }
 
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 class ACCOUNTDLLEXPORT XmlConsole : public QWidget, public Jreen::XmlStreamHandler
 {
diff --git a/src/accounts/zeroconf/tomahawkzeroconf.h b/src/accounts/zeroconf/tomahawkzeroconf.h
index ead658db7..9560900bf 100644
--- a/src/accounts/zeroconf/tomahawkzeroconf.h
+++ b/src/accounts/zeroconf/tomahawkzeroconf.h
@@ -30,7 +30,7 @@
 
 #include "database/database.h"
 #include "network/servent.h"
-#include "accounts/accountdllmacro.h"
+#include "accounts/AccountDllMacro.h"
 
 class Node : public QObject
 {
diff --git a/src/accounts/zeroconf/zeroconf.h b/src/accounts/zeroconf/zeroconf.h
index 98e8a865c..e8482730a 100644
--- a/src/accounts/zeroconf/zeroconf.h
+++ b/src/accounts/zeroconf/zeroconf.h
@@ -24,7 +24,7 @@
 #include "accounts/Account.h"
 #include "tomahawkzeroconf.h"
 
-#include "../accountdllmacro.h"
+#include "../AccountDllMacro.h"
 
 #include <QtCore/QTimer>
 
diff --git a/src/accounts/zeroconf/zeroconfaccount.h b/src/accounts/zeroconf/zeroconfaccount.h
index 4733cf22b..30d43e038 100644
--- a/src/accounts/zeroconf/zeroconfaccount.h
+++ b/src/accounts/zeroconf/zeroconfaccount.h
@@ -20,7 +20,7 @@
 #define ZEROCONF_ACCOUNTS_H
 
 #include "accounts/Account.h"
-#include "../accountdllmacro.h"
+#include "../AccountDllMacro.h"
 
 class SipPlugin;
 
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 5c9a332e8..bbaa8a039 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -174,11 +174,11 @@ set( libSources
     functimeout.cpp
     playlist.cpp
     playlistplaylistinterface.cpp
-    resolver.cpp
+    Resolver.cpp
     ExternalResolver.cpp
     query.cpp
     result.cpp
-    source.cpp
+    Source.cpp
     sourceplaylistinterface.cpp
     playlistinterface.cpp
 
diff --git a/src/libtomahawk/ExternalResolver.h b/src/libtomahawk/ExternalResolver.h
index bf3a01082..dcbdbb207 100644
--- a/src/libtomahawk/ExternalResolver.h
+++ b/src/libtomahawk/ExternalResolver.h
@@ -23,7 +23,7 @@
 
 #include "query.h"
 #include "dllmacro.h"
-#include "resolver.h"
+#include "Resolver.h"
 
 #include <boost/function.hpp>
 
diff --git a/src/libtomahawk/LatchManager.h b/src/libtomahawk/LatchManager.h
index bf89d189f..0cc42273c 100644
--- a/src/libtomahawk/LatchManager.h
+++ b/src/libtomahawk/LatchManager.h
@@ -21,7 +21,7 @@
 #define LATCHMANAGER_H
 
 #include "dllmacro.h"
-#include "source.h"
+#include "Source.h"
 
 #include <QtCore/QObject>
 
diff --git a/src/libtomahawk/resolver.cpp b/src/libtomahawk/Resolver.cpp
similarity index 97%
rename from src/libtomahawk/resolver.cpp
rename to src/libtomahawk/Resolver.cpp
index 89f9b8565..6311a8d53 100644
--- a/src/libtomahawk/resolver.cpp
+++ b/src/libtomahawk/Resolver.cpp
@@ -16,4 +16,4 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resolver.h"
+#include "Resolver.h"
diff --git a/src/libtomahawk/resolver.h b/src/libtomahawk/Resolver.h
similarity index 100%
rename from src/libtomahawk/resolver.h
rename to src/libtomahawk/Resolver.h
diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/Source.cpp
similarity index 99%
rename from src/libtomahawk/source.cpp
rename to src/libtomahawk/Source.cpp
index 49c66c2d9..456ba7a4b 100644
--- a/src/libtomahawk/source.cpp
+++ b/src/libtomahawk/Source.cpp
@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "source.h"
+#include "Source.h"
 
 #include "collection.h"
 #include "sourcelist.h"
diff --git a/src/libtomahawk/source.h b/src/libtomahawk/Source.h
similarity index 100%
rename from src/libtomahawk/source.h
rename to src/libtomahawk/Source.h
diff --git a/src/libtomahawk/TomahawkSettingsGui.cpp b/src/libtomahawk/TomahawkSettingsGui.cpp
index 829381a38..2c76d1fd6 100644
--- a/src/libtomahawk/TomahawkSettingsGui.cpp
+++ b/src/libtomahawk/TomahawkSettingsGui.cpp
@@ -19,7 +19,7 @@
 #include "TomahawkSettingsGui.h"
 
 #include <QDesktopServices>
-#include "settingsdialog.h"
+#include "SettingsDialog.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/aclregistry.cpp b/src/libtomahawk/aclregistry.cpp
index fadab1b50..d0462d940 100644
--- a/src/libtomahawk/aclregistry.cpp
+++ b/src/libtomahawk/aclregistry.cpp
@@ -23,7 +23,7 @@
 #include <QVariant>
 
 #include "tomahawksettings.h"
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 
 #include "utils/logger.h"
 #include "jobview/AclJobItem.h"
diff --git a/src/libtomahawk/aclregistry.h b/src/libtomahawk/aclregistry.h
index 8b9f0b3d2..68977e44b 100644
--- a/src/libtomahawk/aclregistry.h
+++ b/src/libtomahawk/aclregistry.h
@@ -27,7 +27,7 @@
 #include <QMutex>
 #include <QVariant>
 
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 #include "dllmacro.h"
 
 class DLLEXPORT ACLRegistry : public QObject
diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index cd2bc6041..c89ecc1f2 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -33,7 +33,7 @@
 #include "network/servent.h"
 #include "utils/qnr_iodevicestream.h"
 #include "utils/closure.h"
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 #include "infosystem/infosystem.h"
 #include "album.h"
 
diff --git a/src/libtomahawk/collection.cpp b/src/libtomahawk/collection.cpp
index 558e10be3..94c2dcda8 100644
--- a/src/libtomahawk/collection.cpp
+++ b/src/libtomahawk/collection.cpp
@@ -22,7 +22,7 @@
 #include <QMetaObject>
 #include <QGenericArgument>
 
-#include "source.h"
+#include "Source.h"
 
 #include "utils/logger.h"
 #include <PlaylistUpdaterInterface.h>
diff --git a/src/libtomahawk/contextmenu.cpp b/src/libtomahawk/contextmenu.cpp
index baafe07f5..e52ca9fa0 100644
--- a/src/libtomahawk/contextmenu.cpp
+++ b/src/libtomahawk/contextmenu.cpp
@@ -23,7 +23,7 @@
 #include "playlistview.h"
 #include "viewmanager.h"
 #include "query.h"
-#include "source.h"
+#include "Source.h"
 #include "artist.h"
 #include "album.h"
 #include "utils/logger.h"
diff --git a/src/libtomahawk/database/databasecollection.h b/src/libtomahawk/database/databasecollection.h
index 8ddfe8e58..df238c4fc 100644
--- a/src/libtomahawk/database/databasecollection.h
+++ b/src/libtomahawk/database/databasecollection.h
@@ -22,7 +22,7 @@
 #include <QDir>
 
 #include "collection.h"
-#include "source.h"
+#include "Source.h"
 #include "typedefs.h"
 
 #include "dllmacro.h"
diff --git a/src/libtomahawk/database/databasecommand_allalbums.cpp b/src/libtomahawk/database/databasecommand_allalbums.cpp
index 5de1f6be0..948b7a8ae 100644
--- a/src/libtomahawk/database/databasecommand_allalbums.cpp
+++ b/src/libtomahawk/database/databasecommand_allalbums.cpp
@@ -22,7 +22,7 @@
 
 #include "artist.h"
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_allartists.cpp b/src/libtomahawk/database/databasecommand_allartists.cpp
index 9b4f1a6e2..8c506984f 100644
--- a/src/libtomahawk/database/databasecommand_allartists.cpp
+++ b/src/libtomahawk/database/databasecommand_allartists.cpp
@@ -22,7 +22,7 @@
 
 #include "artist.h"
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_collectionattributes.cpp b/src/libtomahawk/database/databasecommand_collectionattributes.cpp
index dd950a871..876a527e8 100644
--- a/src/libtomahawk/database/databasecommand_collectionattributes.cpp
+++ b/src/libtomahawk/database/databasecommand_collectionattributes.cpp
@@ -18,7 +18,7 @@
 #include "databasecommand_collectionattributes.h"
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 
 DatabaseCommand_CollectionAttributes::DatabaseCommand_CollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type )
     : DatabaseCommand()
diff --git a/src/libtomahawk/database/databasecommand_collectionstats.cpp b/src/libtomahawk/database/databasecommand_collectionstats.cpp
index cd0d8415e..438c04fbe 100644
--- a/src/libtomahawk/database/databasecommand_collectionstats.cpp
+++ b/src/libtomahawk/database/databasecommand_collectionstats.cpp
@@ -19,7 +19,7 @@
 #include "databasecommand_collectionstats.h"
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
index eb99d0f55..aaeefe915 100644
--- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
@@ -27,7 +27,7 @@
 #include "dynamic/DynamicControl.h"
 #include "dynamic/GeneratorInterface.h"
 
-#include "source.h"
+#include "Source.h"
 #include "network/servent.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_createplaylist.cpp b/src/libtomahawk/database/databasecommand_createplaylist.cpp
index b0f31c9e7..d2e2b5528 100644
--- a/src/libtomahawk/database/databasecommand_createplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_createplaylist.cpp
@@ -20,7 +20,7 @@
 
 #include <QSqlQuery>
 
-#include "source.h"
+#include "Source.h"
 #include "databaseimpl.h"
 #include "tomahawksqlquery.h"
 #include "network/servent.h"
diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp
index 6375fb458..9a9315ece 100644
--- a/src/libtomahawk/database/databasecommand_deletefiles.cpp
+++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp
@@ -24,7 +24,7 @@
 #include "artist.h"
 #include "album.h"
 #include "collection.h"
-#include "source.h"
+#include "Source.h"
 #include "database/database.h"
 #include "database/databaseimpl.h"
 #include "network/servent.h"
diff --git a/src/libtomahawk/database/databasecommand_deleteplaylist.h b/src/libtomahawk/database/databasecommand_deleteplaylist.h
index 995e0efcf..4df09cfb2 100644
--- a/src/libtomahawk/database/databasecommand_deleteplaylist.h
+++ b/src/libtomahawk/database/databasecommand_deleteplaylist.h
@@ -21,7 +21,7 @@
 
 #include "databaseimpl.h"
 #include "databasecommandloggable.h"
-#include "source.h"
+#include "Source.h"
 #include "typedefs.h"
 
 #include "dllmacro.h"
diff --git a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp b/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp
index 2c561245f..22c6aba93 100644
--- a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp
+++ b/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp
@@ -21,7 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp b/src/libtomahawk/database/databasecommand_loadallplaylists.cpp
index c40ac4872..2ae5ae0b5 100644
--- a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp
+++ b/src/libtomahawk/database/databasecommand_loadallplaylists.cpp
@@ -22,7 +22,7 @@
 #include <QSqlQuery>
 
 #include "playlist.h"
-#include "source.h"
+#include "Source.h"
 #include "databaseimpl.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_loadallsources.cpp b/src/libtomahawk/database/databasecommand_loadallsources.cpp
index ee20e1d88..145feefc5 100644
--- a/src/libtomahawk/database/databasecommand_loadallsources.cpp
+++ b/src/libtomahawk/database/databasecommand_loadallsources.cpp
@@ -21,7 +21,7 @@
 #include <QSqlQuery>
 
 #include "network/servent.h"
-#include "source.h"
+#include "Source.h"
 #include "databaseimpl.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_loadallstations.cpp b/src/libtomahawk/database/databasecommand_loadallstations.cpp
index 25ba7380d..85e0c4473 100644
--- a/src/libtomahawk/database/databasecommand_loadallstations.cpp
+++ b/src/libtomahawk/database/databasecommand_loadallstations.cpp
@@ -21,7 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp
index 51acec2d4..6dfe84e55 100644
--- a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp
@@ -21,7 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_loadops.cpp b/src/libtomahawk/database/databasecommand_loadops.cpp
index efa95c095..e31598c69 100644
--- a/src/libtomahawk/database/databasecommand_loadops.cpp
+++ b/src/libtomahawk/database/databasecommand_loadops.cpp
@@ -20,7 +20,7 @@
 
 #include "databaseimpl.h"
 #include "tomahawksqlquery.h"
-#include "source.h"
+#include "Source.h"
 #include "utils/logger.h"
 
 
diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.cpp b/src/libtomahawk/database/databasecommand_renameplaylist.cpp
index dc934ff9a..114bb88a4 100644
--- a/src/libtomahawk/database/databasecommand_renameplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_renameplaylist.cpp
@@ -22,7 +22,7 @@
 
 #include "databaseimpl.h"
 #include "collection.h"
-#include "source.h"
+#include "Source.h"
 #include "network/servent.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp b/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp
index 844dbcc89..207149e13 100644
--- a/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp
+++ b/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp
@@ -18,7 +18,7 @@
 #include "databasecommand_setcollectionattributes.h"
 
 #include "databaseimpl.h"
-#include "source.h"
+#include "Source.h"
 #include "network/servent.h"
 #include "sourcelist.h"
 #include "EchonestCatalogSynchronizer.h"
diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
index 73eb91c28..8ebbc8d44 100644
--- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
+++ b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
@@ -20,7 +20,7 @@
 
 #include <QSqlQuery>
 
-#include "source.h"
+#include "Source.h"
 #include "databaseimpl.h"
 #include "tomahawksqlquery.h"
 #include "dynamic/DynamicPlaylist.h"
diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp
index b6d431881..0ef5f3271 100644
--- a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp
+++ b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp
@@ -20,7 +20,7 @@
 
 #include <QSqlQuery>
 
-#include "source.h"
+#include "Source.h"
 #include "databaseimpl.h"
 #include "tomahawksqlquery.h"
 #include "network/servent.h"
diff --git a/src/libtomahawk/database/databaseresolver.h b/src/libtomahawk/database/databaseresolver.h
index fd27180f5..941eefc71 100644
--- a/src/libtomahawk/database/databaseresolver.h
+++ b/src/libtomahawk/database/databaseresolver.h
@@ -19,7 +19,7 @@
 #ifndef DATABASERESOLVER_H
 #define DATABASERESOLVER_H
 
-#include "resolver.h"
+#include "Resolver.h"
 #include "result.h"
 #include "artist.h"
 #include "album.h"
diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/databaseworker.cpp
index 4e1ad2e58..9417e4510 100644
--- a/src/libtomahawk/database/databaseworker.cpp
+++ b/src/libtomahawk/database/databaseworker.cpp
@@ -23,7 +23,7 @@
 #include <QTime>
 #include <QSqlQuery>
 
-#include "source.h"
+#include "Source.h"
 #include "database.h"
 #include "databaseimpl.h"
 #include "databasecommandloggable.h"
diff --git a/src/libtomahawk/dropjob.cpp b/src/libtomahawk/dropjob.cpp
index 270118f48..256ffdd92 100644
--- a/src/libtomahawk/dropjob.cpp
+++ b/src/libtomahawk/dropjob.cpp
@@ -22,7 +22,7 @@
 
 #include "artist.h"
 #include "album.h"
-#include "source.h"
+#include "Source.h"
 
 #include "utils/spotifyparser.h"
 #include "utils/itunesparser.h"
diff --git a/src/libtomahawk/jobview/LatchedStatusItem.cpp b/src/libtomahawk/jobview/LatchedStatusItem.cpp
index a8512416b..84e9f766c 100644
--- a/src/libtomahawk/jobview/LatchedStatusItem.cpp
+++ b/src/libtomahawk/jobview/LatchedStatusItem.cpp
@@ -18,7 +18,7 @@
 
 #include "LatchedStatusItem.h"
 
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "JobStatusView.h"
 #include "JobStatusModel.h"
diff --git a/src/libtomahawk/jobview/PipelineStatusItem.cpp b/src/libtomahawk/jobview/PipelineStatusItem.cpp
index 0e3a87e28..677be1686 100644
--- a/src/libtomahawk/jobview/PipelineStatusItem.cpp
+++ b/src/libtomahawk/jobview/PipelineStatusItem.cpp
@@ -22,7 +22,7 @@
 
 #include "utils/tomahawkutils.h"
 #include "pipeline.h"
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 #include "JobStatusModel.h"
 #include "JobStatusView.h"
 
diff --git a/src/libtomahawk/jobview/TransferStatusItem.cpp b/src/libtomahawk/jobview/TransferStatusItem.cpp
index 87dd827d3..3974c8cc1 100644
--- a/src/libtomahawk/jobview/TransferStatusItem.cpp
+++ b/src/libtomahawk/jobview/TransferStatusItem.cpp
@@ -24,7 +24,7 @@
 #include "network/servent.h"
 #include "utils/tomahawkutils.h"
 #include "result.h"
-#include "source.h"
+#include "Source.h"
 #include "artist.h"
 
 TransferStatusItem::TransferStatusItem( TransferStatusManager* p, StreamConnection* sc )
diff --git a/src/libtomahawk/network/dbsyncconnection.cpp b/src/libtomahawk/network/dbsyncconnection.cpp
index 26eb752e6..ace1c714c 100644
--- a/src/libtomahawk/network/dbsyncconnection.cpp
+++ b/src/libtomahawk/network/dbsyncconnection.cpp
@@ -36,7 +36,7 @@
 #include "database/databasecommand_collectionstats.h"
 #include "database/databasecommand_loadops.h"
 #include "remotecollection.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/network/portfwdthread.cpp b/src/libtomahawk/network/portfwdthread.cpp
index c0097d90b..a1cdff83e 100644
--- a/src/libtomahawk/network/portfwdthread.cpp
+++ b/src/libtomahawk/network/portfwdthread.cpp
@@ -18,7 +18,7 @@
 
 #include "portfwdthread.h"
 
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 
 #include <QNetworkInterface>
 #include <QStringList>
diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 858998537..5b8dffc08 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -29,7 +29,7 @@
 #include <QtNetwork/QNetworkReply>
 
 #include "result.h"
-#include "source.h"
+#include "Source.h"
 #include "bufferiodevice.h"
 #include "connection.h"
 #include "controlconnection.h"
diff --git a/src/libtomahawk/playlist.cpp b/src/libtomahawk/playlist.cpp
index 5a1ce8c17..42ad3c30b 100644
--- a/src/libtomahawk/playlist.cpp
+++ b/src/libtomahawk/playlist.cpp
@@ -32,7 +32,7 @@
 
 #include "tomahawksettings.h"
 #include "pipeline.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "playlistplaylistinterface.h"
 
@@ -194,7 +194,7 @@ Playlist::create( const source_ptr& author,
     //
     // When a playlist is created it will reportCreated(), adding it to the
     // collection it belongs to and emitting the appropriate signal.
-    // When we create a new playlist for the local source here we call reportCreated()
+    // When we create a new playlist for the local Source.here we call reportCreated()
     // immediately, so the GUI can reflect the new playlist without waiting for the DB sync
     //
     // When createplaylist DBOPs come from peers, the postCommitHook will call
diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp
index e1b3de5a1..ff6aad7ae 100644
--- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp
+++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp
@@ -24,7 +24,7 @@
 #include "query.h"
 #include "result.h"
 #include "artist.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 
 #include "playlistview.h"
diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
index 8acdd6eda..72e2ed7c6 100644
--- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
+++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
@@ -25,7 +25,7 @@
 #include "query.h"
 #include "result.h"
 #include "artist.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 
 #include "playlistview.h"
diff --git a/src/libtomahawk/playlist/RecentlyAddedModel.cpp b/src/libtomahawk/playlist/RecentlyAddedModel.cpp
index e5adacc67..4149ed9ce 100644
--- a/src/libtomahawk/playlist/RecentlyAddedModel.cpp
+++ b/src/libtomahawk/playlist/RecentlyAddedModel.cpp
@@ -21,7 +21,7 @@
 #include <QMimeData>
 #include <QTreeView>
 
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "database/database.h"
 #include "database/databasecommand_alltracks.h"
diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
index 2a194295f..7625e0935 100644
--- a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
+++ b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
@@ -21,7 +21,7 @@
 #include <QMimeData>
 #include <QTreeView>
 
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "database/database.h"
 #include "database/databasecommand_playbackhistory.h"
diff --git a/src/libtomahawk/playlist/albummodel.cpp b/src/libtomahawk/playlist/albummodel.cpp
index ebc5ee8c4..8e2db4780 100644
--- a/src/libtomahawk/playlist/albummodel.cpp
+++ b/src/libtomahawk/playlist/albummodel.cpp
@@ -25,7 +25,7 @@
 
 #include "artist.h"
 #include "albumitem.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "database/database.h"
 #include "utils/tomahawkutils.h"
diff --git a/src/libtomahawk/playlist/collectionflatmodel.h b/src/libtomahawk/playlist/collectionflatmodel.h
index 6b8bb45c7..cacf57a4f 100644
--- a/src/libtomahawk/playlist/collectionflatmodel.h
+++ b/src/libtomahawk/playlist/collectionflatmodel.h
@@ -27,7 +27,7 @@
 #include "typedefs.h"
 #include "trackmodel.h"
 #include "query.h"
-#include "source.h"
+#include "Source.h"
 #include "playlistinterface.h"
 
 #include "database/databasecommand_alltracks.h"
diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
index 75c21531b..d1879a18f 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
@@ -22,7 +22,7 @@
 #include "GeneratorInterface.h"
 #include "pipeline.h"
 #include "query.h"
-#include "source.h"
+#include "Source.h"
 #include "audio/audioengine.h"
 
 #include "utils/logger.h"
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp
index 104c0f0f4..6352938b0 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp
@@ -23,7 +23,7 @@
 #include "playlist/dynamic/DynamicPlaylist.h"
 #include "playlist/dynamic/GeneratorFactory.h"
 #include "DynamicWidget.h"
-#include "source.h"
+#include "Source.h"
 
 #include <QHBoxLayout>
 #include <QComboBox>
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index b2eb97c03..134e9c3cd 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -33,7 +33,7 @@
 #include "dynamic/GeneratorInterface.h"
 #include "dynamic/GeneratorFactory.h"
 #include "pipeline.h"
-#include "source.h"
+#include "Source.h"
 #include "audio/audioengine.h"
 #include "ReadOrWriteWidget.h"
 #include "CollapsibleControls.h"
@@ -41,7 +41,7 @@
 #include "viewmanager.h"
 #include "dynamic/DynamicView.h"
 #include "DynamicSetupWidget.h"
-#include "audiocontrols.h"
+#include "AudioControls.h"
 #include "LoadingSpinner.h"
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp
index 09c262417..56caea992 100644
--- a/src/libtomahawk/playlist/playlistitemdelegate.cpp
+++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp
@@ -25,7 +25,7 @@
 #include "query.h"
 #include "result.h"
 #include "artist.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 
 #include "trackmodel.h"
diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp
index 53c45f20b..921106db9 100644
--- a/src/libtomahawk/playlist/playlistmodel.cpp
+++ b/src/libtomahawk/playlist/playlistmodel.cpp
@@ -25,7 +25,7 @@
 #include "artist.h"
 #include "album.h"
 #include "pipeline.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "database/database.h"
 #include "database/databasecommand_playbackhistory.h"
diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp
index 5f60a2eb5..4c9d4eb57 100644
--- a/src/libtomahawk/playlist/treemodel.cpp
+++ b/src/libtomahawk/playlist/treemodel.cpp
@@ -23,7 +23,7 @@
 #include <QMimeData>
 
 #include "pipeline.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 #include "audio/audioengine.h"
 #include "database/databasecommand_allalbums.h"
diff --git a/src/libtomahawk/playlist/treeproxymodel.cpp b/src/libtomahawk/playlist/treeproxymodel.cpp
index 596ffd9a6..e56780c02 100644
--- a/src/libtomahawk/playlist/treeproxymodel.cpp
+++ b/src/libtomahawk/playlist/treeproxymodel.cpp
@@ -22,7 +22,7 @@
 #include <QtGui/QListView>
 
 #include "treeproxymodelplaylistinterface.h"
-#include "source.h"
+#include "Source.h"
 #include "query.h"
 #include "database/database.h"
 #include "database/databaseimpl.h"
diff --git a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp
index 2370d6855..612c94866 100644
--- a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp
+++ b/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp
@@ -21,7 +21,7 @@
 
 #include "treeproxymodel.h"
 
-#include "source.h"
+#include "Source.h"
 #include "query.h"
 #include "database/database.h"
 #include "database/databaseimpl.h"
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index 2b9cabc86..73a0c5f69 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -31,7 +31,7 @@
 #include "album.h"
 #include "collection.h"
 #include "pipeline.h"
-#include "resolver.h"
+#include "Resolver.h"
 #include "sourcelist.h"
 #include "audio/audioengine.h"
 
diff --git a/src/libtomahawk/result.cpp b/src/libtomahawk/result.cpp
index 8c53a45c4..039b09d93 100644
--- a/src/libtomahawk/result.cpp
+++ b/src/libtomahawk/result.cpp
@@ -20,7 +20,7 @@
 
 #include "album.h"
 #include "collection.h"
-#include "source.h"
+#include "Source.h"
 #include "database/database.h"
 #include "database/databasecommand_resolve.h"
 #include "database/databasecommand_alltracks.h"
diff --git a/src/libtomahawk/sourcelist.h b/src/libtomahawk/sourcelist.h
index cfd452513..73628d220 100644
--- a/src/libtomahawk/sourcelist.h
+++ b/src/libtomahawk/sourcelist.h
@@ -24,7 +24,7 @@
 #include <QMap>
 
 #include "typedefs.h"
-#include "source.h"
+#include "Source.h"
 
 #include "dllmacro.h"
 
diff --git a/src/libtomahawk/sourceplaylistinterface.cpp b/src/libtomahawk/sourceplaylistinterface.cpp
index 4570de4ef..7d8cf1271 100644
--- a/src/libtomahawk/sourceplaylistinterface.cpp
+++ b/src/libtomahawk/sourceplaylistinterface.cpp
@@ -19,7 +19,7 @@
 
 #include "sourceplaylistinterface.h"
 
-#include "source.h"
+#include "Source.h"
 #include "pipeline.h"
 #include "audio/audioengine.h"
 
diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index dbbac206d..a320f9dfb 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 #include "tomahawksettings.h"
 
 #include "utils/tomahawkutils.h"
diff --git a/src/libtomahawk/utils/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp
index 98f7f6edf..c79c7aab8 100644
--- a/src/libtomahawk/utils/xspfloader.cpp
+++ b/src/libtomahawk/utils/xspfloader.cpp
@@ -20,7 +20,7 @@
 
 #include "xspfloader.h"
 
-#include "headlesscheck.h"
+#include "HeadlessCheck.h"
 
 #include <QDomDocument>
 
diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.h b/src/libtomahawk/widgets/RecentPlaylistsModel.h
index 26b4039ce..879e38caa 100644
--- a/src/libtomahawk/widgets/RecentPlaylistsModel.h
+++ b/src/libtomahawk/widgets/RecentPlaylistsModel.h
@@ -24,7 +24,7 @@
 #include <QTimer>
 
 #include "playlist.h"
-#include "source.h"
+#include "Source.h"
 #include "database/databasecommand_loadallsortedplaylists.h"
 
 class RecentPlaylistsModel : public QAbstractListModel
diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h
index b53c479ee..e8909c8e3 100644
--- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h
+++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h
@@ -24,7 +24,7 @@
 #include <QModelIndex>
 
 #include "playlist.h"
-#include "source.h"
+#include "Source.h"
 
 class RecentlyPlayedPlaylistsModel : public QAbstractListModel
 {
diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp
index 4514bdd85..0883a11ce 100644
--- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp
@@ -19,7 +19,7 @@
 #include "sourceinfowidget.h"
 #include "ui_sourceinfowidget.h"
 
-#include "source.h"
+#include "Source.h"
 #include "viewmanager.h"
 
 #include "playlist/albummodel.h"
diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h
index 0026f026b..919f89723 100644
--- a/src/libtomahawk/widgets/welcomewidget.h
+++ b/src/libtomahawk/widgets/welcomewidget.h
@@ -27,7 +27,7 @@
 #include "playlistinterface.h"
 
 #include "query.h"
-#include "source.h"
+#include "Source.h"
 #include "viewpage.h"
 
 #include "utils/tomahawkutilsgui.h"
diff --git a/src/mac/macshortcuthandler.h b/src/mac/macshortcuthandler.h
index b7739c20d..1d7d7c318 100644
--- a/src/mac/macshortcuthandler.h
+++ b/src/mac/macshortcuthandler.h
@@ -19,7 +19,7 @@
 #ifndef MACSHORTCUTHANDLER_H
 #define MACSHORTCUTHANDLER_H
 
-#include "shortcuthandler.h"
+#include "ShortcutHandler.h"
 
 #include <QObject>
 
diff --git a/src/mac/tomahawkapp_mac.mm b/src/mac/tomahawkapp_mac.mm
index d5a0ca295..e7c0925b1 100644
--- a/src/mac/tomahawkapp_mac.mm
+++ b/src/mac/tomahawkapp_mac.mm
@@ -21,7 +21,7 @@
 #include "macdelegate.h"
 #include "macshortcuthandler.h"
 #include "config.h"
-#include "tomahawkwindow.h"
+#include "TomahawkWindow.h"
 #include "audio/audioengine.h"
 
 #import <AppKit/NSApplication.h>
@@ -264,7 +264,7 @@ void Tomahawk::enableFullscreen()
          QSysInfo::MacintoshVersion != QSysInfo::MV_LEOPARD   )
     {
         qDebug() << "Enabling Lion Full-screeen";
-        // Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses
+        // Can't include TomahawkApp.h in a .mm file, pulls in infosystem.h which uses
         // the objc keyword 'id'
         foreach( QWidget* w, QApplication::topLevelWidgets() )
         {
diff --git a/src/main.cpp b/src/main.cpp
index 6ab65e66e..740ff2227 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,10 +17,10 @@
  */
 
 
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 
 #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
-#include "ubuntuunityhack.h"
+#include "UbuntuUnityHack.h"
 #include "tomahawksettings.h"
 #include "config.h"
 
diff --git a/src/sourcetree/items/categoryitems.cpp b/src/sourcetree/items/categoryitems.cpp
index 1e8cc8764..1208ae00f 100644
--- a/src/sourcetree/items/categoryitems.cpp
+++ b/src/sourcetree/items/categoryitems.cpp
@@ -21,7 +21,7 @@
 
 #include <QMimeData>
 
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 #include "viewmanager.h"
 #include "viewpage.h"
 #include "sourcelist.h"
diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp
index 9305ec63d..fae71f52c 100644
--- a/src/sourcetree/items/playlistitems.cpp
+++ b/src/sourcetree/items/playlistitems.cpp
@@ -31,7 +31,7 @@
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 #include "dropjob.h"
-#include "source.h"
+#include "Source.h"
 #include "audio/audioengine.h"
 
 using namespace Tomahawk;
@@ -256,8 +256,7 @@ PlaylistItem::onUpdated()
     {
         createOverlay();
     }
-    else if ( !m_playlist->updater() || m_playlist->updater()->typeIcon().isNull() &&
-              !m_overlaidIcon.isNull() )
+    else if ( !m_playlist->updater() || ( m_playlist->updater()->typeIcon().isNull() && !m_overlaidIcon.isNull() ) )
     {
         // No longer an updater with an icon
         m_overlaidIcon = QIcon();
diff --git a/src/sourcetree/items/sourceitem.cpp b/src/sourcetree/items/sourceitem.cpp
index cdc4b6f02..e3d82b02d 100644
--- a/src/sourcetree/items/sourceitem.cpp
+++ b/src/sourcetree/items/sourceitem.cpp
@@ -33,7 +33,7 @@
 #include "playlist/RecentlyAddedModel.h"
 #include "playlist/RecentlyPlayedModel.h"
 #include "playlist/PlaylistLargeItemDelegate.h"
-#include "source.h"
+#include "Source.h"
 #include "sourcelist.h"
 
 /// SourceItem
diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp
index 704bf7884..81d4c650d 100644
--- a/src/sourcetree/sourcedelegate.cpp
+++ b/src/sourcetree/sourcedelegate.cpp
@@ -29,7 +29,7 @@
 
 #include "utils/tomahawkutilsgui.h"
 #include "animationhelper.h"
-#include "source.h"
+#include "Source.h"
 #include "tomahawksettings.h"
 
 #include <QtGui/QApplication>
diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp
index 5b0d96ce9..d02cd10e9 100644
--- a/src/sourcetree/sourcesmodel.cpp
+++ b/src/sourcetree/sourcesmodel.cpp
@@ -33,7 +33,7 @@
 #include "sourcelist.h"
 #include "playlist.h"
 #include "collection.h"
-#include "source.h"
+#include "Source.h"
 #include "viewmanager.h"
 
 #include "utils/logger.h"
diff --git a/src/sourcetree/sourcesmodel.h b/src/sourcetree/sourcesmodel.h
index 86290bf91..1f9842ca6 100644
--- a/src/sourcetree/sourcesmodel.h
+++ b/src/sourcetree/sourcesmodel.h
@@ -26,7 +26,7 @@
 #include <QStringList>
 
 #include "typedefs.h"
-#include "source.h"
+#include "Source.h"
 
 class QMimeData;
 
diff --git a/src/utils/guihelpers.cpp b/src/utils/guihelpers.cpp
index e158c691b..49cb7ceac 100644
--- a/src/utils/guihelpers.cpp
+++ b/src/utils/guihelpers.cpp
@@ -22,7 +22,7 @@
 
 #include "accounts/Account.h"
 #include "accounts/AccountManager.h"
-#include "delegateconfigwrapper.h"
+#include "DelegateConfigWrapper.h"
 
 namespace TomahawkUtils
 {