diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 0e9393f6a0f..21fef6a6e52 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -34,7 +34,7 @@ endif
 
 ifeq ($(KDBG), 1)
 OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
-                dbg/i386/kdb_help.o dbg/profile.o \
+                dbg/i386/kdb_help.o \
 		../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o
 CFLAGS_KDBG := -I../lib/kjs/include
 preall: all
@@ -45,7 +45,7 @@ else
 OBJECTS_KDBG :=
 endif
 ifeq ($(DBG_OR_KDBG), 1)
-OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o
+OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o
 endif
 
 TARGET_ASFLAGS = -I./include
diff --git a/reactos/ntoskrnl/dbg/profile.c b/reactos/ntoskrnl/dbg/profile.c
index 240acc40e04..ec311ae3a76 100755
--- a/reactos/ntoskrnl/dbg/profile.c
+++ b/reactos/ntoskrnl/dbg/profile.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: profile.c,v 1.10 2004/10/22 20:16:47 ekohl Exp $
- *
+/* 
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/dbg/profile.c
  * PURPOSE:         Kernel profiling
diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index 0cc41ed71f5..11ab00aea45 100644
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,5 +1,4 @@
-/* $Id: kdebug.c,v 1.58 2004/12/14 10:18:57 gvg Exp $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/kd/kdebug.c
@@ -243,7 +242,7 @@ KdInitSystem(ULONG BootPhase,
 		}
 	    }
 	}
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
     else if (!_strnicmp(p2, "PROFILE", 7)  && BootPhase > 0)
       {
         KdbInitProfiling();
diff --git a/reactos/ntoskrnl/ke/i386/irq.c b/reactos/ntoskrnl/ke/i386/irq.c
index d35116313e6..3668c85599b 100644
--- a/reactos/ntoskrnl/ke/i386/irq.c
+++ b/reactos/ntoskrnl/ke/i386/irq.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/i386/irq.c
  * PURPOSE:         IRQ handling
@@ -37,7 +36,7 @@
 /* INCLUDES ****************************************************************/
 
 #include <ntoskrnl.h>
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
 #include <../dbg/kdb.h>
 #endif /* KDBG */
 
@@ -358,7 +357,7 @@ KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe)
    {
       KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame);
       KeUpdateSystemTime(&KernelTrapFrame, old_level);
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
       KdbProfileInterrupt(Trapframe->Eip);
 #endif /* KDBG */
    }
diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 022904b09bc..4bcae7d9bdd 100644
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
  * PURPOSE:         Initalizes the kernel
@@ -705,7 +704,7 @@ ExpInitializeExecutive(VOID)
     KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
   }
 
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
   KdbInitProfiling2();
 #endif /* KDBG */