diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c
index 120d7be6df1..995a1df1d89 100644
--- a/reactos/hal/hal/hal.c
+++ b/reactos/hal/hal/hal.c
@@ -297,8 +297,8 @@ BOOLEAN
 NTAPI
 HalGetEnvironmentVariable(
   PCH Name,
-  PCH Value,
-  USHORT ValueLength)
+  USHORT ValueLength,
+  PCH Value)
 {
   UNIMPLEMENTED;
 
@@ -325,7 +325,7 @@ HalGetInterruptVector(
 VOID
 NTAPI
 HalHandleNMI(
-  ULONG Unused)
+  PVOID NmiData)
 {
   UNIMPLEMENTED;
 }
@@ -393,12 +393,13 @@ HalQueryDisplayParameters(
 }
 
 
-VOID
+BOOLEAN
 NTAPI
 HalQueryRealTimeClock(
   PTIME_FIELDS Time)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 
diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 8e8f89f3c8a..5d92865d254 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -30,6 +30,7 @@
 
 #include "ntddk.h"
 
+#define _NTIFS_INCLUDED_
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2948,13 +2949,6 @@ HalDisplayString (
     IN PCHAR String
 );
 
-NTHALAPI
-VOID
-NTAPI
-HalQueryRealTimeClock (
-    IN OUT PTIME_FIELDS TimeFields
-);
-
 NTHALAPI
 VOID
 NTAPI
diff --git a/reactos/include/winbase.h b/reactos/include/winbase.h
index 59ca26111b5..0e2272704dc 100644
--- a/reactos/include/winbase.h
+++ b/reactos/include/winbase.h
@@ -925,6 +925,8 @@ typedef struct _MEMORYSTATUSEX {
 	DWORDLONG ullAvailExtendedVirtual;
 } MEMORYSTATUSEX, *LPMEMORYSTATUSEX;
 #endif
+#ifndef _LDT_ENTRY_DEFINED
+#define _LDT_ENTRY_DEFINED
 typedef struct _LDT_ENTRY {
 	WORD LimitLow;
 	WORD BaseLow;
@@ -949,6 +951,7 @@ typedef struct _LDT_ENTRY {
 		} Bits;
 	} HighWord;
 } LDT_ENTRY,*PLDT_ENTRY,*LPLDT_ENTRY;
+#endif
 typedef struct _PROCESS_HEAP_ENTRY {
 	PVOID lpData;
 	DWORD cbData;
diff --git a/reactos/include/winnt.h b/reactos/include/winnt.h
index bc8359e27b9..bfaab02e6ef 100644
--- a/reactos/include/winnt.h
+++ b/reactos/include/winnt.h
@@ -906,7 +906,7 @@ typedef enum
 #define HEAP_TAIL_CHECKING_ENABLED 32
 #define HEAP_FREE_CHECKING_ENABLED 64
 #define HEAP_DISABLE_COALESCE_ON_FREE 128
-#define HEAP_CREATE_ALIGN_16 0x0000
+#define HEAP_CREATE_ALIGN_16 0x10000
 #define HEAP_CREATE_ENABLE_TRACING 0x20000
 #define HEAP_MAXIMUM_TAG 0xFFF
 #define HEAP_PSEUDO_TAG_FLAG 0x8000
diff --git a/reactos/lib/rtl/crc32.c b/reactos/lib/rtl/crc32.c
index d207d002004..2874062247e 100644
--- a/reactos/lib/rtl/crc32.c
+++ b/reactos/lib/rtl/crc32.c
@@ -85,7 +85,7 @@ static const ULONG CrcTable[256] =
  * @implemented
  */
 ULONG NTAPI
-RtlComputeCrc32 (IN UINT Initial,
+RtlComputeCrc32 (IN USHORT Initial,
 		 IN PUCHAR Data,
 		 IN ULONG Length)
 {
diff --git a/reactos/lib/rtl/timezone.c b/reactos/lib/rtl/timezone.c
index c66f96bd64a..97db1950485 100644
--- a/reactos/lib/rtl/timezone.c
+++ b/reactos/lib/rtl/timezone.c
@@ -19,7 +19,7 @@
  * @implemented
  */
 NTSTATUS NTAPI
-RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation)
+RtlQueryTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation)
 {
    RTL_QUERY_REGISTRY_TABLE QueryTable[8];
    UNICODE_STRING StandardName;
@@ -83,7 +83,7 @@ RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation)
  * @implemented
  */
 NTSTATUS NTAPI
-RtlSetTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation)
+RtlSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation)
 {
    ULONG Length;
    NTSTATUS Status;
diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index dfdf5635f20..b9dc72c3e8e 100644
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -196,7 +196,7 @@ NtQuerySystemEnvironmentValue (IN	PUNICODE_STRING	VariableName,
     /*
      * Get the environment variable
      */
-    Result = HalGetEnvironmentVariable(AName.Buffer, Value, ValueBufferLength);
+    Result = HalGetEnvironmentVariable(AName.Buffer, ValueBufferLength, Value);
     if(!Result)
     {
       RtlFreeAnsiString(&AName);