9 files changed, 6 insertions, 6 deletions
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
index 8294c3ccf2..a2c8c29f14 100644
--- a/cmake/treedata/windows/subdirs.txt
+++ b/cmake/treedata/windows/subdirs.txt
@@ -5,10 +5,10 @@ xbmc/platform/win32/network            platform/win32/network
 xbmc/platform/win32/peripherals        platform/win32/peripherals
 xbmc/platform/win32/powermanagement    platform/win32/powermanagement
 xbmc/platform/win32/storage            platform/win32/storage
+xbmc/platform/win32/utils              platform/win32/utils
 xbmc/input/touch                       input/touch
 xbmc/input/touch/generic               input/touch/generic
 xbmc/network/mdns                      network/mdns
-xbmc/utils/win32                       utils/win32
 xbmc/rendering/dx                      rendering/dx
 xbmc/threads/platform/win              threads/win
 xbmc/windowing/windows                 windowing/windows
diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt
index 1084447281..604be08cd3 100644
--- a/cmake/treedata/windowsstore/subdirs.txt
+++ b/cmake/treedata/windowsstore/subdirs.txt
@@ -5,10 +5,10 @@ xbmc/platform/win10/peripherals        platform/win10/peripherals
 xbmc/platform/win10/powermanagement    platfrom/win10/powermanagement
 xbmc/platform/win10/storage            platfrom/win10/storage
 xbmc/platform/win32/filesystem         platform/win32/filesystem
+xbmc/platform/win32/utils              platform/win32/utils
 xbmc/input/touch                       input/touch
 xbmc/input/touch/generic               input/touch/generic
 xbmc/network/mdns                      network/mdns
-xbmc/utils/win32                       utils/win32
 xbmc/rendering/dx                      rendering/dx
 xbmc/threads/platform/win              threads/win
 xbmc/windowing/win10                   windowing/win10
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.cpp
index 147f570d94..f8aaca8a5e 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.cpp
@@ -28,9 +28,9 @@
 #include "rendering/dx/RenderContext.h"
 #include "utils/log.h"
 #if defined(HAVE_SSE2)
-#include "utils/win32/gpu_memcpy_sse4.h"
+#include "platform/win32/utils/gpu_memcpy_sse4.h"
 #endif
-#include "utils/win32/memcpy_sse2.h"
+#include "platform/win32/utils/memcpy_sse2.h"
 #include "utils/CPUInfo.h"
 
 #define PLANE_Y 0
diff --git a/xbmc/utils/win32/CMakeLists.txt b/xbmc/platform/win32/utils/CMakeLists.txt
index 3f71e0bfc2..3c32cb4986 100644
--- a/xbmc/utils/win32/CMakeLists.txt
+++ b/xbmc/platform/win32/utils/CMakeLists.txt
@@ -4,4 +4,4 @@ set(HEADERS gpu_memcpy_sse4.h
             memcpy_sse2.h
             Win32InterfaceForCLog.h)
 
-core_add_library(utils_win32)
+core_add_library(platform_win32_utils)
diff --git a/xbmc/utils/win32/Win32InterfaceForCLog.cpp b/xbmc/platform/win32/utils/Win32InterfaceForCLog.cpp
index 0a5cf9a43f..0a5cf9a43f 100644
--- a/xbmc/utils/win32/Win32InterfaceForCLog.cpp
+++ b/xbmc/platform/win32/utils/Win32InterfaceForCLog.cpp
diff --git a/xbmc/utils/win32/Win32InterfaceForCLog.h b/xbmc/platform/win32/utils/Win32InterfaceForCLog.h
index 0397c154df..0397c154df 100644
--- a/xbmc/utils/win32/Win32InterfaceForCLog.h
+++ b/xbmc/platform/win32/utils/Win32InterfaceForCLog.h
diff --git a/xbmc/utils/win32/gpu_memcpy_sse4.h b/xbmc/platform/win32/utils/gpu_memcpy_sse4.h
index b5eb89896b..b5eb89896b 100644
--- a/xbmc/utils/win32/gpu_memcpy_sse4.h
+++ b/xbmc/platform/win32/utils/gpu_memcpy_sse4.h
diff --git a/xbmc/utils/win32/memcpy_sse2.h b/xbmc/platform/win32/utils/memcpy_sse2.h
index 13ee1ac5b0..13ee1ac5b0 100644
--- a/xbmc/utils/win32/memcpy_sse2.h
+++ b/xbmc/platform/win32/utils/memcpy_sse2.h
diff --git a/xbmc/utils/log.cpp b/xbmc/utils/log.cpp
index 3223f88826..e38037a81d 100644
--- a/xbmc/utils/log.cpp
+++ b/xbmc/utils/log.cpp
@@ -30,7 +30,7 @@
 #include "platform/posix/utils/PosixInterfaceForCLog.h"
 typedef class CPosixInterfaceForCLog PlatformInterfaceForCLog;
 #elif defined(TARGET_WINDOWS)
-#include "win32/Win32InterfaceForCLog.h"
+#include "platform/win32/utils/Win32InterfaceForCLog.h"
 typedef class CWin32InterfaceForCLog PlatformInterfaceForCLog;
 #endif