Index: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
===================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
@@ -13,8 +13,6 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "AppleThreadPlanStepThroughObjCTrampoline.h"
-
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclCXX.h"
 
@@ -30,6 +28,8 @@
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
===================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
@@ -1,6 +1,3 @@
-# We depend on AppleThreadPlanStepThroughObjCTrampoline.h
-include_directories(../../LanguageRuntime/ObjC/AppleObjCRuntime)
-
 add_lldb_library(lldbPluginSystemRuntimeMacOSX
   AppleGetItemInfoHandler.cpp
   AppleGetPendingItemsHandler.cpp
Index: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/Makefile
===================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/Makefile
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/Makefile
@@ -11,5 +11,4 @@
 LIBRARYNAME := lldbPluginSystemRuntimeMacOSX
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../LanguageRuntime/ObjC/AppleObjCRuntime
 include $(LLDB_LEVEL)/Makefile