diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index a3f48c34e8ba..b3c09bc7dd39 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -109,6 +109,12 @@ ifeq ($(HOST_OS),Linux)
               lldbPluginJITLoaderGDB.a
 endif
 
+ifeq ($(HOST_OS),MingW)
+  USEDLIBS += lldbHostWindows.a \
+              lldbPluginProcessElfCore.a \
+              lldbPluginJITLoaderGDB.a
+endif
+
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
   USEDLIBS += lldbHostFreeBSD.a \
               lldbPluginProcessPOSIX.a \
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index 52111a51aa84..30835652589e 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -92,6 +92,8 @@ endif ()
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
   list(APPEND LLDB_USED_LIBS
     lldbHostWindows
+    lldbPluginProcessElfCore
+    lldbPluginJITLoaderGDB
     Ws2_32
     )
 endif ()
diff --git a/lldb/source/Plugins/JITLoader/CMakeLists.txt b/lldb/source/Plugins/JITLoader/CMakeLists.txt
index dc9533e2ba74..7bd733c3b56a 100644
--- a/lldb/source/Plugins/JITLoader/CMakeLists.txt
+++ b/lldb/source/Plugins/JITLoader/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_subdirectory(GDB)
 endif()
diff --git a/lldb/source/Plugins/Makefile b/lldb/source/Plugins/Makefile
index 099be354a0fe..e43290dbc17b 100644
--- a/lldb/source/Plugins/Makefile
+++ b/lldb/source/Plugins/Makefile
@@ -40,6 +40,11 @@ DIRS += Process/elf-core
 DIRS += JITLoader/GDB
 endif
 
+ifeq ($(HOST_OS),MingW)
+DIRS += Process/elf-core
+DIRS += JITLoader/GDB
+endif
+
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 DIRS += Process/FreeBSD Process/POSIX
 DIRS += Process/elf-core
diff --git a/lldb/source/Plugins/Process/CMakeLists.txt b/lldb/source/Plugins/Process/CMakeLists.txt
index 96fc57fafcbc..f9bdf79282b0 100644
--- a/lldb/source/Plugins/Process/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/CMakeLists.txt
@@ -6,6 +6,8 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   add_subdirectory(FreeBSD)
   add_subdirectory(POSIX)
   add_subdirectory(elf-core)
+elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
+  add_subdirectory(elf-core)
 elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_subdirectory(MacOSX-Kernel)
 endif()
diff --git a/lldb/source/Plugins/Process/Linux/CMakeLists.txt b/lldb/source/Plugins/Process/Linux/CMakeLists.txt
index 221a682a233d..1e914099bbbf 100644
--- a/lldb/source/Plugins/Process/Linux/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/Linux/CMakeLists.txt
@@ -2,6 +2,7 @@ set(LLVM_NO_RTTI 1)
 
 include_directories(.)
 include_directories(../POSIX)
+include_directories(../Utility)
 
 add_lldb_library(lldbPluginProcessLinux
   ProcessLinux.cpp
diff --git a/lldb/source/Plugins/Process/POSIX/CMakeLists.txt b/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
index 2cd50b428fba..c9accb083a99 100644
--- a/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/POSIX/CMakeLists.txt
@@ -10,13 +10,6 @@ add_lldb_library(lldbPluginProcessPOSIX
   ProcessMessage.cpp
   ProcessPOSIX.cpp
   ProcessPOSIXLog.cpp
-  RegisterContextPOSIX_mips64.cpp
-  RegisterContextPOSIX_x86.cpp
   RegisterContextPOSIXProcessMonitor_mips64.cpp
   RegisterContextPOSIXProcessMonitor_x86.cpp
-  RegisterContextFreeBSD_i386.cpp
-  RegisterContextFreeBSD_mips64.cpp
-  RegisterContextFreeBSD_x86_64.cpp
-  RegisterContextLinux_i386.cpp
-  RegisterContextLinux_x86_64.cpp
   )
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h b/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h
index 8f545eef0d5e..70216ae9fdd1 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h
+++ b/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
 
-#include "Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h"
+#include "Plugins/Process/Utility/RegisterContextPOSIX_mips64.h"
 
 class RegisterContextPOSIXProcessMonitor_mips64:
     public RegisterContextPOSIX_mips64,
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h b/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h
index 2b64fa8003a2..b88b6eb10659 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h
+++ b/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
 
-#include "Plugins/Process/POSIX/RegisterContextPOSIX_x86.h"
+#include "Plugins/Process/Utility/RegisterContextPOSIX_x86.h"
 
 class RegisterContextPOSIXProcessMonitor_x86_64:
     public RegisterContextPOSIX_x86,
diff --git a/lldb/source/Plugins/Process/Utility/CMakeLists.txt b/lldb/source/Plugins/Process/Utility/CMakeLists.txt
index 63b6f3fe55ba..6cd8e6459009 100644
--- a/lldb/source/Plugins/Process/Utility/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/Utility/CMakeLists.txt
@@ -11,13 +11,20 @@ add_lldb_library(lldbPluginProcessUtility
   RegisterContextDarwin_i386.cpp
   RegisterContextDarwin_x86_64.cpp
   RegisterContextDummy.cpp
+  RegisterContextFreeBSD_i386.cpp
+  RegisterContextFreeBSD_mips64.cpp
+  RegisterContextFreeBSD_x86_64.cpp
   RegisterContextHistory.cpp
+  RegisterContextLinux_i386.cpp
+  RegisterContextLinux_x86_64.cpp
   RegisterContextLLDB.cpp
   RegisterContextMacOSXFrameBackchain.cpp
   RegisterContextMach_arm.cpp
   RegisterContextMach_i386.cpp
   RegisterContextMach_x86_64.cpp
   RegisterContextMemory.cpp
+  RegisterContextPOSIX_mips64.cpp
+  RegisterContextPOSIX_x86.cpp
   RegisterContextThreadMemory.cpp
   StopInfoMachException.cpp
   ThreadMemory.cpp
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
similarity index 98%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
index a8b4b6d75412..1d11e818a8cf 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
@@ -82,7 +82,7 @@ struct UserArea
     uint32_t u_debugreg[8]; // Debug registers (DR0 - DR7).
 };
 
-#define DR_SIZE sizeof(UserArea::u_debugreg[0])
+#define DR_SIZE sizeof(((UserArea*)NULL)->u_debugreg[0])
 #define DR_0_OFFSET 0xFC
 #define DR_OFFSET(reg_index) \
     (DR_0_OFFSET + (reg_index * 4))
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
similarity index 98%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
index 5434ddfcf38b..fd01ab5ca322 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
@@ -69,7 +69,7 @@ struct UserArea
     uint64_t fault_address; // Control register CR3.
 };
 
-#define DR_SIZE sizeof(UserArea::u_debugreg[0])
+#define DR_SIZE sizeof(((UserArea*)NULL)->u_debugreg[0])
 #define DR_OFFSET(reg_index) \
     (LLVM_EXTENSION offsetof(UserArea, u_debugreg[reg_index]))
 
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextPOSIX.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp
similarity index 99%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp
index 45c99aec1657..0674e9d70497 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp
@@ -20,7 +20,6 @@
 #include "lldb/Host/Endian.h"
 #include "llvm/Support/Compiler.h"
 
-#include "ProcessPOSIX.h"
 #include "RegisterContextPOSIX_mips64.h"
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
 
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp
similarity index 99%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp
rename to lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp
index 9ae541a6309b..ad8ecac9f26a 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp
@@ -20,7 +20,6 @@
 #include "lldb/Host/Endian.h"
 #include "llvm/Support/Compiler.h"
 
-#include "ProcessPOSIX.h"
 #include "RegisterContext_x86.h"
 #include "RegisterContextPOSIX_x86.h"
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h
rename to lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterContext_mips64.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h
rename to lldb/source/Plugins/Process/Utility/RegisterContext_mips64.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h b/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h
similarity index 100%
rename from lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h
rename to lldb/source/Plugins/Process/Utility/RegisterContext_x86.h
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
similarity index 99%
rename from lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h
rename to lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
index 35cbc70399c1..ad21952839b5 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
@@ -39,7 +39,7 @@
 
 // Note that the size and offset will be updated by platform-specific classes.
 #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)            \
-    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint,  \
+    { #reg, alt, sizeof(((GPR*)NULL)->reg), GPR_OFFSET(reg), eEncodingUint,  \
       eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_i386 }, NULL, NULL }
 
 #define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4)           \
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
similarity index 98%
rename from lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h
rename to lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
index 13526e3680b7..b5461ef81baa 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
@@ -15,7 +15,7 @@
 
 // Note that the size and offset will be updated by platform-specific classes.
 #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)           \
-    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint, \
+    { #reg, alt, sizeof(((GPR*)NULL)->reg), GPR_OFFSET(reg), eEncodingUint, \
       eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_mips64 }, NULL, NULL }
 
 static RegisterInfo
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
similarity index 99%
rename from lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
rename to lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
index 86abdba68db6..006999d995ea 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
@@ -39,7 +39,7 @@
 
 // Note that the size and offset will be updated by platform-specific classes.
 #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)    \
-    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint, \
+    { #reg, alt, sizeof(((GPR*)NULL)->reg), GPR_OFFSET(reg), eEncodingUint, \
       eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_x86_64 }, NULL, NULL }
 
 #define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4)    \
diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
index 0b2ca2409835..c2edc47f7f30 100644
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -17,13 +17,12 @@
 #include "lldb/Core/Section.h"
 #include "lldb/Core/State.h"
 #include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/DynamicLoader.h"
 
 #include "llvm/Support/ELF.h"
 
-#include "ProcessPOSIXLog.h"
-
 #include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
 #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
 
@@ -397,7 +396,7 @@ ParseFreeBSDPrStatus(ThreadData &thread_data, DataExtractor &data,
                  arch.GetMachine() == llvm::Triple::x86_64);
     int pr_version = data.GetU32(&offset);
 
-    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
+    Log *log (GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
     if (log)
     {
         if (pr_version > 1)
diff --git a/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h b/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h
index 92e486bf2235..ca6618d87ab2 100644
--- a/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h
+++ b/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextCorePOSIX_mips64_H_
 #define liblldb_RegisterContextCorePOSIX_mips64_H_
 
-#include "Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h"
+#include "Plugins/Process/Utility/RegisterContextPOSIX_mips64.h"
 
 class RegisterContextCorePOSIX_mips64 :
     public RegisterContextPOSIX_mips64
diff --git a/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h b/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h
index d4ea14fab7b1..181c56254449 100644
--- a/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h
+++ b/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextCorePOSIX_x86_64_H_
 #define liblldb_RegisterContextCorePOSIX_x86_64_H_
 
-#include "Plugins/Process/POSIX/RegisterContextPOSIX_x86.h"
+#include "Plugins/Process/Utility/RegisterContextPOSIX_x86.h"
 
 class RegisterContextCorePOSIX_x86_64 :
     public RegisterContextPOSIX_x86
diff --git a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
index cadcf53ca543..a94392830d7e 100644
--- a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
+++ b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
@@ -8,11 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StopInfo.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Unwind.h"
-#include "ProcessPOSIXLog.h"
 
 #include "ThreadElfCore.h"
 #include "ProcessElfCore.h"
@@ -74,7 +74,7 @@ ThreadElfCore::CreateRegisterContextForFrame (StackFrame *frame)
 {
     RegisterContextSP reg_ctx_sp;
     uint32_t concrete_frame_idx = 0;
-    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
+    Log *log (GetLogIfAllCategoriesSet(LIBLLDB_LOG_THREAD));
 
     if (frame)
         concrete_frame_idx = frame->GetConcreteFrameIndex ();