diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index 6637ad7422c..5240ef84272 100644
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -31,28 +31,7 @@
 extern "C" {
 #endif
 
-#ifdef __GNUC__
-/* Available as intrinsics on MSVC */
-static __inline void _disable(void) {__asm__ __volatile__("cli\n");}
-static __inline void _enable(void)  {__asm__ __volatile__("sti\n");}
-
-
-static __inline ULONG64 __readcr3(void)
-{
-    ULONG_PTR Ret;
-    __asm__ __volatile__("movl %%cr3, %0;\n"
-        :"=r"(Ret));
-    return (ULONG64)Ret;
-}
-
-static __inline ULONG64 __readcr4(void)
-{
-    ULONG_PTR Ret;
-    __asm__ __volatile__("movl %%cr4, %0; \n"
-        :"=r"(Ret));
-    return (ULONG64)Ret;
-}
-#endif
+#include "intrin.h"
 
 /*
 ** Definitions specific to this Device Driver Kit
diff --git a/reactos/include/reactos/arc/arc.h b/reactos/include/reactos/arc/arc.h
index f656013585b..aada99ed16b 100644
--- a/reactos/include/reactos/arc/arc.h
+++ b/reactos/include/reactos/arc/arc.h
@@ -251,7 +251,7 @@ typedef struct _LOADER_PARAMETER_BLOCK
     LPSTR NtBootPathName;
     LPSTR NtHalPathName;
     LPSTR LoadOptions;
-    PNLS_DATA_BLOCK NlsData;
+    NLS_DATA_BLOCK NlsData;
     PARC_DISK_INFORMATION ArcDiskInformation;
     PVOID OemFontFile;
     struct _SETUP_LOADER_BLOCK *SetupLdrBlock;