Index: sd.c
===================================================================
--- sd.c	(revision 20216)
+++ sd.c	(working copy)
@@ -425,8 +425,8 @@
  * @implemented
  */
 NTSTATUS NTAPI
-RtlMakeSelfRelativeSD(PISECURITY_DESCRIPTOR AbsSD,
-		      PISECURITY_DESCRIPTOR_RELATIVE RelSD,
+RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR _AbsSD,
+		      PSECURITY_DESCRIPTOR _RelSD,
 		      PULONG BufferLength)
 {
    PSID Owner;
@@ -439,6 +439,8 @@
    ULONG DaclLength;
    ULONG TotalLength;
    ULONG_PTR Current;
+   PISECURITY_DESCRIPTOR AbsSD = (PISECURITY_DESCRIPTOR)_AbsSD;
+   PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)_RelSD;
 
    PAGED_CODE_RTL();
 
@@ -511,8 +513,8 @@
  * @implemented
  */
 NTSTATUS NTAPI
-RtlAbsoluteToSelfRelativeSD(PISECURITY_DESCRIPTOR AbsSD,
-                            PISECURITY_DESCRIPTOR RelSD,
+RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD,
+                            PSECURITY_DESCRIPTOR RelSD,
                             PULONG BufferLength)
 {
    PAGED_CODE_RTL();
@@ -522,7 +524,7 @@
       return STATUS_BAD_DESCRIPTOR_FORMAT;
    }
 
-   return RtlMakeSelfRelativeSD(AbsSD, (PISECURITY_DESCRIPTOR_RELATIVE)RelSD, BufferLength);
+   return RtlMakeSelfRelativeSD(AbsSD, RelSD, BufferLength);
 }