diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h
index fc5ad1e22f0..9c68c791e17 100644
--- a/boot/freeldr/freeldr/include/fs.h
+++ b/boot/freeldr/freeldr/include/fs.h
@@ -26,7 +26,7 @@ typedef struct tagDEVVTBL
     ARC_OPEN Open;
     ARC_READ Read;
     ARC_SEEK Seek;
-    LPCWSTR ServiceName;
+    PCWSTR ServiceName;
 } DEVVTBL;
 
 #define MAX_FDS 60
@@ -43,7 +43,7 @@ ULONG FsGetNumPathParts(PCSTR Path);
 VOID  FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
 
 VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable);
-LPCWSTR FsGetServiceName(ULONG FileId);
+PCWSTR FsGetServiceName(ULONG FileId);
 VOID  FsSetDeviceSpecific(ULONG FileId, VOID* Specific);
 VOID* FsGetDeviceSpecific(ULONG FileId);
 ULONG FsGetDeviceId(ULONG FileId);
diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c
index b4e3113feca..4000b44bd10 100644
--- a/boot/freeldr/freeldr/lib/fs/fs.c
+++ b/boot/freeldr/freeldr/lib/fs/fs.c
@@ -385,7 +385,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable)
     InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry);
 }
 
-LPCWSTR FsGetServiceName(ULONG FileId)
+PCWSTR FsGetServiceName(ULONG FileId)
 {
     if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
         return NULL;
diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h
index ede9b6423c7..0471775304c 100644
--- a/boot/freeldr/freeldr/ntldr/winldr.h
+++ b/boot/freeldr/freeldr/ntldr/winldr.h
@@ -112,7 +112,7 @@ WinLdrInitSystemHive(
     IN BOOLEAN Setup);
 
 BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
-                             IN PCSTR DirectoryPath);
+                             IN PCSTR SystemRoot);
 
 // winldr.c
 VOID
@@ -129,9 +129,9 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
                   IN PCSTR LanguageFileName);
 BOOLEAN
 WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
-                      LPWSTR RegistryPath,
-                      LPWSTR ImagePath,
-                      LPWSTR ServiceName);
+                      PWSTR RegistryPath,
+                      PWSTR ImagePath,
+                      PWSTR ServiceName);
 
 VOID
 WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock);
diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c
index e5c36352d4c..1e39ec78961 100644
--- a/boot/freeldr/freeldr/ntldr/wlregistry.c
+++ b/boot/freeldr/freeldr/ntldr/wlregistry.c
@@ -106,7 +106,7 @@ WinLdrLoadSystemHive(
         Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
                                         L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
                                         NULL,
-                                        (LPWSTR)FsService);
+                                        (PWSTR)FsService);
         if (!Success)
             TRACE(" Failed to add filesystem service\n");
     }
@@ -490,13 +490,13 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead,
 {
     LONG rc = 0;
     HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey;
-    LPWSTR GroupNameBuffer;
+    PWSTR GroupNameBuffer;
     WCHAR ServiceName[256];
     ULONG OrderList[128];
     ULONG BufferSize;
     ULONG Index;
     ULONG TagIndex;
-    LPWSTR GroupName;
+    PWSTR GroupName;
 
     ULONG ValueSize;
     ULONG ValueType;
@@ -773,9 +773,9 @@ InsertInBootDriverList(
 
 BOOLEAN
 WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
-                      LPWSTR RegistryPath,
-                      LPWSTR ImagePath,
-                      LPWSTR ServiceName)
+                      PWSTR RegistryPath,
+                      PWSTR ImagePath,
+                      PWSTR ServiceName)
 {
     PBOOT_DRIVER_LIST_ENTRY BootDriverEntry;
     NTSTATUS Status;