diff --git a/reactos/include/ndk/pofuncs.h b/reactos/include/ndk/pofuncs.h
index 413296fff14..12f0d7c9f6d 100644
--- a/reactos/include/ndk/pofuncs.h
+++ b/reactos/include/ndk/pofuncs.h
@@ -109,7 +109,7 @@ NTAPI
 NtCancelDeviceWakeupRequest(
     IN HANDLE Device
 );
-
+#endif
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -140,4 +140,3 @@ ZwSetSystemPowerState(
     IN ULONG Flags
 );
 #endif
-#endif
diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index ed37af715e6..667c83738cf 100644
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -38,9 +38,7 @@
 #define TEXT(s) L##s
 #include <regstr.h>
 #include <ntstrsafe.h>
-
-/* FIXME: Temporary until Winldr is used */
-#include <rosldr.h>
+#include <ntpoapi.h>
 
 /* C Headers */
 #include <stdlib.h>