settings: move GUIDialog* and GUIWindow* into their own sub-directories

39 files changed, 118 insertions, 106 deletions

diff --git a/Makefile.in b/Makefile.in
index b3dd4dff76..7d3d6b6ed8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,6 +78,8 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/pvr/windows/pvrwindows.a \
                    xbmc/rendering/rendering.a \
                    xbmc/settings/settings.a \
+                   xbmc/settings/dialogs/settings_dialogs.a \
+                   xbmc/settings/windows/settings_windows.a \
                    xbmc/storage/storage.a \
                    xbmc/utils/utils.a \
                    xbmc/video/dialogs/videodialogs.a \
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 1c66cb18f6..35997066a1 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -171,9 +171,9 @@
 // Windows includes
 #include "guilib/GUIWindowManager.h"
 #include "windows/GUIWindowHome.h"
-#include "settings/GUIWindowSettings.h"
+#include "settings/windows/GUIWindowSettings.h"
 #include "windows/GUIWindowFileManager.h"
-#include "settings/GUIWindowSettingsCategory.h"
+#include "settings/windows/GUIWindowSettingsCategory.h"
 #include "music/windows/GUIWindowMusicPlaylist.h"
 #include "music/windows/GUIWindowMusicSongs.h"
 #include "music/windows/GUIWindowMusicNav.h"
@@ -182,14 +182,14 @@
 #include "music/dialogs/GUIDialogMusicInfo.h"
 #include "video/dialogs/GUIDialogVideoInfo.h"
 #include "video/windows/GUIWindowVideoNav.h"
-#include "settings/GUIWindowSettingsProfile.h"
+#include "settings/windows/GUIWindowSettingsProfile.h"
 #ifdef HAS_GL
 #include "rendering/gl/GUIWindowTestPatternGL.h"
 #endif
 #ifdef HAS_DX
 #include "rendering/dx/GUIWindowTestPatternDX.h"
 #endif
-#include "settings/GUIWindowSettingsScreenCalibration.h"
+#include "settings/windows/GUIWindowSettingsScreenCalibration.h"
 #include "programs/GUIWindowPrograms.h"
 #include "pictures/GUIWindowPictures.h"
 #include "windows/GUIWindowWeather.h"
@@ -218,9 +218,9 @@
 #include "video/dialogs/GUIDialogVideoSettings.h"
 #include "video/dialogs/GUIDialogAudioSubtitleSettings.h"
 #include "video/dialogs/GUIDialogVideoBookmarks.h"
-#include "settings/GUIDialogProfileSettings.h"
-#include "settings/GUIDialogLockSettings.h"
-#include "settings/GUIDialogContentSettings.h"
+#include "settings/dialogs/GUIDialogProfileSettings.h"
+#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "settings/dialogs/GUIDialogContentSettings.h"
 #include "dialogs/GUIDialogBusy.h"
 #include "dialogs/GUIDialogKeyboardGeneric.h"
 #include "dialogs/GUIDialogYesNo.h"
diff --git a/xbmc/GUIPassword.cpp b/xbmc/GUIPassword.cpp
index 8f94b7c6c9..4a70328cc0 100644
--- a/xbmc/GUIPassword.cpp
+++ b/xbmc/GUIPassword.cpp
@@ -25,8 +25,8 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "dialogs/GUIDialogNumeric.h"
 #include "dialogs/GUIDialogOK.h"
-#include "settings/GUIDialogLockSettings.h"
-#include "settings/GUIDialogProfileSettings.h"
+#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "settings/dialogs/GUIDialogProfileSettings.h"
 #include "Util.h"
 #include "settings/Settings.h"
 #include "settings/GUISettings.h"
diff --git a/xbmc/PasswordManager.cpp b/xbmc/PasswordManager.cpp
index 8bba20b9d7..bdb46fa9fd 100644
--- a/xbmc/PasswordManager.cpp
+++ b/xbmc/PasswordManager.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PasswordManager.h"
-#include "settings/GUIDialogLockSettings.h"
+#include "settings/dialogs/GUIDialogLockSettings.h"
 #include "URL.h"
 #include "settings/Settings.h"
 #include "utils/XMLUtils.h"
diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
index 7e56a56b0f..a68bc14b49 100644
--- a/xbmc/addons/AddonDll.h
+++ b/xbmc/addons/AddonDll.h
@@ -23,7 +23,7 @@
 #include "AddonManager.h"
 #include "AddonStatusHandler.h"
 #include "AddonCallbacks.h"
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 #include "utils/URIUtils.h"
 #include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
index 4d4c2ad8fd..95af4156fa 100644
--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -30,7 +30,7 @@
 #include "utils/URIUtils.h"
 #include "settings/GUISettings.h"
 #include "GUIDialogMediaSource.h"
-#include "settings/GUIDialogLockSettings.h"
+#include "settings/dialogs/GUIDialogLockSettings.h"
 #include "storage/MediaManager.h"
 #include "guilib/GUIWindowManager.h"
 #include "GUIDialogYesNo.h"
diff --git a/xbmc/dialogs/GUIDialogMediaFilter.h b/xbmc/dialogs/GUIDialogMediaFilter.h
index 2fc0fc1136..76fae8efaf 100644
--- a/xbmc/dialogs/GUIDialogMediaFilter.h
+++ b/xbmc/dialogs/GUIDialogMediaFilter.h
@@ -25,7 +25,7 @@
 #include "DbUrl.h"
 #include "dbwrappers/Database.h"
 #include "playlists/SmartPlayList.h"
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 #include "threads/Timer.h"
 #include "utils/DatabaseUtils.h"
 #include "utils/StdString.h"
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
index 59c048c9ca..1f0fefa0b4 100644
--- a/xbmc/music/windows/GUIWindowMusicNav.cpp
+++ b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -23,7 +23,7 @@
 #include "utils/URIUtils.h"
 #include "PlayListPlayer.h"
 #include "GUIPassword.h"
-#include "settings/GUIDialogContentSettings.h"
+#include "settings/dialogs/GUIDialogContentSettings.h"
 #include "filesystem/MusicDatabaseDirectory.h"
 #include "filesystem/VideoDatabaseDirectory.h"
 #include "PartyModeManager.h"
diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h
index 16f98a840f..6c8fc812f9 100644
--- a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h
+++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h
@@ -20,7 +20,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 #include "FileItem.h"
 
 namespace PERIPHERALS
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
index 1d9bca3c2b..55911e58db 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
@@ -20,7 +20,7 @@
  */
 
 #include "XBDateTime.h"
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 #include "guilib/GUIListItem.h"
 
 class CFileItem;
diff --git a/xbmc/rendering/dx/GUIWindowTestPatternDX.h b/xbmc/rendering/dx/GUIWindowTestPatternDX.h
index b81e12f0dd..d5e7ad668e 100644
--- a/xbmc/rendering/dx/GUIWindowTestPatternDX.h
+++ b/xbmc/rendering/dx/GUIWindowTestPatternDX.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "settings/GUIWindowTestPattern.h"
+#include "settings/windows/GUIWindowTestPattern.h"
 
 class CGUIWindowTestPatternDX : public CGUIWindowTestPattern
 {
diff --git a/xbmc/rendering/gl/GUIWindowTestPatternGL.h b/xbmc/rendering/gl/GUIWindowTestPatternGL.h
index e659efff18..78e41c023d 100644
--- a/xbmc/rendering/gl/GUIWindowTestPatternGL.h
+++ b/xbmc/rendering/gl/GUIWindowTestPatternGL.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "settings/GUIWindowTestPattern.h"
+#include "settings/windows/GUIWindowTestPattern.h"
 
 class CGUIWindowTestPatternGL : public CGUIWindowTestPattern
 {
diff --git a/xbmc/settings/Makefile b/xbmc/settings/Makefile
index 5607b1938f..ea90d86083 100644
--- a/xbmc/settings/Makefile
+++ b/xbmc/settings/Makefile
@@ -1,17 +1,7 @@
 SRCS=AdvancedSettings.cpp \
      AppParamParser.cpp \
-     GUIDialogContentSettings.cpp \
-     GUIDialogLockSettings.cpp \
-     GUIDialogProfileSettings.cpp \
-     GUIDialogSettings.cpp \
      GUISettings.cpp \
-     GUIWindowSettings.cpp \
-     GUIWindowSettingsCategory.cpp \
-     GUIWindowSettingsProfile.cpp \
-     GUIWindowSettingsScreenCalibration.cpp \
-     GUIWindowTestPattern.cpp \
      Profile.cpp \
-     SettingsControls.cpp \
      Settings.cpp \
      VideoSettings.cpp \
 
diff --git a/xbmc/settings/GUIDialogContentSettings.cpp b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
index 6bb5c2c24f..8a0b0abe90 100644
--- a/xbmc/settings/GUIDialogContentSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
@@ -20,13 +20,12 @@
 
 #include "GUIDialogContentSettings.h"
 #include "addons/GUIDialogAddonSettings.h"
-#include "GUISettings.h"
+#include "settings/GUISettings.h"
 #include "guilib/GUIWindowManager.h"
 #include "addons/IAddon.h"
 #include "FileItem.h"
 #include "video/VideoDatabase.h"
 #include "video/VideoInfoScanner.h"
-#include "GUISettings.h"
 #include "interfaces/Builtins.h"
 #include "filesystem/AddonsDirectory.h"
 #include "dialogs/GUIDialogKaiToast.h"
diff --git a/xbmc/settings/GUIDialogContentSettings.h b/xbmc/settings/dialogs/GUIDialogContentSettings.h
index cb4c70d196..fbb7b9fcd8 100644
--- a/xbmc/settings/GUIDialogContentSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogContentSettings.h
@@ -20,10 +20,11 @@
  *
  */
 
-#include "GUIDialogSettings.h"
+#include <vector>
+
 #include "addons/Scraper.h"
 #include "addons/AddonManager.h"
-#include <vector>
+#include "settings/dialogs/GUIDialogSettings.h"
 
 namespace VIDEO
 {
diff --git a/xbmc/settings/GUIDialogLockSettings.cpp b/xbmc/settings/dialogs/GUIDialogLockSettings.cpp
index ce734a3d9d..ce734a3d9d 100644
--- a/xbmc/settings/GUIDialogLockSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogLockSettings.cpp
diff --git a/xbmc/settings/GUIDialogLockSettings.h b/xbmc/settings/dialogs/GUIDialogLockSettings.h
index 216880c03d..cf6bdd9761 100644
--- a/xbmc/settings/GUIDialogLockSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogLockSettings.h
@@ -20,9 +20,9 @@
  *
  */
 
-#include "GUIDialogSettings.h"
 #include "GUIPassword.h"
-#include "Profile.h"
+#include "settings/Profile.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 
 class CGUIDialogLockSettings : public CGUIDialogSettings
 {
diff --git a/xbmc/settings/GUIDialogProfileSettings.cpp b/xbmc/settings/dialogs/GUIDialogProfileSettings.cpp
index 052cb1127e..7eb06da4e0 100644
--- a/xbmc/settings/GUIDialogProfileSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogProfileSettings.cpp
@@ -21,7 +21,7 @@
 #include "GUIDialogProfileSettings.h"
 #include "dialogs/GUIDialogFileBrowser.h"
 #include "guilib/GUIKeyboardFactory.h"
-#include "GUIDialogLockSettings.h"
+#include "settings/dialogs/GUIDialogLockSettings.h"
 #include "guilib/GUIImage.h"
 #include "guilib/GUIWindowManager.h"
 #include "storage/MediaManager.h"
@@ -32,8 +32,8 @@
 #include "filesystem/Directory.h"
 #include "filesystem/File.h"
 #include "FileItem.h"
-#include "Settings.h"
-#include "GUISettings.h"
+#include "settings/Settings.h"
+#include "settings/GUISettings.h"
 #include "guilib/LocalizeStrings.h"
 #include "TextureCache.h"
 
diff --git a/xbmc/settings/GUIDialogProfileSettings.h b/xbmc/settings/dialogs/GUIDialogProfileSettings.h
index e7b1c47808..0ce9c1022a 100644
--- a/xbmc/settings/GUIDialogProfileSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogProfileSettings.h
@@ -20,9 +20,9 @@
  *
  */
 
-#include "GUIDialogSettings.h"
 #include "MediaSource.h"
-#include "Profile.h"
+#include "settings/Profile.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 
 class CGUIDialogProfileSettings : public CGUIDialogSettings
 {
diff --git a/xbmc/settings/GUIDialogSettings.cpp b/xbmc/settings/dialogs/GUIDialogSettings.cpp
index e834c09ff0..ce737e5e46 100644
--- a/xbmc/settings/GUIDialogSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogSettings.cpp
@@ -26,7 +26,7 @@
 #include "guilib/GUIImage.h"
 #include "guilib/GUIControlGroupList.h"
 #include "guilib/LocalizeStrings.h"
-#include "GUISettings.h"
+#include "settings/GUISettings.h"
 #include "utils/log.h"
 #include "guilib/GUIKeyboardFactory.h"
 
diff --git a/xbmc/settings/GUIDialogSettings.h b/xbmc/settings/dialogs/GUIDialogSettings.h
index 6202011591..6202011591 100644
--- a/xbmc/settings/GUIDialogSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogSettings.h
diff --git a/xbmc/settings/dialogs/Makefile b/xbmc/settings/dialogs/Makefile
new file mode 100644
index 0000000000..e5876b1da3
--- /dev/null
+++ b/xbmc/settings/dialogs/Makefile
@@ -0,0 +1,9 @@
+SRCS=GUIDialogContentSettings.cpp \
+     GUIDialogLockSettings.cpp \
+     GUIDialogProfileSettings.cpp \
+     GUIDialogSettings.cpp \
+
+LIB=settings_dialogs.a
+
+include ../../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/xbmc/settings/SettingsControls.cpp b/xbmc/settings/windows/GUISettingControls.cpp
index 5e72f96ea2..40a6df2eb4 100644
--- a/xbmc/settings/SettingsControls.cpp
+++ b/xbmc/settings/windows/GUISettingControls.cpp
@@ -18,49 +18,49 @@
  *
  */
 
-#include "SettingsControls.h"
+#include "GUISettingControls.h"
 #include "guilib/GUIRadioButtonControl.h"
 #include "guilib/GUISpinControlEx.h"
 #include "guilib/GUIEditControl.h"
 #include "Util.h"
 #include "dialogs/GUIDialogOK.h"
-#include "GUISettings.h"
+#include "settings/GUISettings.h"
 #include "guilib/GUIImage.h"
 #include "guilib/LocalizeStrings.h"
 #include "addons/AddonManager.h"
 
-CBaseSettingControl::CBaseSettingControl(int id, CSetting *pSetting)
+CGUIBaseSettingControl::CGUIBaseSettingControl(int id, CSetting *pSetting)
 {
   m_id = id;
   m_pSetting = pSetting;
   m_delayed = false;
 }
 
-CRadioButtonSettingControl::CRadioButtonSettingControl(CGUIRadioButtonControl *pRadioButton, int id, CSetting *pSetting)
-    : CBaseSettingControl(id, pSetting)
+CGUIRadioButtonSettingControl::CGUIRadioButtonSettingControl(CGUIRadioButtonControl *pRadioButton, int id, CSetting *pSetting)
+    : CGUIBaseSettingControl(id, pSetting)
 {
   m_pRadioButton = pRadioButton;
   m_pRadioButton->SetID(id);
   Update();
 }
 
-CRadioButtonSettingControl::~CRadioButtonSettingControl()
+CGUIRadioButtonSettingControl::~CGUIRadioButtonSettingControl()
 {}
 
-bool CRadioButtonSettingControl::OnClick()
+bool CGUIRadioButtonSettingControl::OnClick()
 {
   ((CSettingBool *)m_pSetting)->SetData(!((CSettingBool *)m_pSetting)->GetData());
   return true;
 }
 
-void CRadioButtonSettingControl::Update()
+void CGUIRadioButtonSettingControl::Update()
 {
   if (m_pRadioButton)
     m_pRadioButton->SetSelected(((CSettingBool *)m_pSetting)->GetData());
 }
 
-CSpinExSettingControl::CSpinExSettingControl(CGUISpinControlEx *pSpin, int id, CSetting *pSetting)
-    : CBaseSettingControl(id, pSetting)
+CGUISpinExSettingControl::CGUISpinExSettingControl(CGUISpinControlEx *pSpin, int id, CSetting *pSetting)
+    : CGUIBaseSettingControl(id, pSetting)
 {
   m_pSpin = pSpin;
   m_pSpin->SetID(id);
@@ -104,10 +104,10 @@ CSpinExSettingControl::CSpinExSettingControl(CGUISpinControlEx *pSpin, int id, C
   Update();
 }
 
-CSpinExSettingControl::~CSpinExSettingControl()
+CGUISpinExSettingControl::~CGUISpinExSettingControl()
 {}
 
-bool CSpinExSettingControl::OnClick()
+bool CGUISpinExSettingControl::OnClick()
 {
   // TODO: Should really check for a change here (as end of spincontrols may
   //       cause no change)
@@ -124,7 +124,7 @@ bool CSpinExSettingControl::OnClick()
   return true;
 }
 
-void CSpinExSettingControl::Update()
+void CGUISpinExSettingControl::Update()
 {
   if (!m_pSpin)
     return;
@@ -140,25 +140,25 @@ void CSpinExSettingControl::Update()
   }
 }
 
-CButtonSettingControl::CButtonSettingControl(CGUIButtonControl *pButton, int id, CSetting *pSetting)
-    : CBaseSettingControl(id, pSetting)
+CGUIButtonSettingControl::CGUIButtonSettingControl(CGUIButtonControl *pButton, int id, CSetting *pSetting)
+    : CGUIBaseSettingControl(id, pSetting)
 {
   m_pButton = pButton;
   m_pButton->SetID(id);
   Update();
 }
 
-CButtonSettingControl::~CButtonSettingControl()
+CGUIButtonSettingControl::~CGUIButtonSettingControl()
 {}
 
-bool CButtonSettingControl::OnClick()
+bool CGUIButtonSettingControl::OnClick()
 {
   // this is pretty much a no-op as all click action is done in the calling class
   Update();
   return true;
 }
 
-void CButtonSettingControl::Update()
+void CGUIButtonSettingControl::Update()
 {
   CStdString strText = ((CSettingString *)m_pSetting)->GetData();
   if (m_pSetting->GetType() == SETTINGS_TYPE_ADDON)
@@ -181,8 +181,8 @@ void CButtonSettingControl::Update()
     m_pButton->SetLabel2(strText);
 }
 
-CEditSettingControl::CEditSettingControl(CGUIEditControl *pEdit, int id, CSetting *pSetting)
-    : CBaseSettingControl(id, pSetting)
+CGUIEditSettingControl::CGUIEditSettingControl(CGUIEditControl *pEdit, int id, CSetting *pSetting)
+    : CGUIBaseSettingControl(id, pSetting)
 {
   m_needsUpdate = false;
   m_pEdit = pEdit;
@@ -204,11 +204,11 @@ CEditSettingControl::CEditSettingControl(CGUIEditControl *pEdit, int id, CSettin
   Update();
 }
 
-CEditSettingControl::~CEditSettingControl()
+CGUIEditSettingControl::~CGUIEditSettingControl()
 {
 }
 
-bool CEditSettingControl::OnClick()
+bool CGUIEditSettingControl::OnClick()
 {
   // update our string
   ((CSettingString *)m_pSetting)->SetData(m_pEdit->GetLabel2());
@@ -217,13 +217,13 @@ bool CEditSettingControl::OnClick()
   return false;
 }
 
-void CEditSettingControl::Update()
+void CGUIEditSettingControl::Update()
 {
   if (!m_needsUpdate && m_pEdit)
     m_pEdit->SetLabel2(((CSettingString *)m_pSetting)->GetData());
 }
 
-bool CEditSettingControl::IsValidIPAddress(const CStdString &strIP)
+bool CGUIEditSettingControl::IsValidIPAddress(const CStdString &strIP)
 {
   const char* s = strIP.c_str();
   bool legalFormat = true;
@@ -286,13 +286,13 @@ bool CEditSettingControl::IsValidIPAddress(const CStdString &strIP)
   return legalFormat;
 }
 
-CSeparatorSettingControl::CSeparatorSettingControl(CGUIImage *pImage, int id, CSetting *pSetting)
-    : CBaseSettingControl(id, pSetting)
+CGUISeparatorSettingControl::CGUISeparatorSettingControl(CGUIImage *pImage, int id, CSetting *pSetting)
+    : CGUIBaseSettingControl(id, pSetting)
 {
   m_pImage = pImage;
   m_pImage->SetID(id);
 }
 
-CSeparatorSettingControl::~CSeparatorSettingControl()
+CGUISeparatorSettingControl::~CGUISeparatorSettingControl()
 {}
 
diff --git a/xbmc/settings/SettingsControls.h b/xbmc/settings/windows/GUISettingControls.h
index d7ffdeb51a..576cc55b80 100644
--- a/xbmc/settings/SettingsControls.h
+++ b/xbmc/settings/windows/GUISettingControls.h
@@ -29,11 +29,11 @@ class CGUIRadioButtonControl;
 
 class CSetting;
 
-class CBaseSettingControl
+class CGUIBaseSettingControl
 {
 public:
-  CBaseSettingControl(int id, CSetting *pSetting);
-  virtual ~CBaseSettingControl() {}
+  CGUIBaseSettingControl(int id, CSetting *pSetting);
+  virtual ~CGUIBaseSettingControl() {}
   virtual bool OnClick() { return false; };
   virtual void Update() {};
   int GetID() { return m_id; };
@@ -64,11 +64,11 @@ protected:
   bool m_delayed;
 };
 
-class CRadioButtonSettingControl : public CBaseSettingControl
+class CGUIRadioButtonSettingControl : public CGUIBaseSettingControl
 {
 public:
-  CRadioButtonSettingControl(CGUIRadioButtonControl* pRadioButton, int id, CSetting *pSetting);
-  virtual ~CRadioButtonSettingControl();
+  CGUIRadioButtonSettingControl(CGUIRadioButtonControl* pRadioButton, int id, CSetting *pSetting);
+  virtual ~CGUIRadioButtonSettingControl();
   virtual bool OnClick();
   virtual void Update();
   virtual void Clear() { m_pRadioButton = NULL; }
@@ -77,11 +77,11 @@ private:
   CGUIRadioButtonControl *m_pRadioButton;
 };
 
-class CSpinExSettingControl : public CBaseSettingControl
+class CGUISpinExSettingControl : public CGUIBaseSettingControl
 {
 public:
-  CSpinExSettingControl(CGUISpinControlEx* pSpin, int id, CSetting *pSetting);
-  virtual ~CSpinExSettingControl();
+  CGUISpinExSettingControl(CGUISpinControlEx* pSpin, int id, CSetting *pSetting);
+  virtual ~CGUISpinExSettingControl();
   virtual bool OnClick();
   virtual void Update();
   virtual void Clear() { m_pSpin = NULL; }
@@ -89,11 +89,11 @@ private:
   CGUISpinControlEx *m_pSpin;
 };
 
-class CButtonSettingControl : public CBaseSettingControl
+class CGUIButtonSettingControl : public CGUIBaseSettingControl
 {
 public:
-  CButtonSettingControl(CGUIButtonControl* pButton, int id, CSetting *pSetting);
-  virtual ~CButtonSettingControl();
+  CGUIButtonSettingControl(CGUIButtonControl* pButton, int id, CSetting *pSetting);
+  virtual ~CGUIButtonSettingControl();
   virtual bool OnClick();
   virtual void Update();
   virtual void Clear() { m_pButton = NULL; }
@@ -101,11 +101,11 @@ private:
   CGUIButtonControl *m_pButton;
 };
 
-class CEditSettingControl : public CBaseSettingControl
+class CGUIEditSettingControl : public CGUIBaseSettingControl
 {
 public:
-  CEditSettingControl(CGUIEditControl* pButton, int id, CSetting *pSetting);
-  virtual ~CEditSettingControl();
+  CGUIEditSettingControl(CGUIEditControl* pButton, int id, CSetting *pSetting);
+  virtual ~CGUIEditSettingControl();
   virtual bool OnClick();
   virtual void Update();
   virtual bool NeedsUpdate() { return m_needsUpdate; };
@@ -117,11 +117,11 @@ private:
   bool m_needsUpdate;
 };
 
-class CSeparatorSettingControl : public CBaseSettingControl
+class CGUISeparatorSettingControl : public CGUIBaseSettingControl
 {
 public:
-  CSeparatorSettingControl(CGUIImage* pImage, int id, CSetting *pSetting);
-  virtual ~CSeparatorSettingControl();
+  CGUISeparatorSettingControl(CGUIImage* pImage, int id, CSetting *pSetting);
+  virtual ~CGUISeparatorSettingControl();
   virtual bool OnClick() { return false; };
   virtual void Update() {};
   virtual void Clear() { m_pImage = NULL; }
diff --git a/xbmc/settings/GUIWindowSettings.cpp b/xbmc/settings/windows/GUIWindowSettings.cpp
index 2aa675f077..2aa675f077 100644
--- a/xbmc/settings/GUIWindowSettings.cpp
+++ b/xbmc/settings/windows/GUIWindowSettings.cpp
diff --git a/xbmc/settings/GUIWindowSettings.h b/xbmc/settings/windows/GUIWindowSettings.h
index 60302220ae..60302220ae 100644
--- a/xbmc/settings/GUIWindowSettings.h
+++ b/xbmc/settings/windows/GUIWindowSettings.h
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
index cb94f0187c..62374d81bd 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
@@ -87,8 +87,8 @@
 #include "WIN32Util.h"
 #endif
 #include <map>
-#include "Settings.h"
-#include "AdvancedSettings.h"
+#include "settings/Settings.h"
+#include "settings/AdvancedSettings.h"
 #include "input/MouseStat.h"
 #if defined(TARGET_WINDOWS)
 #include "input/windows/WINJoystick.h"
@@ -2034,7 +2034,7 @@ CGUIControl* CGUIWindowSettingsCategory::AddSetting(CSetting *pSetting, float wi
     if (!pControl) return NULL;
     ((CGUIRadioButtonControl *)pControl)->SetLabel(g_localizeStrings.Get(pSetting->GetLabel()));
     pControl->SetWidth(width);
-    pSettingControl.reset(new CRadioButtonSettingControl((CGUIRadioButtonControl *)pControl, iControlID, pSetting));
+    pSettingControl.reset(new CGUIRadioButtonSettingControl((CGUIRadioButtonControl *)pControl, iControlID, pSetting));
   }
   else if (pSetting->GetControlType() == SPIN_CONTROL_FLOAT || pSetting->GetControlType() == SPIN_CONTROL_INT_PLUS || pSetting->GetControlType() == SPIN_CONTROL_TEXT || pSetting->GetControlType() == SPIN_CONTROL_INT)
   {
@@ -2042,14 +2042,14 @@ CGUIControl* CGUIWindowSettingsCategory::AddSetting(CSetting *pSetting, float wi
     if (!pControl) return NULL;
     pControl->SetWidth(width);
     ((CGUISpinControlEx *)pControl)->SetText(g_localizeStrings.Get(pSetting->GetLabel()));
-    pSettingControl.reset(new CSpinExSettingControl((CGUISpinControlEx *)pControl, iControlID, pSetting));
+    pSettingControl.reset(new CGUISpinExSettingControl((CGUISpinControlEx *)pControl, iControlID, pSetting));
   }
   else if (pSetting->GetControlType() == SEPARATOR_CONTROL && m_pOriginalImage)
   {
     pControl = new CGUIImage(*m_pOriginalImage);
     if (!pControl) return NULL;
     pControl->SetWidth(width);
-    pSettingControl.reset(new CSeparatorSettingControl((CGUIImage *)pControl, iControlID, pSetting));
+    pSettingControl.reset(new CGUISeparatorSettingControl((CGUIImage *)pControl, iControlID, pSetting));
   }
   else if (pSetting->GetControlType() == EDIT_CONTROL_INPUT ||
            pSetting->GetControlType() == EDIT_CONTROL_HIDDEN_INPUT ||
@@ -2062,7 +2062,7 @@ CGUIControl* CGUIWindowSettingsCategory::AddSetting(CSetting *pSetting, float wi
     if (!pControl) return NULL;
     ((CGUIEditControl *)pControl)->SetLabel(g_localizeStrings.Get(pSetting->GetLabel()));
     pControl->SetWidth(width);
-    pSettingControl.reset(new CEditSettingControl((CGUIEditControl *)pControl, iControlID, pSetting));
+    pSettingControl.reset(new CGUIEditSettingControl((CGUIEditControl *)pControl, iControlID, pSetting));
   }
   else if (pSetting->GetControlType() != SEPARATOR_CONTROL) // button control
   {
@@ -2070,7 +2070,7 @@ CGUIControl* CGUIWindowSettingsCategory::AddSetting(CSetting *pSetting, float wi
     if (!pControl) return NULL;
     ((CGUIButtonControl *)pControl)->SetLabel(g_localizeStrings.Get(pSetting->GetLabel()));
     pControl->SetWidth(width);
-    pSettingControl.reset(new CButtonSettingControl((CGUIButtonControl *)pControl, iControlID, pSetting));
+    pSettingControl.reset(new CGUIButtonSettingControl((CGUIButtonControl *)pControl, iControlID, pSetting));
   }
   if (!pControl)
   {
diff --git a/xbmc/settings/GUIWindowSettingsCategory.h b/xbmc/settings/windows/GUIWindowSettingsCategory.h
index b1504f88fc..74b222ca73 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.h
+++ b/xbmc/settings/windows/GUIWindowSettingsCategory.h
@@ -21,11 +21,11 @@
  */
 
 #include "guilib/GUIWindow.h"
-#include "SettingsControls.h"
-#include "GUISettings.h"
+#include "settings/GUISettings.h"
+#include "settings/windows/GUISettingControls.h"
 #include "utils/Stopwatch.h"
 
-typedef boost::shared_ptr<CBaseSettingControl> BaseSettingControlPtr;
+typedef boost::shared_ptr<CGUIBaseSettingControl> BaseSettingControlPtr;
 
 class CGUIWindowSettingsCategory :
       public CGUIWindow
@@ -105,7 +105,7 @@ protected:
 
   bool m_returningFromSkinLoad; // true if we are returning from loading the skin
 
-  boost::shared_ptr<CBaseSettingControl> m_delayedSetting; ///< Current delayed setting \sa CBaseSettingControl::SetDelayed()
+  boost::shared_ptr<CGUIBaseSettingControl> m_delayedSetting; ///< Current delayed setting \sa CGUIBaseSettingControl::SetDelayed()
   CStopWatch           m_delayedTimer;   ///< Delayed setting timer
 };
 
diff --git a/xbmc/settings/GUIWindowSettingsProfile.cpp b/xbmc/settings/windows/GUIWindowSettingsProfile.cpp
index 357dcf6504..4858317059 100644
--- a/xbmc/settings/GUIWindowSettingsProfile.cpp
+++ b/xbmc/settings/windows/GUIWindowSettingsProfile.cpp
@@ -20,10 +20,10 @@
 
 #include "GUIWindowSettingsProfile.h"
 #include "windows/GUIWindowFileManager.h"
-#include "Profile.h"
+#include "settings/Profile.h"
 #include "Application.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "GUIDialogProfileSettings.h"
+#include "settings/dialogs/GUIDialogProfileSettings.h"
 #include "network/Network.h"
 #include "utils/URIUtils.h"
 #include "utils/Weather.h"
@@ -32,7 +32,7 @@
 #include "guilib/GUIWindowManager.h"
 #include "filesystem/Directory.h"
 #include "FileItem.h"
-#include "Settings.h"
+#include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"
 
 using namespace XFILE;
diff --git a/xbmc/settings/GUIWindowSettingsProfile.h b/xbmc/settings/windows/GUIWindowSettingsProfile.h
index 2e41ce57db..2e41ce57db 100644
--- a/xbmc/settings/GUIWindowSettingsProfile.h
+++ b/xbmc/settings/windows/GUIWindowSettingsProfile.h
diff --git a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
index 4aaab54e92..7917b27c40 100644
--- a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
+++ b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
@@ -26,8 +26,8 @@
 #include "cores/VideoRenderers/RenderManager.h"
 #endif
 #include "Application.h"
-#include "Settings.h"
-#include "GUISettings.h"
+#include "settings/Settings.h"
+#include "settings/GUISettings.h"
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogYesNo.h"
 #include "guilib/LocalizeStrings.h"
diff --git a/xbmc/settings/GUIWindowSettingsScreenCalibration.h b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
index 2ac9d9dd07..2ac9d9dd07 100644
--- a/xbmc/settings/GUIWindowSettingsScreenCalibration.h
+++ b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
diff --git a/xbmc/settings/GUIWindowTestPattern.cpp b/xbmc/settings/windows/GUIWindowTestPattern.cpp
index c8b36dab9a..c8b36dab9a 100644
--- a/xbmc/settings/GUIWindowTestPattern.cpp
+++ b/xbmc/settings/windows/GUIWindowTestPattern.cpp
diff --git a/xbmc/settings/GUIWindowTestPattern.h b/xbmc/settings/windows/GUIWindowTestPattern.h
index d2069bda90..d2069bda90 100644
--- a/xbmc/settings/GUIWindowTestPattern.h
+++ b/xbmc/settings/windows/GUIWindowTestPattern.h
diff --git a/xbmc/settings/windows/Makefile b/xbmc/settings/windows/Makefile
new file mode 100644
index 0000000000..8d5c3e4714
--- /dev/null
+++ b/xbmc/settings/windows/Makefile
@@ -0,0 +1,11 @@
+SRCS=GUISettingControls.cpp \
+     GUIWindowSettings.cpp \
+     GUIWindowSettingsCategory.cpp \
+     GUIWindowSettingsProfile.cpp \
+     GUIWindowSettingsScreenCalibration.cpp \
+     GUIWindowTestPattern.cpp \
+
+LIB=settings_windows.a
+
+include ../../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
index d7fb9443c7..1149cc673d 100644
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 typedef std::vector<int> Features;
 
 class CGUIDialogAudioSubtitleSettings :
diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.h b/xbmc/video/dialogs/GUIDialogVideoSettings.h
index 2837d4817f..2be778402c 100644
--- a/xbmc/video/dialogs/GUIDialogVideoSettings.h
+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "settings/GUIDialogSettings.h"
+#include "settings/dialogs/GUIDialogSettings.h"
 
 class CGUIDialogVideoSettings :
       public CGUIDialogSettings
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 3a82a18ccb..3bf5739818 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -55,7 +55,7 @@
 #include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
-#include "settings/GUIDialogContentSettings.h"
+#include "settings/dialogs/GUIDialogContentSettings.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/StringUtils.h"
 #include "utils/log.h"
diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
index 346dca0628..3327fec296 100644
--- a/xbmc/windows/GUIWindowLoginScreen.cpp
+++ b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -22,9 +22,9 @@
 #include "Application.h"
 #include "ApplicationMessenger.h"
 #include "GUIWindowLoginScreen.h"
-#include "settings/GUIWindowSettingsProfile.h"
+#include "settings/windows/GUIWindowSettingsProfile.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "settings/GUIDialogProfileSettings.h"
+#include "settings/dialogs/GUIDialogProfileSettings.h"
 #include "GUIPassword.h"
 #ifdef HAS_PYTHON
 #include "interfaces/python/XBPython.h"