diff --git a/reactos/boot/freeldr/freeldr.rbuild b/reactos/boot/freeldr/freeldr.rbuild
index a21fea7f88d..422cd3cc1df 100644
--- a/reactos/boot/freeldr/freeldr.rbuild
+++ b/reactos/boot/freeldr/freeldr.rbuild
@@ -10,8 +10,18 @@
 		<xi:include href="freeldr/freeldr_base.rbuild" />
 		<xi:include href="freeldr/freeldr_arch.rbuild" />
 		<xi:include href="freeldr/freeldr_main.rbuild" />
-		<xi:include href="freeldr/setupldr_main.rbuild" />
 		<xi:include href="freeldr/freeldr.rbuild" />
-		<xi:include href="freeldr/setupldr.rbuild" />
+		<if property="ARCH" value="i386">
+		    <xi:include href="freeldr/setupldr_main.rbuild" />
+		    <xi:include href="freeldr/setupldr.rbuild" />		
+		</if>
+		<if property="ARCH" value="ppc">
+		    <xi:include href="freeldr/setupldr_main.rbuild" />
+		    <xi:include href="freeldr/setupldr.rbuild" />		
+		</if>
+		<if property="ARCH" value="amd64">
+		    <xi:include href="freeldr/setupldr_main.rbuild" />
+		    <xi:include href="freeldr/setupldr.rbuild" />		
+		</if>
 	</directory>
 </group>
diff --git a/reactos/include/reactos/arm/armddk.h b/reactos/include/reactos/arm/armddk.h
index 54bfa15c71a..68262c2b9d7 100644
--- a/reactos/include/reactos/arm/armddk.h
+++ b/reactos/include/reactos/arm/armddk.h
@@ -122,9 +122,7 @@ typedef struct _CONTEXT {
 // Processor Control Region
 //
 #ifdef _WINNT_H
-typedef
-VOID
-(*PKINTERRUPT_ROUTINE)(VOID);
+#define KIRQL ULONG
 #endif
 typedef struct _KPCR
 {
diff --git a/reactos/ntoskrnl/include/internal/arm/mm.h b/reactos/ntoskrnl/include/internal/arm/mm.h
index 4266f09c40e..26fa9e6e8c8 100644
--- a/reactos/ntoskrnl/include/internal/arm/mm.h
+++ b/reactos/ntoskrnl/include/internal/arm/mm.h
@@ -111,12 +111,12 @@ PULONG MmGetPageDirectory(VOID);
 
 #define MI_MAKE_LOCAL_PAGE(x)      ((x)->u.Hard.NonGlobal = 1)
 #define MI_MAKE_DIRTY_PAGE(x)      
-#define MI_MAKE_OWNER_PAGE(x)      ((x)->u.Hard.Access = 1) // FIXFIX
-#define MI_MAKE_WRITE_PAGE(x)      ((x)->u.Hard.ExtendedAccess = 1) // FIXFIX
+#define MI_MAKE_OWNER_PAGE(x)      ((x)->u.Hard.Owner = 1)
+#define MI_MAKE_WRITE_PAGE(x)      ((x)->u.Hard.ReadOnly = 0)
 #define MI_PAGE_DISABLE_CACHE(x)   ((x)->u.Hard.Cached = 0)
 #define MI_PAGE_WRITE_THROUGH(x)   ((x)->u.Hard.Buffered = 0)
 #define MI_PAGE_WRITE_COMBINED(x)  ((x)->u.Hard.Buffered = 1)
-#define MI_IS_PAGE_WRITEABLE(x)    ((x)->u.Hard.ExtendedAccess == 0)
+#define MI_IS_PAGE_WRITEABLE(x)    ((x)->u.Hard.ReadOnly == 0)
 #define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE
 #define MI_IS_PAGE_DIRTY(x)        TRUE