Index: kernel/arch/amd64/include/arch/mm/page.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/page.h	(revision 06e0f37b2f97829f85d3054ff2902fab11f4ff9b)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision cd76bbd516f36017eb62c38e2de3aa95ee8c5650)
@@ -37,5 +37,4 @@
 
 #include <arch/mm/frame.h>
-#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -164,6 +163,7 @@
 #ifndef __ASSEMBLER__
 
+#include <arch/interrupt.h>
 #include <mm/mm.h>
-#include <arch/interrupt.h>
+#include <trace.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/page.h	(revision 06e0f37b2f97829f85d3054ff2902fab11f4ff9b)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision cd76bbd516f36017eb62c38e2de3aa95ee8c5650)
@@ -38,5 +38,4 @@
 #include <arch/mm/frame.h>
 #include <stdbool.h>
-#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -147,4 +146,5 @@
 #include <arch/interrupt.h>
 #include <stddef.h>
+#include <trace.h>
 
 /* Page fault error codes. */
Index: kernel/arch/ppc32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/page.h	(revision 06e0f37b2f97829f85d3054ff2902fab11f4ff9b)
+++ kernel/arch/ppc32/include/arch/mm/page.h	(revision cd76bbd516f36017eb62c38e2de3aa95ee8c5650)
@@ -37,5 +37,4 @@
 
 #include <arch/mm/frame.h>
-#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -150,4 +149,5 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
+#include <trace.h>
 
 /** Page Table Entry. */