diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -294,8 +294,9 @@
     m_command_override_baton = baton;
   }
 
-  void SetOverrideCallback(lldb::CommandOverrideCallbackWithResult callback,
-                           void *baton) {
+  void
+  SetOverrideCallback(lldb_private::CommandOverrideCallbackWithResult callback,
+                      void *baton) {
     m_command_override_callback = callback;
     m_command_override_baton = baton;
   }
@@ -377,7 +378,7 @@
   Flags m_flags;
   std::vector<CommandArgumentEntry> m_arguments;
   lldb::CommandOverrideCallback m_deprecated_command_override_callback;
-  lldb::CommandOverrideCallbackWithResult m_command_override_callback;
+  lldb_private::CommandOverrideCallbackWithResult m_command_override_callback;
   void *m_command_override_baton;
   bool m_is_user_command = false;
 
diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h
--- a/lldb/include/lldb/lldb-private-types.h
+++ b/lldb/include/lldb/lldb-private-types.h
@@ -121,6 +121,8 @@
 
 typedef void (*DebuggerDestroyCallback)(lldb::user_id_t debugger_id,
                                         void *baton);
+typedef bool (*CommandOverrideCallbackWithResult)(
+    void *baton, const char **argv, lldb_private::CommandReturnObject &result);
 } // namespace lldb_private
 
 #endif // #if defined(__cplusplus)
diff --git a/lldb/include/lldb/lldb-types.h b/lldb/include/lldb/lldb-types.h
--- a/lldb/include/lldb/lldb-types.h
+++ b/lldb/include/lldb/lldb-types.h
@@ -71,8 +71,6 @@
 
 typedef void (*LogOutputCallback)(const char *, void *baton);
 typedef bool (*CommandOverrideCallback)(void *baton, const char **argv);
-typedef bool (*CommandOverrideCallbackWithResult)(
-    void *baton, const char **argv, lldb_private::CommandReturnObject &result);
 typedef bool (*ExpressionCancelCallback)(ExpressionEvaluationPhase phase,
                                          void *baton);