[posix] move common posix files from linux to posix platform

Moves files that are ifdeffed as TARGET_POSIX to platform/posix rather than
platform/linux

85 files changed, 101 insertions, 100 deletions

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index df97720249..2352bd973e 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -168,8 +168,8 @@
 #include "input/InputManager.h"
 
 #ifdef TARGET_POSIX
-#include "XHandle.h"
-#include "XTimeUtils.h"
+#include "platform/posix/XHandle.h"
+#include "platform/posix/XTimeUtils.h"
 #include "platform/posix/filesystem/PosixDirectory.h"
 #include "platform/posix/PlatformPosix.h"
 #endif
diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
index fb0bd6c70d..b4c69e6887 100644
--- a/xbmc/XBApplicationEx.cpp
+++ b/xbmc/XBApplicationEx.cpp
@@ -14,7 +14,7 @@
 #include "threads/SystemClock.h"
 #include "commons/Exception.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include "AppParamParser.h"
 
diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
index b006134794..fe04b577b5 100644
--- a/xbmc/XBDateTime.cpp
+++ b/xbmc/XBDateTime.cpp
@@ -15,8 +15,8 @@
 #include "utils/StringUtils.h"
 #include "utils/Archive.h"
 #ifdef TARGET_POSIX
-#include "XTimeUtils.h"
-#include "XFileUtils.h"
+#include "platform/posix/XTimeUtils.h"
+#include "platform/posix/XFileUtils.h"
 #else
 #include <Windows.h>
 #endif
diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
index e97cc22e5b..c27053c4ee 100644
--- a/xbmc/addons/AddonInstaller.cpp
+++ b/xbmc/addons/AddonInstaller.cpp
@@ -36,7 +36,7 @@
 #include "dialogs/GUIDialogExtendedProgressBar.h"
 #include "URL.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include <functional>
diff --git a/xbmc/addons/interfaces/General.cpp b/xbmc/addons/interfaces/General.cpp
index 856d9d5790..2127df03da 100644
--- a/xbmc/addons/interfaces/General.cpp
+++ b/xbmc/addons/interfaces/General.cpp
@@ -22,7 +22,7 @@
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/LocalizeStrings.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
index 4ae8db087d..737d1f88de 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 using namespace AE;
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 878f7726b3..257f1e26c7 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #define ALSA_OPTIONS (SND_PCM_NO_AUTO_FORMAT | SND_PCM_NO_AUTO_CHANNELS | SND_PCM_NO_AUTO_RESAMPLE)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
index 358e889666..6467fb1e42 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
@@ -15,7 +15,7 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/TimeUtils.h"
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #include "ServiceBroker.h"
 
 
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPi.h b/xbmc/cores/AudioEngine/Sinks/AESinkPi.h
index b8b5fb7577..8d8d097358 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPi.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPi.h
@@ -12,7 +12,7 @@
 #include "cores/AudioEngine/Utils/AEDeviceInfo.h"
 
 #include "platform/linux/OMXCore.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 
 class CAESinkPi : public IAESink
 {
diff --git a/xbmc/cores/AudioEngine/Utils/AERingBuffer.h b/xbmc/cores/AudioEngine/Utils/AERingBuffer.h
index b3d15c7abf..bc659543f5 100644
--- a/xbmc/cores/AudioEngine/Utils/AERingBuffer.h
+++ b/xbmc/cores/AudioEngine/Utils/AERingBuffer.h
@@ -18,7 +18,7 @@
 #include "utils/log.h"  //CLog
 #include <string.h>     //memset, memcpy
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 /**
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index 5546f6ecdc..8087a64617 100644
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -40,8 +40,8 @@
 #include <signal.h>
 #ifdef TARGET_POSIX
 #include "PlatformDefs.h" // for __stat64
-#include "XFileUtils.h"
-#include "XTimeUtils.h"
+#include "platform/posix/XFileUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include "ServiceBroker.h"
 #include "Util.h"
diff --git a/xbmc/cores/VideoPlayer/AudioSinkAE.cpp b/xbmc/cores/VideoPlayer/AudioSinkAE.cpp
index 2bff6724ce..d8b4275dab 100644
--- a/xbmc/cores/VideoPlayer/AudioSinkAE.cpp
+++ b/xbmc/cores/VideoPlayer/AudioSinkAE.cpp
@@ -16,7 +16,7 @@
 #include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Utils/AEStreamData.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 CAudioSinkAE::CAudioSinkAE(CDVDClock *clock) : m_pClock(clock)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index 8d3f86f8c1..557fd7fd51 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -36,7 +36,7 @@ extern "C" {
 #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5)))
 #else
 #include <math.h>
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #define RINT lrint
 #endif
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index 4d874fdf72..6bbf5a936e 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -24,8 +24,8 @@
 #include <va/va_drm.h>
 #include <va/va_drmcommon.h>
 #include <drm_fourcc.h>
-#include "platform/linux/XTimeUtils.h"
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XTimeUtils.h"
+#include "platform/posix/XMemUtils.h"
 
 extern "C" {
 #include <libavutil/avutil.h>
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
index 1b70b9df9a..69793a72fe 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
@@ -11,7 +11,7 @@
 #include "utils/log.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 extern "C" {
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
index 4de6c64d9d..72a73d1f53 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -31,7 +31,7 @@
 #include "utils/StringUtils.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include <libbluray/bluray.h>
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index f5120a6a87..73b272c69d 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -26,7 +26,7 @@
 #include "settings/SettingsComponent.h"
 
 #if defined(TARGET_POSIX)
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include "RenderCapture.h"
diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index e9d99a5528..7ebdf97355 100644
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -11,7 +11,7 @@
 #include "ServiceBroker.h"
 #include "URL.h"
 #include "utils/log.h"
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 
 #include <sys/time.h>
 #include <inttypes.h>
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
index 014521d41b..a76ba36eff 100644
--- a/xbmc/dbwrappers/Database.cpp
+++ b/xbmc/dbwrappers/Database.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef TARGET_POSIX
-#include "platform/linux/ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 
 using namespace dbiplus;
diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp
index 95d72f8c13..15ee920f99 100644
--- a/xbmc/dbwrappers/mysqldataset.cpp
+++ b/xbmc/dbwrappers/mysqldataset.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef TARGET_POSIX
-#include "platform/linux/ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 
 #define MYSQL_OK          0
diff --git a/xbmc/dbwrappers/sqlitedataset.cpp b/xbmc/dbwrappers/sqlitedataset.cpp
index 4c8f8a0888..39753bde46 100644
--- a/xbmc/dbwrappers/sqlitedataset.cpp
+++ b/xbmc/dbwrappers/sqlitedataset.cpp
@@ -20,7 +20,7 @@
 #include "utils/URIUtils.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 namespace {
diff --git a/xbmc/filesystem/CacheStrategy.cpp b/xbmc/filesystem/CacheStrategy.cpp
index 5839427bc6..6e01863e30 100644
--- a/xbmc/filesystem/CacheStrategy.cpp
+++ b/xbmc/filesystem/CacheStrategy.cpp
@@ -11,7 +11,7 @@
 #include "IFile.h"
 #ifdef TARGET_POSIX
 #include "PlatformDefs.h"
-#include "ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 #include "Util.h"
 #include "utils/log.h"
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 39511d5b5c..2d26f1dcad 100644
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -25,9 +25,9 @@
 #ifdef TARGET_POSIX
 #include <errno.h>
 #include <inttypes.h>
-#include "../linux/XFileUtils.h"
-#include "../linux/XTimeUtils.h"
-#include "../linux/ConvUtils.h"
+#include "platform/posix/XFileUtils.h"
+#include "platform/posix/XTimeUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 
 #include "DllLibCurl.h"
diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp
index 97fed32d07..a41bcaf3ec 100644
--- a/xbmc/filesystem/FileCache.cpp
+++ b/xbmc/filesystem/FileCache.cpp
@@ -20,7 +20,7 @@
 #include "settings/SettingsComponent.h"
 
 #if !defined(TARGET_WINDOWS)
-#include "platform/linux/ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 
 #include <cassert>
@@ -28,7 +28,7 @@
 #include <memory>
 
 #ifdef TARGET_POSIX
-#include "platform/linux/ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 
 using namespace XFILE;
diff --git a/xbmc/filesystem/ISO9660Directory.cpp b/xbmc/filesystem/ISO9660Directory.cpp
index f328ddbed3..db87849b37 100644
--- a/xbmc/filesystem/ISO9660Directory.cpp
+++ b/xbmc/filesystem/ISO9660Directory.cpp
@@ -14,7 +14,7 @@
 #include "URL.h"
 #include "FileItem.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #ifdef TARGET_WINDOWS
 #include "platform/win32/CharsetConverter.h"
diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
index e9fc3224b3..b4184229f7 100644
--- a/xbmc/filesystem/NFSDirectory.cpp
+++ b/xbmc/filesystem/NFSDirectory.cpp
@@ -11,7 +11,7 @@
 #endif
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include "NFSDirectory.h"
diff --git a/xbmc/filesystem/ZipManager.cpp b/xbmc/filesystem/ZipManager.cpp
index fede0d1089..d6c3e4b0da 100644
--- a/xbmc/filesystem/ZipManager.cpp
+++ b/xbmc/filesystem/ZipManager.cpp
@@ -14,7 +14,7 @@
 #include "File.h"
 #include "URL.h"
 #if defined(TARGET_POSIX)
-#include "platform/linux/PlatformDefs.h"
+#include "PlatformDefs.h"
 #endif
 #include "utils/CharsetConverter.h"
 #include "utils/EndianSwap.h"
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp
index ab64d4339c..e001647537 100644
--- a/xbmc/filesystem/iso9660.cpp
+++ b/xbmc/filesystem/iso9660.cpp
@@ -36,8 +36,8 @@ ISO9660
 
 #ifndef TARGET_WINDOWS
 #include "storage/DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
-#include "platform/linux/XFileUtils.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XFileUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #else
 #include "platform/win32/CharsetConverter.h"
 #endif
diff --git a/xbmc/guilib/Texture.cpp b/xbmc/guilib/Texture.cpp
index 27228bba4b..493ac08a5a 100644
--- a/xbmc/guilib/Texture.cpp
+++ b/xbmc/guilib/Texture.cpp
@@ -24,7 +24,7 @@
 #include "platform/android/filesystem/AndroidAppFile.h"
 #endif
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 #include "rendering/RenderSystem.h"
 
diff --git a/xbmc/guilib/Texture.h b/xbmc/guilib/Texture.h
index 8a54042fff..104aaaaa8a 100644
--- a/xbmc/guilib/Texture.h
+++ b/xbmc/guilib/Texture.h
@@ -11,7 +11,7 @@
 #include "XBTF.h"
 #include "guilib/imagefactory.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 #pragma pack(1)
diff --git a/xbmc/guilib/TextureGL.cpp b/xbmc/guilib/TextureGL.cpp
index 6e8c752878..0e1de424ca 100644
--- a/xbmc/guilib/TextureGL.cpp
+++ b/xbmc/guilib/TextureGL.cpp
@@ -14,7 +14,7 @@
 #include "guilib/TextureManager.h"
 #include "settings/AdvancedSettings.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 
diff --git a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp b/xbmc/guilib/guiinfo/SystemGUIInfo.cpp
index a27bda4868..6989ac59fb 100644
--- a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp
+++ b/xbmc/guilib/guiinfo/SystemGUIInfo.cpp
@@ -21,7 +21,7 @@
 #include "platform/darwin/osx/smc.h"
 #endif
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 #include "powermanagement/PowerManager.h"
 #include "profiles/ProfileManager.h"
diff --git a/xbmc/interfaces/builtins/Builtins.cpp b/xbmc/interfaces/builtins/Builtins.cpp
index bafbffd75c..b0545b7296 100644
--- a/xbmc/interfaces/builtins/Builtins.cpp
+++ b/xbmc/interfaces/builtins/Builtins.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if defined(TARGET_POSIX)
-#include "platform/linux/PlatformDefs.h"
+#include "PlatformDefs.h"
 #endif
 
 CBuiltins::CBuiltins()
diff --git a/xbmc/interfaces/generic/ScriptInvocationManager.cpp b/xbmc/interfaces/generic/ScriptInvocationManager.cpp
index c30add2b25..c092017848 100644
--- a/xbmc/interfaces/generic/ScriptInvocationManager.cpp
+++ b/xbmc/interfaces/generic/ScriptInvocationManager.cpp
@@ -22,7 +22,7 @@
 #include "utils/log.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 using namespace XFILE;
diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp
index 77cb46bf86..8345af79ce 100644
--- a/xbmc/interfaces/legacy/Dialog.cpp
+++ b/xbmc/interfaces/legacy/Dialog.cpp
@@ -31,7 +31,7 @@
 #include "Dialog.h"
 #include "ListItem.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 using namespace KODI::MESSAGING;
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index 8e194e59bf..08196d58c1 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -17,7 +17,7 @@
 #include "messaging/ApplicationMessenger.h"
 #include "aojsonrpc.h"
 #ifndef TARGET_WINDOWS
-#include "XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include "guilib/LocalizeStrings.h"
 #include "GUIInfoManager.h"
@@ -52,7 +52,7 @@ using namespace KODI;
 using namespace KODI::MESSAGING;
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 namespace XBMCAddon
diff --git a/xbmc/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp
index f4ec1e3270..10b1b3b7a5 100644
--- a/xbmc/interfaces/python/PythonInvoker.cpp
+++ b/xbmc/interfaces/python/PythonInvoker.cpp
@@ -35,7 +35,7 @@
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #ifdef TARGET_WINDOWS
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index 489213736d..bd2c0ec2d9 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -59,7 +59,7 @@
 #include "video/dialogs/GUIDialogVideoInfo.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include <algorithm>
diff --git a/xbmc/network/Network.cpp b/xbmc/network/Network.cpp
index a49a57f153..761d2621ad 100644
--- a/xbmc/network/Network.cpp
+++ b/xbmc/network/Network.cpp
@@ -23,7 +23,7 @@
 #include "utils/CharsetConverter.h"
 #endif
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include "utils/StringUtils.h"
 
diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp
index 45d3899bff..ad00924cff 100644
--- a/xbmc/network/WakeOnAccess.cpp
+++ b/xbmc/network/WakeOnAccess.cpp
@@ -33,7 +33,7 @@
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #ifdef HAS_UPNP
diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 8448b509f3..03527c2390 100644
--- a/xbmc/pictures/GUIWindowPictures.cpp
+++ b/xbmc/pictures/GUIWindowPictures.cpp
@@ -38,7 +38,7 @@
 #include "GUIWindowSlideShow.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #define CONTROL_BTNVIEWASICONS      2
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
index ae3c49330c..4e8cac0b74 100644
--- a/xbmc/pictures/GUIWindowSlideShow.cpp
+++ b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -38,7 +38,7 @@
 #include "pictures/PictureThumbLoader.h"
 #include "PlayListPlayer.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include <random>
 
diff --git a/xbmc/platform/linux/CMakeLists.txt b/xbmc/platform/linux/CMakeLists.txt
index e2bd8655fd..8e9be8969b 100644
--- a/xbmc/platform/linux/CMakeLists.txt
+++ b/xbmc/platform/linux/CMakeLists.txt
@@ -1,27 +1,12 @@
-set(SOURCES ConvUtils.cpp
-            LinuxResourceCounter.cpp
-            LinuxTimezone.cpp
-            OptionalsReg.cpp
+set(SOURCES OptionalsReg.cpp
             PosixMountProvider.cpp
-            TimeUtils.cpp
-            XFileUtils.cpp
-            XHandle.cpp
-            XMemUtils.cpp
-            XTimeUtils.cpp)
+            TimeUtils.cpp)
 
-set(HEADERS ConvUtils.h
-            LinuxResourceCounter.h
-            LinuxTimezone.h
-            OptionalsReg.h
+set(HEADERS OptionalsReg.h
             PlatformConstants.h
             PlatformDefs.h
             PosixMountProvider.h
-            TimeUtils.h
-            XFileUtils.h
-            XHandle.h
-            XHandlePublic.h
-            XMemUtils.h
-            XTimeUtils.h)
+            TimeUtils.h)
 
 if(ALSA_FOUND)
   list(APPEND SOURCES FDEventMonitor.cpp)
diff --git a/xbmc/platform/linux/OMXCore.cpp b/xbmc/platform/linux/OMXCore.cpp
index 02c8653d79..055124d9da 100644
--- a/xbmc/platform/linux/OMXCore.cpp
+++ b/xbmc/platform/linux/OMXCore.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #ifdef TARGET_LINUX
-#include "XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 //#define OMX_DEBUG_EVENTS
diff --git a/xbmc/platform/posix/CMakeLists.txt b/xbmc/platform/posix/CMakeLists.txt
index f7fe6c819c..81e05b2aee 100644
--- a/xbmc/platform/posix/CMakeLists.txt
+++ b/xbmc/platform/posix/CMakeLists.txt
@@ -1,7 +1,21 @@
-set(SOURCES Filesystem.cpp
+set(SOURCES ConvUtils.cpp
+            Filesystem.cpp
+            LinuxResourceCounter.cpp
+            LinuxTimezone.cpp
             MessagePrinter.cpp
-            PlatformPosix.cpp)
+            PlatformPosix.cpp
+            XFileUtils.cpp
+            XHandle.cpp
+            XMemUtils.cpp
+            XTimeUtils.cpp)
 
-set(HEADERS PlatformPosix.h)
+set(HEADERS ConvUtils.h
+            LinuxResourceCounter.h
+            LinuxTimezone.h
+            PlatformPosix.h
+            XFileUtils.h
+            XHandle.h
+            XMemUtils.h
+            XTimeUtils.h)
 
 core_add_library(platform_posix)
diff --git a/xbmc/platform/linux/ConvUtils.cpp b/xbmc/platform/posix/ConvUtils.cpp
index 17d9bca9fa..17d9bca9fa 100644
--- a/xbmc/platform/linux/ConvUtils.cpp
+++ b/xbmc/platform/posix/ConvUtils.cpp
diff --git a/xbmc/platform/linux/ConvUtils.h b/xbmc/platform/posix/ConvUtils.h
index 2e7c16aa98..2e7c16aa98 100644
--- a/xbmc/platform/linux/ConvUtils.h
+++ b/xbmc/platform/posix/ConvUtils.h
diff --git a/xbmc/platform/linux/LinuxResourceCounter.cpp b/xbmc/platform/posix/LinuxResourceCounter.cpp
index 84e5dbb0d3..84e5dbb0d3 100644
--- a/xbmc/platform/linux/LinuxResourceCounter.cpp
+++ b/xbmc/platform/posix/LinuxResourceCounter.cpp
diff --git a/xbmc/platform/linux/LinuxResourceCounter.h b/xbmc/platform/posix/LinuxResourceCounter.h
index 6797079481..6797079481 100644
--- a/xbmc/platform/linux/LinuxResourceCounter.h
+++ b/xbmc/platform/posix/LinuxResourceCounter.h
diff --git a/xbmc/platform/linux/LinuxTimezone.cpp b/xbmc/platform/posix/LinuxTimezone.cpp
index 72cc8fe216..72cc8fe216 100644
--- a/xbmc/platform/linux/LinuxTimezone.cpp
+++ b/xbmc/platform/posix/LinuxTimezone.cpp
diff --git a/xbmc/platform/linux/LinuxTimezone.h b/xbmc/platform/posix/LinuxTimezone.h
index d2ad9d1523..d2ad9d1523 100644
--- a/xbmc/platform/linux/LinuxTimezone.h
+++ b/xbmc/platform/posix/LinuxTimezone.h
diff --git a/xbmc/platform/linux/XFileUtils.cpp b/xbmc/platform/posix/XFileUtils.cpp
index ce359e85c4..ce359e85c4 100644
--- a/xbmc/platform/linux/XFileUtils.cpp
+++ b/xbmc/platform/posix/XFileUtils.cpp
diff --git a/xbmc/platform/linux/XFileUtils.h b/xbmc/platform/posix/XFileUtils.h
index 68760bbea7..68760bbea7 100644
--- a/xbmc/platform/linux/XFileUtils.h
+++ b/xbmc/platform/posix/XFileUtils.h
diff --git a/xbmc/platform/linux/XHandle.cpp b/xbmc/platform/posix/XHandle.cpp
index a42d5696f5..a42d5696f5 100644
--- a/xbmc/platform/linux/XHandle.cpp
+++ b/xbmc/platform/posix/XHandle.cpp
diff --git a/xbmc/platform/linux/XHandle.h b/xbmc/platform/posix/XHandle.h
index 6c9799ea9e..6c9799ea9e 100644
--- a/xbmc/platform/linux/XHandle.h
+++ b/xbmc/platform/posix/XHandle.h
diff --git a/xbmc/platform/linux/XHandlePublic.h b/xbmc/platform/posix/XHandlePublic.h
index 6d1f840f92..6d1f840f92 100644
--- a/xbmc/platform/linux/XHandlePublic.h
+++ b/xbmc/platform/posix/XHandlePublic.h
diff --git a/xbmc/platform/linux/XMemUtils.cpp b/xbmc/platform/posix/XMemUtils.cpp
index 12b7693047..12b7693047 100644
--- a/xbmc/platform/linux/XMemUtils.cpp
+++ b/xbmc/platform/posix/XMemUtils.cpp
diff --git a/xbmc/platform/linux/XMemUtils.h b/xbmc/platform/posix/XMemUtils.h
index 93c078b813..38373ef4f8 100644
--- a/xbmc/platform/linux/XMemUtils.h
+++ b/xbmc/platform/posix/XMemUtils.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "platform/linux/PlatformDefs.h"
+#include "PlatformDefs.h"
 
 // aligned memory allocation and free. memory returned will be aligned to "alignTo" bytes.
 // this is a linux (actually platform free) implementation of the win32 CRT methods _aligned_malloc and _aligned_free.
diff --git a/xbmc/platform/linux/XTimeUtils.cpp b/xbmc/platform/posix/XTimeUtils.cpp
index 250c6c14d3..250c6c14d3 100644
--- a/xbmc/platform/linux/XTimeUtils.cpp
+++ b/xbmc/platform/posix/XTimeUtils.cpp
diff --git a/xbmc/platform/linux/XTimeUtils.h b/xbmc/platform/posix/XTimeUtils.h
index 3199a055b7..3199a055b7 100644
--- a/xbmc/platform/linux/XTimeUtils.h
+++ b/xbmc/platform/posix/XTimeUtils.h
diff --git a/xbmc/platform/posix/filesystem/PosixDirectory.cpp b/xbmc/platform/posix/filesystem/PosixDirectory.cpp
index d5a7845b53..4fc2226f0f 100644
--- a/xbmc/platform/posix/filesystem/PosixDirectory.cpp
+++ b/xbmc/platform/posix/filesystem/PosixDirectory.cpp
@@ -12,7 +12,7 @@
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "FileItem.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #include "URL.h"
 
 #include <dirent.h>
diff --git a/xbmc/platform/posix/filesystem/SMBDirectory.cpp b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
index 35eace33ef..842a534e3c 100644
--- a/xbmc/platform/posix/filesystem/SMBDirectory.cpp
+++ b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
@@ -29,7 +29,7 @@
 #include "utils/URIUtils.h"
 #include "threads/SingleLock.h"
 #include "PasswordManager.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 
 #include <libsmbclient.h>
 
diff --git a/xbmc/pvr/PVRJobs.cpp b/xbmc/pvr/PVRJobs.cpp
index d40034bfeb..365051afdb 100644
--- a/xbmc/pvr/PVRJobs.cpp
+++ b/xbmc/pvr/PVRJobs.cpp
@@ -15,7 +15,7 @@
 #include "events/NotificationEvent.h"
 #include "interfaces/AnnouncementManager.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include "pvr/PVRGUIActions.h"
diff --git a/xbmc/rendering/gl/RenderSystemGL.cpp b/xbmc/rendering/gl/RenderSystemGL.cpp
index 94846c4a62..de99933809 100644
--- a/xbmc/rendering/gl/RenderSystemGL.cpp
+++ b/xbmc/rendering/gl/RenderSystemGL.cpp
@@ -19,7 +19,7 @@
 #include "utils/MathUtils.h"
 #include "utils/StringUtils.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 CRenderSystemGL::CRenderSystemGL() : CRenderSystemBase()
diff --git a/xbmc/rendering/gles/RenderSystemGLES.cpp b/xbmc/rendering/gles/RenderSystemGLES.cpp
index 60eecd2d59..15b68fc7ae 100644
--- a/xbmc/rendering/gles/RenderSystemGLES.cpp
+++ b/xbmc/rendering/gles/RenderSystemGLES.cpp
@@ -18,7 +18,7 @@
 #include "utils/SystemInfo.h"
 #include "utils/MathUtils.h"
 #ifdef TARGET_POSIX
-#include "XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #if defined(TARGET_LINUX)
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 4f5c794ec2..ac5a2ed16b 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -20,7 +20,7 @@
 #include "GUIPassword.h"
 #include "input/KeyboardLayoutManager.h"
 #if defined(TARGET_POSIX)
-#include "platform/linux/LinuxTimezone.h"
+#include "platform/posix/LinuxTimezone.h"
 #endif // defined(TARGET_POSIX)
 #include "network/upnp/UPnPSettings.h"
 #include "network/WakeOnAccess.h"
diff --git a/xbmc/storage/IoSupport.cpp b/xbmc/storage/IoSupport.cpp
index 5861fb5efa..f5e684747c 100644
--- a/xbmc/storage/IoSupport.cpp
+++ b/xbmc/storage/IoSupport.cpp
@@ -48,8 +48,8 @@
 #include "cdioSupport.h"
 #include "MediaManager.h"
 #ifdef TARGET_POSIX
-#include "XHandle.h"
-#include "XFileUtils.h"
+#include "platform/posix/XHandle.h"
+#include "platform/posix/XFileUtils.h"
 #endif
 
 #ifdef HAS_DVD_DRIVE
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index a9150e34fd..320f0c143f 100644
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -24,7 +24,7 @@
 #ifdef TARGET_DARWIN_OSX
 #include "platform/darwin/osx/smc.h"
 #endif
-#include "platform/linux/LinuxResourceCounter.h"
+#include "platform/posix/LinuxResourceCounter.h"
 #endif
 
 #if defined(TARGET_FREEBSD)
diff --git a/xbmc/utils/CPUInfo.h b/xbmc/utils/CPUInfo.h
index fa99213d13..4adef63f71 100644
--- a/xbmc/utils/CPUInfo.h
+++ b/xbmc/utils/CPUInfo.h
@@ -21,7 +21,9 @@ typedef HANDLE PDH_HQUERY;
 typedef HANDLE PDH_HCOUNTER;
 #endif
 class CTemperature;
+#if defined(TARGET_DARWIN)
 class CLinuxResourceCounter;
+#endif
 
 #define CPU_FEATURE_MMX      1 << 0
 #define CPU_FEATURE_MMX2     1 << 1
diff --git a/xbmc/utils/JobManager.cpp b/xbmc/utils/JobManager.cpp
index 1e0fe97298..cb10ffe083 100644
--- a/xbmc/utils/JobManager.cpp
+++ b/xbmc/utils/JobManager.cpp
@@ -13,7 +13,7 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 bool CJob::ShouldCancel(unsigned int progress, unsigned int total) const
diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp
index 82d30d5842..2506b75f63 100644
--- a/xbmc/utils/RssReader.cpp
+++ b/xbmc/utils/RssReader.cpp
@@ -22,7 +22,7 @@
 #include "threads/SingleLock.h"
 #include "log.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #define RSS_COLOR_BODY      0
diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
index fab4738913..37484a52ae 100644
--- a/xbmc/utils/test/TestCPUInfo.cpp
+++ b/xbmc/utils/test/TestCPUInfo.cpp
@@ -17,7 +17,7 @@
 #include "settings/SettingsComponent.h"
 
 #ifdef TARGET_POSIX
-#include "../linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 #include "gtest/gtest.h"
diff --git a/xbmc/utils/test/TestJobManager.cpp b/xbmc/utils/test/TestJobManager.cpp
index cedef11849..5947335ed8 100644
--- a/xbmc/utils/test/TestJobManager.cpp
+++ b/xbmc/utils/test/TestJobManager.cpp
@@ -13,7 +13,7 @@
 #include <atomic>
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 std::atomic<bool> cancelled(false);
diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
index 7adb62801a..e7dfbe0f82 100644
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <algorithm>
 #if defined(TARGET_DARWIN)
-#include "platform/linux/LinuxResourceCounter.h"
+#include "platform/posix/LinuxResourceCounter.h"
 #endif
 
 using namespace KODI::GUILIB;
diff --git a/xbmc/view/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp
index c4ee44fb5f..16828eea9e 100644
--- a/xbmc/view/ViewDatabase.cpp
+++ b/xbmc/view/ViewDatabase.cpp
@@ -20,7 +20,7 @@
 #include "view/ViewState.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/ConvUtils.h"
+#include "platform/posix/ConvUtils.h"
 #endif
 CViewDatabase::CViewDatabase(void) = default;
 
diff --git a/xbmc/weather/WeatherJob.cpp b/xbmc/weather/WeatherJob.cpp
index ba9cbb0f4e..0450cc9fbe 100644
--- a/xbmc/weather/WeatherJob.cpp
+++ b/xbmc/weather/WeatherJob.cpp
@@ -17,7 +17,7 @@
 #include "interfaces/generic/ScriptInvocationManager.h"
 #include "network/Network.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 #include "ServiceBroker.h"
 #include "settings/lib/Setting.h"
diff --git a/xbmc/windowing/X11/VideoSyncGLX.cpp b/xbmc/windowing/X11/VideoSyncGLX.cpp
index b87cec300f..69aafc47a1 100644
--- a/xbmc/windowing/X11/VideoSyncGLX.cpp
+++ b/xbmc/windowing/X11/VideoSyncGLX.cpp
@@ -17,7 +17,7 @@
 #include <string>
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 Display* CVideoSyncGLX::m_Dpy = NULL;
diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp
index 86bd87c92e..72b52d6d90 100644
--- a/xbmc/windowing/X11/XRandR.cpp
+++ b/xbmc/windowing/X11/XRandR.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #endif
 
 CXRandR::CXRandR(bool query)
diff --git a/xbmc/windowing/android/VideoSyncAndroid.cpp b/xbmc/windowing/android/VideoSyncAndroid.cpp
index 489b245dd5..7fb2117f7f 100644
--- a/xbmc/windowing/android/VideoSyncAndroid.cpp
+++ b/xbmc/windowing/android/VideoSyncAndroid.cpp
@@ -15,7 +15,7 @@
 #include "windowing/WinSystem.h"
 #include "windowing/GraphicContext.h"
 #include "utils/MathUtils.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 
 
 bool CVideoSyncAndroid::Setup(PUPDATECLOCK func)
diff --git a/xbmc/windowing/gbm/DRMUtils.cpp b/xbmc/windowing/gbm/DRMUtils.cpp
index 6cae217629..06fcf6dfd3 100644
--- a/xbmc/windowing/gbm/DRMUtils.cpp
+++ b/xbmc/windowing/gbm/DRMUtils.cpp
@@ -16,7 +16,7 @@
 #include <EGL/egl.h>
 #include <unistd.h>
 
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "windowing/GraphicContext.h"
diff --git a/xbmc/windowing/gbm/WinSystemGbmGLContext.cpp b/xbmc/windowing/gbm/WinSystemGbmGLContext.cpp
index 7dc31f3fb3..37e3593614 100644
--- a/xbmc/windowing/gbm/WinSystemGbmGLContext.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbmGLContext.cpp
@@ -16,7 +16,7 @@
 #include "EGL/eglext.h"
 #include "WinSystemGbmGLContext.h"
 #include "OptionalsReg.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #include "utils/log.h"
 
 using namespace KODI::WINDOWING::GBM;
diff --git a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp b/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
index f763577117..619b75bd9f 100644
--- a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
@@ -19,7 +19,7 @@
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
 
 #include "OptionalsReg.h"
-#include "platform/linux/XTimeUtils.h"
+#include "platform/posix/XTimeUtils.h"
 #include "utils/log.h"
 #include "WinSystemGbmGLESContext.h"
 
diff --git a/xbmc/windows/GUIWindowDebugInfo.cpp b/xbmc/windows/GUIWindowDebugInfo.cpp
index 2f0e6426e6..bb0cf3b523 100644
--- a/xbmc/windows/GUIWindowDebugInfo.cpp
+++ b/xbmc/windows/GUIWindowDebugInfo.cpp
@@ -27,7 +27,7 @@
 #include "utils/StringUtils.h"
 
 #ifdef TARGET_POSIX
-#include "platform/linux/XMemUtils.h"
+#include "platform/posix/XMemUtils.h"
 #endif
 
 CGUIWindowDebugInfo::CGUIWindowDebugInfo(void)
diff --git a/xbmc/windows/GUIWindowDebugInfo.h b/xbmc/windows/GUIWindowDebugInfo.h
index 7ca96047ca..d33ff3b261 100644
--- a/xbmc/windows/GUIWindowDebugInfo.h
+++ b/xbmc/windows/GUIWindowDebugInfo.h
@@ -10,7 +10,7 @@
 
 #include "guilib/GUIDialog.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/LinuxResourceCounter.h"
+#include "platform/posix/LinuxResourceCounter.h"
 #endif
 
 class CGUITextLayout;
diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp
index 235d57c26b..be3f6be6f4 100644
--- a/xbmc/windows/GUIWindowFileManager.cpp
+++ b/xbmc/windows/GUIWindowFileManager.cpp
@@ -52,7 +52,7 @@
 #include "URL.h"
 #include "platform/Filesystem.h"
 #ifdef TARGET_POSIX
-#include "platform/linux/XFileUtils.h"
+#include "platform/posix/XFileUtils.h"
 #endif
 
 using namespace XFILE;