diff --git a/reactos/base/setup/usetup/cabinet.h b/reactos/base/setup/usetup/cabinet.h
index c0964a0089a..1a7884fd924 100755
--- a/reactos/base/setup/usetup/cabinet.h
+++ b/reactos/base/setup/usetup/cabinet.h
@@ -88,7 +88,7 @@ typedef struct _CFFILE
   WORD  FileDate;         // File date stamp, as used by DOS
   WORD  FileTime;         // File time stamp, as used by DOS
   WORD  Attributes;       // File attributes (CAB_ATTRIB_*)
-  CHAR  FileName[];
+  CHAR  FileName[ANYSIZE_ARRAY];
     /* After this is the NULL terminated filename */
 } CFFILE, *PCFFILE;
 
diff --git a/reactos/base/setup/usetup/console.c b/reactos/base/setup/usetup/console.c
index dd765c7b02f..433e804dd00 100644
--- a/reactos/base/setup/usetup/console.c
+++ b/reactos/base/setup/usetup/console.c
@@ -147,7 +147,7 @@ ConWriteConsole(PCHAR Buffer,
  *	ReadConsoleA
  */
 BOOL
-STDCALL
+NTAPI
 ReadConsoleA(HANDLE hConsoleInput,
 			     LPVOID lpBuffer,
 			     DWORD nNumberOfCharsToRead,
diff --git a/reactos/base/setup/usetup/format.c b/reactos/base/setup/usetup/format.c
index 168ded4657d..af45b082eb5 100755
--- a/reactos/base/setup/usetup/format.c
+++ b/reactos/base/setup/usetup/format.c
@@ -36,7 +36,7 @@ PPROGRESSBAR ProgressBar = NULL;
 /* FUNCTIONS ****************************************************************/
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 FormatCallback (CALLBACKCOMMAND Command,
 		ULONG Modifier,
 		PVOID Argument)
diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c
index 653c4a4ead3..fa89ef50748 100644
--- a/reactos/base/setup/usetup/partlist.c
+++ b/reactos/base/setup/usetup/partlist.c
@@ -422,7 +422,7 @@ ScanForUnpartitionedDiskSpace (PDISKENTRY DiskEntry)
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 DiskIdentifierQueryRoutine(PWSTR ValueName,
                            ULONG ValueType,
                            PVOID ValueData,
@@ -449,7 +449,7 @@ DiskIdentifierQueryRoutine(PWSTR ValueName,
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 DiskConfigurationDataQueryRoutine(PWSTR ValueName,
                                   ULONG ValueType,
                                   PVOID ValueData,
@@ -485,7 +485,7 @@ DiskConfigurationDataQueryRoutine(PWSTR ValueName,
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 SystemConfigurationDataQueryRoutine(PWSTR ValueName,
                                     ULONG ValueType,
                                     PVOID ValueData,
diff --git a/reactos/base/setup/usetup/usetup.c b/reactos/base/setup/usetup/usetup.c
index 21925228e3e..fc419d8f231 100644
--- a/reactos/base/setup/usetup/usetup.c
+++ b/reactos/base/setup/usetup/usetup.c
@@ -3630,7 +3630,7 @@ SignalInitEvent()
 }
 
 
-VOID STDCALL
+VOID NTAPI
 NtProcessStartup(PPEB Peb)
 {
   NTSTATUS Status;