diff --git a/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.cpp b/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.cpp
index 001339fbf7..8fb62c86af 100644
--- a/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.cpp
+++ b/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.cpp
@@ -6,14 +6,16 @@
 
 #include "RemoteDebugRequest.h"
 
-#include "Architecture.h"
-#include "CpuState.h"
-
-#include <AutoDeleter.h>
+#include <stdlib.h>
 
 #include <Message.h>
 
-#include <stdlib.h>
+#include <debugger.h>
+
+#include <AutoDeleter.h>
+
+#include "Architecture.h"
+#include "CpuState.h"
 
 
 // #pragma mark - RemoteDebugRequest
diff --git a/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.h b/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.h
index 4bd24c7696..71f819d535 100644
--- a/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.h
+++ b/src/kits/debugger/debugger_interface/remote/RemoteDebugRequest.h
@@ -5,11 +5,11 @@
 #ifndef REMOTE_DEBUG_REQUEST_H
 #define REMOTE_DEBUG_REQUEST_H
 
-#include "Types.h"
+#include <OS.h>
 
 #include <Referenceable.h>
 
-#include <OS.h>
+#include "Types.h"
 
 
 enum remote_request_type {
@@ -23,10 +23,10 @@ enum remote_request_type {
 	REMOTE_REQUEST_TYPE_SINGLE_STEP_THREAD,
 	REMOTE_REQUEST_TYPE_GET_CPU_STATE,
 	REMOTE_REQUEST_TYPE_SET_CPU_STATE,
-	REMOTE_REQUEST_TYPE_SET_BREAKPOINT,
-	REMOTE_REQUEST_TYPE_CLEAR_BREAKPOINT,
-	REMOTE_REQUEST_TYPE_SET_WATCHPOINT,
-	REMOTE_REQUEST_TYPE_CLEAR_WATCHPOINT,
+	REMOTE_REQUEST_TYPE_INSTALL_BREAKPOINT,
+	REMOTE_REQUEST_TYPE_UNINSTALL_BREAKPOINT,
+	REMOTE_REQUEST_TYPE_INSTALL_WATCHPOINT,
+	REMOTE_REQUEST_TYPE_UNINSTALL_WATCHPOINT,
 	REMOTE_REQUEST_TYPE_PREPARE_HANDOVER,
 	REMOTE_REQUEST_TYPE_WRITE_CORE_FILE,