diff --git a/sdk/lib/rtl/amd64/debug_asm.S b/sdk/lib/rtl/amd64/debug_asm.S
index 00cbe7163bd..7db8e89d122 100644
--- a/sdk/lib/rtl/amd64/debug_asm.S
+++ b/sdk/lib/rtl/amd64/debug_asm.S
@@ -8,37 +8,29 @@
 
 #include <asm.inc>
 
-/* GLOBALS ****************************************************************/
-
-PUBLIC DbgBreakPoint
-PUBLIC DbgBreakPointWithStatus
-PUBLIC DbgUserBreakPoint
-PUBLIC DebugService
-PUBLIC DebugService2
-PUBLIC RtlpBreakWithStatusInstruction
-
 /* FUNCTIONS ***************************************************************/
 
 .code64
 
+PUBLIC DbgUserBreakPoint
 DbgUserBreakPoint:
+PUBLIC DbgBreakPoint
 .PROC DbgBreakPoint
     .endprolog
     int 3
     ret
 .ENDP
 
+PUBLIC RtlpBreakWithStatusInstruction
+RtlpBreakWithStatusInstruction:
+PUBLIC DbgBreakPointWithStatus
 .PROC DbgBreakPointWithStatus
-    .endprolog
-    mov eax, ecx
-.ENDP
-
-.PROC RtlpBreakWithStatusInstruction
     .endprolog
     int 3
     ret
 .ENDP
 
+PUBLIC DebugService2
 DebugService2:
 
     /* Pass the service number in eax */
@@ -56,6 +48,7 @@ DebugService2:
  *     IN PVOID Argument1,  // <r9>  = [rsp + 32]
  *     IN PVOID Argument2); //         [rsp + 40]
  */
+PUBLIC DebugService
 DebugService:
 
     /* Prepare registers for interrupt */
diff --git a/sdk/lib/rtl/arm/debug_asm.S b/sdk/lib/rtl/arm/debug_asm.S
index c223edcb344..21e21269020 100644
--- a/sdk/lib/rtl/arm/debug_asm.S
+++ b/sdk/lib/rtl/arm/debug_asm.S
@@ -21,11 +21,7 @@
     LEAF_END DbgUserBreakPoint
 
     LEAF_ENTRY DbgBreakPointWithStatus
-    __debugbreak
-    bx lr
-    LEAF_END
-
-    LEAF_ENTRY RtlpBreakWithStatusInstruction
+    ALTERNATE_ENTRY RtlpBreakWithStatusInstruction
     __debugbreak
     bx lr
     LEAF_END