diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index be92b6f6c97..b7e55edea65 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -3850,7 +3850,7 @@ static UINT ACTION_ForceReboot(MSIPACKAGE *package)
     return ERROR_INSTALL_SUSPEND;
 }
 
-UINT ACTION_ResolveSource(MSIPACKAGE* package)
+static UINT ACTION_ResolveSource(MSIPACKAGE* package)
 {
     DWORD attrib;
     UINT rc;
diff --git a/dlls/msi/action.h b/dlls/msi/action.h
index d58bc52ed6e..9dc19ac0c71 100644
--- a/dlls/msi/action.h
+++ b/dlls/msi/action.h
@@ -289,6 +289,7 @@ extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR);
 extern BOOL check_unique_action(MSIPACKAGE *, LPCWSTR);
 extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... );
 extern UINT msi_create_component_directories( MSIPACKAGE *package );
+extern void msi_ui_error( DWORD msg_id, DWORD type );
 
 
 /* control event stuff */
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index b93e68e78a6..dfebfceb5a0 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -120,7 +120,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti
 /* stores the CustomActionData before the action:
  *     [CustomActionData]Action
  */
-LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata)
+static LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata)
 {
     LPWSTR deferred;
     DWORD len;
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 5f9f4d879ee..4e33da7bab9 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -58,8 +58,6 @@ extern const WCHAR szRemoveFiles[];
 
 static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0};
 
-extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename );
-
 /*
  * This is a helper function for handling embedded cabinet media
  */
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c
index 868d737bd61..5ba6b8ade7e 100644
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -426,7 +426,7 @@ static void free_feature( MSIFEATURE *feature )
     msi_free( feature );
 }
 
-void free_extension( MSIEXTENSION *ext )
+static void free_extension( MSIEXTENSION *ext )
 {
     struct list *item, *cursor;
 
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 39db1f62007..66b6f3c59f8 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -150,8 +150,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz )
 /***********************************************************************
  * MsiGetTargetPath   (internal)
  */
-UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
-                               awstring *szPathBuf, DWORD* pcchPathBuf )
+static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
+                                      awstring *szPathBuf, DWORD* pcchPathBuf )
 {
     MSIPACKAGE *package;
     LPWSTR path;
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 662f9ead2a0..79615ff5ac0 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -431,8 +431,8 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer)
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
-                               awstring *szValue, DWORD *pcchValueBuf)
+static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
+                                      awstring *szValue, DWORD *pcchValueBuf)
 {
     UINT r;
     HKEY hkey;
@@ -960,8 +960,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage )
     return r;
 }
 
-INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
-                                         awstring* lpPathBuf, DWORD* pcchBuf)
+static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
+                                                awstring* lpPathBuf, DWORD* pcchBuf)
 {
     WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE];
     UINT rc;
@@ -1409,7 +1409,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature )
 /***********************************************************************
  * MSI_ProvideQualifiedComponentEx [internal]
  */
-UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent,
+static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent,
                 LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct,
                 DWORD Unused1, DWORD Unused2, awstring *lpPathBuf,
                 DWORD* pcchPathBuf)
@@ -1534,7 +1534,7 @@ UINT WINAPI MsiProvideQualifiedComponentA( LPCSTR szComponent,
 /***********************************************************************
  * MSI_GetUserInfo [internal]
  */
-USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct,
+static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct,
                 awstring *lpUserNameBuf, DWORD* pcchUserNameBuf,
                 awstring *lpOrgNameBuf, DWORD* pcchOrgNameBuf,
                 awstring *lpSerialBuf, DWORD* pcchSerialBuf)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 8b9eabb899b..8ea81e503a8 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -416,6 +416,7 @@ extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
 extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
 extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
 extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE );
+extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename );
 
 /* for deformating */
 extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * );
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index b9f4bb57d7a..5959128881f 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -47,8 +47,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
-extern void msi_ui_error( DWORD msg_id, DWORD type );
-
 static void msi_free_properties( MSIPACKAGE *package );
 
 static void MSI_FreePackage( MSIOBJECTHDR *arg)
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c
index b246f5fbb17..5ad5059714f 100644
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -855,7 +855,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
     return r;
 }
 
-UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
+static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
                 awstring *lpQualBuf, DWORD* pcchQual,
                 awstring *lpAppBuf, DWORD* pcchAppBuf )
 {
diff --git a/dlls/msi/select.c b/dlls/msi/select.c
index d47792b225f..c9611305fb0 100644
--- a/dlls/msi/select.c
+++ b/dlls/msi/select.c
@@ -285,7 +285,7 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name )
     return ERROR_SUCCESS;
 }
 
-int select_count_columns( column_info *col )
+static int select_count_columns( column_info *col )
 {
     int n;
     for (n = 0; col; col = col->next)