diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c
index 611bbc4bb58..d3f7338beb9 100644
--- a/dlls/advpack/tests/files.c
+++ b/dlls/advpack/tests/files.c
@@ -189,12 +189,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG  cbPrevCab, void *pv)
     return TRUE;
 }
 
-static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
+static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
 {
     return 0;
 }
 
-static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile,
+static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile,
                              BOOL fContinuation, void *pv)
 {
     return 0;
@@ -256,7 +256,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv)
     return 0;
 }
 
-static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD ret;
diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c
index b6b3cbba96f..c0a0c92ad87 100644
--- a/dlls/cabinet/tests/extract.c
+++ b/dlls/cabinet/tests/extract.c
@@ -126,12 +126,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG  cbPrevCab, void *pv)
     return TRUE;
 }
 
-static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
+static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
 {
     return 0;
 }
 
-static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile,
+static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile,
                              BOOL fContinuation, void *pv)
 {
     return 0;
@@ -193,7 +193,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv)
     return 0;
 }
 
-static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD ret;
diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c
index 058172f4fe9..c38fee36be0 100644
--- a/dlls/cabinet/tests/fdi.c
+++ b/dlls/cabinet/tests/fdi.c
@@ -330,12 +330,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG  cbPrevCab, void *pv)
     return TRUE;
 }
 
-static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
+static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
 {
     return 0;
 }
 
-static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile,
+static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile,
                              BOOL fContinuation, void *pv)
 {
     return 0;
@@ -397,7 +397,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv)
     return 0;
 }
 
-static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD ret;
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 6d1f308c99a..dd5dc293b02 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -1227,12 +1227,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG  cbPrevCab, void *pv)
     return TRUE;
 }
 
-static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
+static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
 {
     return 0;
 }
 
-static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile,
+static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile,
                              BOOL fContinuation, void *pv)
 {
     return 0;
@@ -1294,7 +1294,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv)
     return 0;
 }
 
-static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD ret;
diff --git a/include/fci.h b/include/fci.h
index 6ac95fa00c4..5ef6c7e87a4 100644
--- a/include/fci.h
+++ b/include/fci.h
@@ -34,10 +34,10 @@ extern "C" {
  * Common FCI/TDI declarations
  */
 
-typedef unsigned long CHECKSUM;
+typedef ULONG CHECKSUM;
 
-typedef unsigned long UOFF;
-typedef unsigned long COFF;
+typedef ULONG UOFF;
+typedef ULONG COFF;
 
 /**********************************************************************/
 
@@ -181,8 +181,8 @@ typedef UINT (__cdecl *PFNFCIWRITE)(INT_PTR hf, void *memory, UINT cb, int *err,
 typedef int  (__cdecl *PFNFCICLOSE)(INT_PTR hf, int *err, void *pv);
 #define FNFCICLOSE(fn) int __cdecl fn(INT_PTR hf, int *err, void *pv)
 
-typedef long (__cdecl *PFNFCISEEK) (INT_PTR hf, long dist, int seektype, int *err, void *pv);
-#define FNFCISEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+typedef LONG (__cdecl *PFNFCISEEK) (INT_PTR hf, LONG dist, int seektype, int *err, void *pv);
+#define FNFCISEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
 
 typedef int  (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv);
 #define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv)
@@ -194,12 +194,12 @@ typedef BOOL (__cdecl *PFNFCIGETNEXTCABINET)(PCCAB pccab, ULONG  cbPrevCab, void
 
 typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab,
 					char *pszFile,
-					long  cbFile,
+					LONG  cbFile,
 					BOOL  fContinuation,
 					void *pv);
 #define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \
 					   char *pszFile, \
-					   long  cbFile, \
+                                           LONG  cbFile, \
 					   BOOL  fContinuation, \
 					   void *pv)
 
@@ -220,11 +220,11 @@ typedef INT_PTR (__cdecl *PFNFCIGETOPENINFO)(char *pszName,
 #define statusFolder   1  /* Add Folder to Cabinet callback */
 #define statusCabinet  2  /* Write out a completed cabinet callback */
 
-typedef long (__cdecl *PFNFCISTATUS)(UINT typeStatus,
+typedef LONG (__cdecl *PFNFCISTATUS)(UINT typeStatus,
 				     ULONG cb1,
 				     ULONG cb2,
 				     void *pv);
-#define FNFCISTATUS(fn) long __cdecl fn(UINT typeStatus, \
+#define FNFCISTATUS(fn) LONG __cdecl fn(UINT typeStatus, \
 					ULONG  cb1, \
 					ULONG  cb2, \
 					void *pv)