diff --git a/reactos/ntoskrnl/mm/mmdbg.c b/reactos/ntoskrnl/mm/ARM3/mmdbg.c
similarity index 96%
rename from reactos/ntoskrnl/mm/mmdbg.c
rename to reactos/ntoskrnl/mm/ARM3/mmdbg.c
index 313516b1bf3..7444f7d57f5 100644
--- a/reactos/ntoskrnl/mm/mmdbg.c
+++ b/reactos/ntoskrnl/mm/ARM3/mmdbg.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/mm/mmdbg.c
+ * LICENSE:         BSD - See COPYING.ARM in the top level directory
+ * FILE:            ntoskrnl/mm/ARM3/mmdbg.c
  * PURPOSE:         Memory Manager support routines for the Kernel Debugger
  * PROGRAMMERS:     Stefan Ginsberg (stefan.ginsberg@reactos.org)
  */
@@ -9,10 +9,17 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntoskrnl.h>
-#include "ARM3/miarm.h"
 #define NDEBUG
 #include <debug.h>
 
+#line 16 "ARM³::DEBUGSUP"
+#define MODULE_INVOLVED_IN_ARM3
+#include "../ARM3/miarm.h"
+
+#ifndef _WINKD_
+#define KdpDprintf DPRINT
+#endif
+
 /* GLOBALS ********************************************************************/
 
 PMMPTE MmDebugPte = MiAddressToPte(MI_DEBUG_MAPPING);
diff --git a/reactos/ntoskrnl/mm/ARM3/sysldr.c b/reactos/ntoskrnl/mm/ARM3/sysldr.c
index 2c4a09cfd3a..ef1a8cf265f 100644
--- a/reactos/ntoskrnl/mm/ARM3/sysldr.c
+++ b/reactos/ntoskrnl/mm/ARM3/sysldr.c
@@ -1,7 +1,7 @@
 /*
 * PROJECT:         ReactOS Kernel
-* LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            ntoskrnl/mm/sysldr.c
+* LICENSE:         BSD - See COPYING.ARM in the top level directory
+* FILE:            ntoskrnl/mm/ARM3/sysldr.c
 * PURPOSE:         Contains the Kernel Loader (SYSLDR) for loading PE files.
 * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
 *                  ReactOS Portable Systems Group
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 68ad293fe9d..c89b9c97683 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -397,6 +397,7 @@
 			<file>iosup.c</file>
 			<file>largepag.c</file>
 			<file>mdlsup.c</file>
+			<file>mmdbg.c</file>
 			<file>mminit.c</file>
 			<file>mmsup.c</file>
 			<file>ncache.c</file>
@@ -412,9 +413,6 @@
 		<file>balance.c</file>
 		<file>freelist.c</file>
 		<file>marea.c</file>
-		<if property="_WINKD_" value ="1">
-			<file>mmdbg.c</file>
-		</if>
 		<file>mmfault.c</file>
 		<file>mminit.c</file>
 		<file>mpw.c</file>