Index: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.h
===================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.h
+++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.h
@@ -10,6 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_arm_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_arm_H_
 
+#include "RegisterContextPOSIX.h"
 #include "Plugins/Process/Utility/RegisterContextPOSIX_arm.h"
 
 class RegisterContextPOSIXProcessMonitor_arm:
Index: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.h
+++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.h
@@ -10,6 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_arm64_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_arm64_H_
 
+#include "RegisterContextPOSIX.h"
 #include "Plugins/Process/Utility/RegisterContextPOSIX_arm64.h"
 
 class RegisterContextPOSIXProcessMonitor_arm64:
Index: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.h
+++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.h
@@ -10,6 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
 
+#include "RegisterContextPOSIX.h"
 #include "Plugins/Process/Utility/RegisterContextPOSIX_mips64.h"
 
 class RegisterContextPOSIXProcessMonitor_mips64:
Index: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.h
===================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.h
+++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.h
@@ -10,6 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_powerpc_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_powerpc_H_
 
+#include "RegisterContextPOSIX.h"
 #include "Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h"
 
 class RegisterContextPOSIXProcessMonitor_powerpc:
Index: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.h
===================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.h
+++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.h
@@ -10,6 +10,7 @@
 #ifndef liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
 #define liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
 
+#include "RegisterContextPOSIX.h"
 #include "Plugins/Process/Utility/RegisterContextPOSIX_x86.h"
 
 class RegisterContextPOSIXProcessMonitor_x86_64:
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm.h
@@ -12,7 +12,6 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
-#include "RegisterContextPOSIX.h"
 #include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_arm
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_arm64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextFreeBSD_arm64_H_
 #define liblldb_RegisterContextFreeBSD_arm64_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_arm64:
     public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextFreeBSD_i386_H_
 #define liblldb_RegisterContextFreeBSD_i386_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_i386
   : public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextFreeBSD_mips64_H_
 #define liblldb_RegisterContextFreeBSD_mips64_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_mips64:
     public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextFreeBSD_powerpc_H_
 #define liblldb_RegisterContextFreeBSD_powerpc_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_powerpc:
     public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextFreeBSD_x86_64_H_
 #define liblldb_RegisterContextFreeBSD_x86_64_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_x86_64:
     public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm.h
@@ -12,7 +12,6 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
-#include "RegisterContextPOSIX.h"
 #include "RegisterInfoInterface.h"
 
 class RegisterContextLinux_arm
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h
@@ -12,7 +12,6 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
-#include "RegisterContextPOSIX.h"
 #include "RegisterInfoInterface.h"
 
 class RegisterContextLinux_arm64
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextLinux_i386_H_
 #define liblldb_RegisterContextLinux_i386_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextLinux_i386
   : public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_RegisterContextLinux_x86_64_H_
 #define liblldb_RegisterContextLinux_x86_64_H_
 
-#include "RegisterContextPOSIX.h"
+#include "RegisterInfoInterface.h"
 
 class RegisterContextLinux_x86_64
     : public lldb_private::RegisterInfoInterface
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
@@ -11,8 +11,9 @@
 #define liblldb_RegisterContextPOSIX_arm_H_
 
 #include "lldb/Core/Log.h"
+#include "lldb/Target/RegisterContext.h"
+#include "RegisterInfoInterface.h"
 #include "lldb-arm-register-enums.h"
-#include "RegisterContextPOSIX.h"
 
 class ProcessMonitor;
 
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
@@ -11,8 +11,9 @@
 #define liblldb_RegisterContextPOSIX_arm64_H_
 
 #include "lldb/Core/Log.h"
+#include "lldb/Target/RegisterContext.h"
+#include "RegisterInfoInterface.h"
 #include "lldb-arm64-register-enums.h"
-#include "RegisterContextPOSIX.h"
 
 class ProcessMonitor;
 
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
@@ -11,7 +11,8 @@
 #define liblldb_RegisterContextPOSIX_mips64_H_
 
 #include "lldb/Core/Log.h"
-#include "RegisterContextPOSIX.h"
+#include "lldb/Target/RegisterContext.h"
+#include "RegisterInfoInterface.h"
 #include "RegisterContext_mips.h"
 #include "lldb-mips-freebsd-register-enums.h"
 
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
@@ -11,7 +11,8 @@
 #define liblldb_RegisterContextPOSIX_powerpc_H_
 
 #include "lldb/Core/Log.h"
-#include "RegisterContextPOSIX.h"
+#include "lldb/Target/RegisterContext.h"
+#include "RegisterInfoInterface.h"
 #include "RegisterContext_powerpc.h"
 
 class ProcessMonitor;
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
@@ -11,9 +11,10 @@
 #define liblldb_RegisterContextPOSIX_x86_H_
 
 #include "lldb/Core/Log.h"
-#include "lldb-x86-register-enums.h"
-#include "RegisterContextPOSIX.h"
+#include "lldb/Target/RegisterContext.h"
+#include "RegisterInfoInterface.h"
 #include "RegisterContext_x86.h"
+#include "lldb-x86-register-enums.h"
 
 class ProcessMonitor;
 
Index: lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp
+++ lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Target/Thread.h"
-#include "Plugins/Process/Utility/RegisterContextPOSIX.h"
 #include "RegisterContextPOSIXCore_arm.h"
 
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp
+++ lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Target/Thread.h"
-#include "Plugins/Process/Utility/RegisterContextPOSIX.h"
 #include "RegisterContextPOSIXCore_arm64.h"
 
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
+++ lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Target/Thread.h"
-#include "Plugins/Process/Utility/RegisterContextPOSIX.h"
 #include "RegisterContextPOSIXCore_mips64.h"
 
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp
+++ lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Target/Thread.h"
-#include "RegisterContextPOSIX.h"
 #include "RegisterContextPOSIXCore_powerpc.h"
 
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
+++ lldb/trunk/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Target/Thread.h"
-#include "Plugins/Process/Utility/RegisterContextPOSIX.h"
 #include "RegisterContextPOSIXCore_x86_64.h"
 
 using namespace lldb_private;