diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h
index 52facd44792..f9c349c3e20 100644
--- a/dlls/combase/combase_private.h
+++ b/dlls/combase/combase_private.h
@@ -19,7 +19,7 @@
 
 #include "wine/list.h"
 
-extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
+extern HINSTANCE hProxyDll;
 
 struct apartment
 {
@@ -53,8 +53,8 @@ struct apartment
     struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */
 };
 
-HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN;
-HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN;
+HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, HKEY *subkey);
+HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey);
 
 /* DCOM messages used by the apartment window (not compatible with native) */
 #define DM_EXECUTERPC   (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */
@@ -109,30 +109,30 @@ static inline struct apartment* com_get_current_apt(void)
     return tlsdata->apt;
 }
 
-HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN;
-void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN;
-void apartment_global_cleanup(void) DECLSPEC_HIDDEN;
-OXID apartment_getoxid(const struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN;
+HWND apartment_getwindow(const struct apartment *apt);
+HRESULT apartment_createwindowifneeded(struct apartment *apt);
+void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay);
+void apartment_global_cleanup(void);
+OXID apartment_getoxid(const struct apartment *apt);
+HRESULT apartment_disconnectproxies(struct apartment *apt);
 
 /* RpcSs interface */
-HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN;
-HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN;
-HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie) DECLSPEC_HIDDEN;
-HRESULT rpc_revoke_local_server(unsigned int cookie) DECLSPEC_HIDDEN;
+HRESULT rpcss_get_next_seqid(DWORD *id);
+HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj);
+HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie);
+HRESULT rpc_revoke_local_server(unsigned int cookie);
 HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid,
-        DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN;
-HRESULT rpc_register_interface(REFIID riid) DECLSPEC_HIDDEN;
-void rpc_unregister_interface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN;
-HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN;
-void rpc_start_remoting(struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN;
-void rpc_unregister_channel_hooks(void) DECLSPEC_HIDDEN;
+        DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt);
+HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan);
+HRESULT rpc_register_interface(REFIID riid);
+void rpc_unregister_interface(REFIID riid, BOOL wait);
+HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info);
+void rpc_start_remoting(struct apartment *apt);
+HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook);
+void rpc_unregister_channel_hooks(void);
 
 struct dispatch_params;
-void rpc_execute_call(struct dispatch_params *params) DECLSPEC_HIDDEN;
+void rpc_execute_call(struct dispatch_params *params);
 
 enum class_reg_data_origin
 {
@@ -155,24 +155,24 @@ struct class_reg_data
     } u;
 };
 
-HRESULT enter_apartment(struct tlsdata *data, DWORD model) DECLSPEC_HIDDEN;
-void leave_apartment(struct tlsdata *data) DECLSPEC_HIDDEN;
-void apartment_release(struct apartment *apt) DECLSPEC_HIDDEN;
-struct apartment * apartment_get_current_or_mta(void) DECLSPEC_HIDDEN;
-HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN;
-void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN;
-struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN;
+HRESULT enter_apartment(struct tlsdata *data, DWORD model);
+void leave_apartment(struct tlsdata *data);
+void apartment_release(struct apartment *apt);
+struct apartment * apartment_get_current_or_mta(void);
+HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie);
+void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie);
+struct apartment * apartment_get_mta(void);
 HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata,
-        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv) DECLSPEC_HIDDEN;
-HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN;
+        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv);
+HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret);
 IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid,
-        DWORD clscontext) DECLSPEC_HIDDEN;
-void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN;
-struct apartment * apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN;
-struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN;
+        DWORD clscontext);
+void apartment_revoke_all_classes(const struct apartment *apt);
+struct apartment * apartment_findfromoxid(OXID oxid);
+struct apartment * apartment_findfromtid(DWORD tid);
 
 HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object,
-        DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN;
+        DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags);
 
 /* Stub Manager */
 
@@ -241,19 +241,19 @@ struct stub_manager
     BOOL              disconnected; /* CoDisconnectObject has been called (CS lock) */
 };
 
-ULONG stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN;
-struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN;
-void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN;
-ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN;
-ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN;
-struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN;
-void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN;
-BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN;
-BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN;
-struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN;
+ULONG stub_manager_int_release(struct stub_manager *stub_manager);
+struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc);
+void stub_manager_disconnect(struct stub_manager *m);
+ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak);
+ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases);
+struct stub_manager * get_stub_manager(struct apartment *apt, OID oid);
+void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak);
+BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid);
+BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid);
+struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags);
 struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context,
-    void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN;
+    void *dest_context_data, MSHLFLAGS flags);
 HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt,
         struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan,
-        IID *iid, IUnknown **iface) DECLSPEC_HIDDEN;
-HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN;
+        IID *iid, IUnknown **iface);
+HRESULT start_apartment_remote_unknown(struct apartment *apt);