diff --git a/include/mscat.h b/include/mscat.h
index 947b4e109c6..209445bda84 100644
--- a/include/mscat.h
+++ b/include/mscat.h
@@ -27,6 +27,8 @@ extern "C" {
 #endif
 
 BOOL      WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
+BOOL      WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
+BOOL      WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
 
 #ifdef __cplusplus
 }
diff --git a/include/odbcinst.h b/include/odbcinst.h
index f29617202db..aeef3749856 100644
--- a/include/odbcinst.h
+++ b/include/odbcinst.h
@@ -32,6 +32,8 @@ BOOL WINAPI SQLConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
 BOOL WINAPI SQLConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
 BOOL WINAPI SQLCreateDataSource(HWND,LPCSTR);
 BOOL WINAPI SQLCreateDataSourceW(HWND,LPCWSTR);
+BOOL WINAPI SQLGetAvailableDrivers(LPCSTR,LPSTR,WORD,WORD*);
+BOOL WINAPI SQLGetAvailableDriversW(LPCWSTR,LPWSTR,WORD,WORD*);
 BOOL WINAPI SQLGetConfigMode(UWORD*);
 BOOL WINAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*);
 BOOL WINAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*);
@@ -39,12 +41,16 @@ int WINAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,int,LPCSTR);
 int WINAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR);
 BOOL WINAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*);
 BOOL WINAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*);
+BOOL WINAPI SQLInstallDriver(LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
+BOOL WINAPI SQLInstallDriverW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
 BOOL WINAPI SQLInstallDriverEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
 BOOL WINAPI SQLInstallDriverExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
 BOOL WINAPI SQLInstallDriverManager(LPSTR,WORD,WORD*);
 BOOL WINAPI SQLInstallDriverManagerW(LPWSTR,WORD,WORD*);
 SQLRETURN WINAPI SQLInstallerError(WORD,DWORD*,LPSTR,WORD,WORD*);
 SQLRETURN WINAPI SQLInstallerErrorW(WORD,DWORD*,LPWSTR,WORD,WORD*);
+BOOL WINAPI SQLInstallODBC(HWND,LPCSTR,LPCSTR,LPCSTR);
+BOOL WINAPI SQLInstallODBCW(HWND,LPCWSTR,LPCWSTR,LPCWSTR);
 BOOL WINAPI SQLInstallTranslatorEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
 BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
 BOOL WINAPI SQLInstallTranslator(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
diff --git a/include/winspool.h b/include/winspool.h
index faa3ce8d81b..e9f9b33018b 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -890,6 +890,12 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo);
 BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD Level, LPBYTE pDriverInfo);
 #define AddPrinterDriver WINELIB_NAME_AW(AddPrinterDriver)
 
+BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo,
+                                DWORD dwFileCopyFlags);
+BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD Level, LPBYTE pDriverInfo,
+                                DWORD dwFileCopyFlags);
+#define AddPrinterDriverEx WINELIB_NAME_AW(AddPrinterDriverEx)
+
 BOOL WINAPI EnumPrinterDriversA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
 				LPBYTE pDriverInfo, DWORD cbBuf,
 				LPDWORD pcbNeeded, LPDWORD pcbReturned);
@@ -908,6 +914,12 @@ BOOL WINAPI DeletePrinterDriverW(LPWSTR pName, LPWSTR pEnvironment,
 				 LPWSTR pDriverName);
 #define DeletePrinterDriver WINELIB_NAME_AW(DeletePrinterDriver)
 
+BOOL WINAPI DeletePrinterDriverExA(LPSTR pName, LPSTR pEnvironment,
+                                   LPSTR pDriverName, DWORD dwDeleteFlag, DWORD dwVersionFlag);
+BOOL WINAPI DeletePrinterDriverExW(LPWSTR pName, LPWSTR pEnvironment,
+                                   LPWSTR pDriverName, DWORD dwDeleteFlag, DWORD dwVersionFlag);
+#define DeletePrinterDriverEx WINELIB_NAME_AW(DeletePrinterDriverEx)
+
 BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment,
 			       LPSTR pPathName, LPSTR pPrintProcessorName);
 BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment,
@@ -998,6 +1010,12 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
 			       LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded);
 #define GetPrinterDataEx WINELIB_NAME_AW(GetPrinterDataEx)
 
+DWORD WINAPI DeletePrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
+                                  LPCSTR pValueName);
+DWORD WINAPI DeletePrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
+                                  LPCWSTR pValueName);
+#define DeletePrinterDataEx WINELIB_NAME_AW(DeletePrinterDataEx)
+
 DWORD WINAPI SetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, DWORD Type,
 			     LPBYTE pData, DWORD cbData);
 DWORD WINAPI SetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, DWORD Type,