diff --git a/reactos/include/ddk/mmfuncs.h b/reactos/include/ddk/mmfuncs.h
index bd9d86be077..57135ab0bb7 100644
--- a/reactos/include/ddk/mmfuncs.h
+++ b/reactos/include/ddk/mmfuncs.h
@@ -36,7 +36,6 @@ BOOLEAN MmIsThisAnNtAsSystem(VOID);
  *          Size = Size of range
  * RETURNS: The number of pages
  */
-#if 0
 extern inline unsigned int ADDRESS_AND_SIZE_TO_SPAN_PAGES(PVOID Va,
 							  ULONG Size)
 {
@@ -47,7 +46,6 @@ extern inline unsigned int ADDRESS_AND_SIZE_TO_SPAN_PAGES(PVOID Va,
    LowestAddr = PAGE_ROUND_DOWN((ULONG)Va);
    return((HighestAddr - LowestAddr) / PAGESIZE);
 }
-#endif
 
 /*
  * FUNCTION: Returns FALSE is the pointer is NULL, TRUE otherwise
diff --git a/reactos/include/internal/i386/mmhal.h b/reactos/include/internal/i386/mmhal.h
index 1e52ae8ee52..32cb5860f74 100644
--- a/reactos/include/internal/i386/mmhal.h
+++ b/reactos/include/internal/i386/mmhal.h
@@ -5,8 +5,6 @@
 #ifndef __INTERNAL_HAL_I386_MMHAL_H
 #define __INTERNAL_HAL_I386_MMHAL_H
 
-#include <ddk/ntddk.h>
-
 #define PAGESIZE (4096)
 
 PULONG MmGetPageEntry(PVOID Address);
diff --git a/reactos/ntoskrnl/hal/x86/page.c b/reactos/ntoskrnl/hal/x86/page.c
index cf915799cff..f84d1c371f5 100644
--- a/reactos/ntoskrnl/hal/x86/page.c
+++ b/reactos/ntoskrnl/hal/x86/page.c
@@ -10,13 +10,13 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <internal/mmhal.h>
+#include <ddk/ntddk.h>
 #include <internal/mm.h>
+#include <internal/mmhal.h>
 #include <string.h>
 #include <internal/string.h>
 #include <internal/bitops.h>
 #include <internal/ex.h>
-#include <ddk/ntddk.h>
 
 #define NDEBUG
 #include <internal/debug.h>
diff --git a/reactos/ntoskrnl/io/mdl.c b/reactos/ntoskrnl/io/mdl.c
index 64e94af0e3d..65f39df9216 100644
--- a/reactos/ntoskrnl/io/mdl.c
+++ b/reactos/ntoskrnl/io/mdl.c
@@ -10,8 +10,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <internal/mmhal.h>
 #include <ddk/ntddk.h>
+#include <internal/mmhal.h>
 
 #include <internal/debug.h>
 
diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c
index 776a4d85808..65333c02ea2 100644
--- a/reactos/ntoskrnl/mm/freelist.c
+++ b/reactos/ntoskrnl/mm/freelist.c
@@ -12,12 +12,12 @@
 /* INCLUDES ****************************************************************/
 
 #include <internal/stddef.h>
-#include <internal/mmhal.h>
+#include <ddk/ntddk.h>
 #include <internal/mm.h>
+#include <internal/mmhal.h>
 #include <internal/ntoskrnl.h>
 #include <internal/bitops.h>
 #include <internal/i386/io.h>
-#include <ddk/ntddk.h>
 
 #define NDEBUG
 #include <internal/debug.h>