diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index 34d66a2dbdd..27240014714 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -66,6 +66,7 @@
 
 #ifdef	__FreeBSD__
 #include <sys/device_port.h>
+#include <sys/kdb.h>
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_sim.h>
@@ -86,7 +87,7 @@
 
 #ifdef	__FreeBSD__
 #undef	MSG_IDENTIFY
-#define	SCSI_LOW_DEBUGGER(dev)	Debugger((dev))
+#define	SCSI_LOW_DEBUGGER(dev)	kdb_enter(dev)
 #define	SCSI_LOW_DELAY(mu)	DELAY((mu))
 #define	SCSI_LOW_SPLSCSI	splcam
 #define	SCSI_LOW_BZERO(pt, size)	bzero((pt), (size))
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c
index 97b69bddd0b..a7f7153a36b 100644
--- a/sys/dev/acpica/Osd/OsdDebug.c
+++ b/sys/dev/acpica/Osd/OsdDebug.c
@@ -33,6 +33,7 @@
 
 #include "opt_ddb.h"
 #include <sys/param.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <machine/bus.h>
@@ -79,12 +80,12 @@ AcpiOsSignal(UINT32 Function, void *Info)
 	fatal = (ACPI_SIGNAL_FATAL_INFO *)Info;
 	printf("ACPI fatal signal, type 0x%x  code 0x%x  argument 0x%x",
 	      fatal->Type, fatal->Code, fatal->Argument);
-	Debugger("AcpiOsSignal");
+	kdb_enter("AcpiOsSignal");
 	break;
 	
     case ACPI_SIGNAL_BREAKPOINT:
 	message = (char *)Info;
-	Debugger(message);
+	kdb_enter(message);
 	break;
 
     default: