diff --git a/include/dbs.idl b/include/dbs.idl
index fd04f7b1ae0..f664518ca37 100644
--- a/include/dbs.idl
+++ b/include/dbs.idl
@@ -501,22 +501,20 @@ enum DBPROPENUM26 {
 cpp_quote("#ifdef DBINITCONSTANTS")
 cpp_quote("#ifdef __cplusplus")
 cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")
-cpp_quote("        EXTERN_C const GUID name DECLSPEC_HIDDEN;     \\")
-cpp_quote("        EXTERN_C const GUID name =                    \\")
+cpp_quote("        EXTERN_C const GUID name = \\")
 cpp_quote("	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }")
 cpp_quote("#else")
 cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")
-cpp_quote("        const GUID name DECLSPEC_HIDDEN;      \\")
-cpp_quote("        const GUID name =                             \\")
+cpp_quote("        const GUID name = \\")
 cpp_quote("	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }")
 cpp_quote("#endif")
 cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\")
-cpp_quote(" const DBID name  = { {dbguid}, kind, {(LPOLESTR)val} };")
+cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} }")
 cpp_quote("#else")
 cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")
-cpp_quote("    EXTERN_C const GUID name DECLSPEC_HIDDEN")
+cpp_quote("    EXTERN_C const GUID name")
 cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\")
-cpp_quote("    EXTERN_C const DBID name;")
+cpp_quote("    EXTERN_C const DBID name")
 cpp_quote("#endif")
 
 cpp_quote("#define DBCIDGUID               {0x0c733a81, 0x2a1c, 0x11ce, {0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d}}")
@@ -544,10 +542,10 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL,        0xc8b522c7, 0x5cf3, 0x11ce
 cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL,         0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")
 cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")
 
-cpp_quote("DEFINE_DBID(DB_NULLID,               DB_NULLGUID, 0,                   0)")
-cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID,   DBKIND_GUID_PROPID, 10)")
-cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME,  DBCIDGUID,   DBKIND_GUID_PROPID, 11)")
-cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN,      DBCIDGUID,   DBKIND_GUID_PROPID, 41)")
+cpp_quote("DEFINE_DBID(DB_NULLID,               DB_NULLGUID, 0,                   0);")
+cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID,   DBKIND_GUID_PROPID, 10);")
+cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME,  DBCIDGUID,   DBKIND_GUID_PROPID, 11);")
+cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN,      DBCIDGUID,   DBKIND_GUID_PROPID, 41);")
 
 cpp_quote("#define DBPROMPT_PROMPT              0x01")
 cpp_quote("#define DBPROMPT_COMPLETE            0x02")
diff --git a/include/devpropdef.h b/include/devpropdef.h
index 2b0b7f4a849..94046f5bce0 100644
--- a/include/devpropdef.h
+++ b/include/devpropdef.h
@@ -82,18 +82,16 @@ typedef struct _DEVPROPKEY {
 #ifdef INITGUID
 #ifdef __cplusplus
 #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-        EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN; \
         EXTERN_C const DEVPROPKEY DECLSPEC_SELECTANY name = \
         { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
 #else
 #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-        extern const DEVPROPKEY name DECLSPEC_HIDDEN; \
         const DEVPROPKEY DECLSPEC_SELECTANY name = \
         { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
 #endif
 #else
 #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-    EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN
+    EXTERN_C const DEVPROPKEY name
 #endif
 
 #ifndef IsEqualDevPropKey
diff --git a/include/guiddef.h b/include/guiddef.h
index 6f7e26df0c6..c5ba9635b89 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -89,29 +89,19 @@ extern "C++" {
 
 #undef DEFINE_GUID
 
-#ifndef DECLSPEC_HIDDEN
-# if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-#  define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))
-# else
-#  define DECLSPEC_HIDDEN
-# endif
-#endif
-
 #ifdef INITGUID
 #ifdef __cplusplus
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        EXTERN_C const GUID name DECLSPEC_HIDDEN; \
         EXTERN_C const GUID name = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #else
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        const GUID name DECLSPEC_HIDDEN; \
         const GUID name = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #endif
 #else
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const GUID name DECLSPEC_HIDDEN
+    EXTERN_C const GUID name
 #endif
 
 #define DEFINE_OLEGUID(name, l, w1, w2) \
diff --git a/include/knownfolders.h b/include/knownfolders.h
index 1b0bb7f3c47..ca85ef04c04 100644
--- a/include/knownfolders.h
+++ b/include/knownfolders.h
@@ -26,18 +26,16 @@
 #ifdef INITGUID
 #ifdef __cplusplus
 #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        EXTERN_C const GUID name DECLSPEC_HIDDEN; \
         EXTERN_C const GUID name = \
     { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #else
 #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        const GUID name DECLSPEC_HIDDEN; \
         const GUID name = \
     { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #endif
 #else
 #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const GUID name DECLSPEC_HIDDEN
+    EXTERN_C const GUID name
 #endif
 
 DEFINE_KNOWN_FOLDER(FOLDERID_AccountPictures,       0x008ca0b1, 0x55b4, 0x4c56, 0xb8, 0xa8, 0x4d, 0xe4, 0xb2, 0x99, 0xd3, 0xbe);
diff --git a/include/netiodef.h b/include/netiodef.h
index 658dd235db0..0d0d316b8eb 100644
--- a/include/netiodef.h
+++ b/include/netiodef.h
@@ -60,18 +60,16 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI
 #ifdef __WINE_INIT_NPI_MODULEID
 #ifdef __cplusplus
 #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN;                   \
-    EXTERN_C const NPI_MODULEID name =                                  \
+    EXTERN_C const NPI_MODULEID name = \
     { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } } } }
 #else
 #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    const NPI_MODULEID name DECLSPEC_HIDDEN;                            \
-    const NPI_MODULEID name =                                           \
+    const NPI_MODULEID name = \
     { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } } } }
 #endif
 #else /* __WINE_INIT_MODULEID */
 #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN
+    EXTERN_C const NPI_MODULEID name
 #endif /* __WINE_INIT_MODULEID */
 
 #define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \
diff --git a/include/propkeydef.h b/include/propkeydef.h
index 189af7faa26..fb3902ae35f 100644
--- a/include/propkeydef.h
+++ b/include/propkeydef.h
@@ -33,16 +33,16 @@
 #ifdef INITGUID
 #ifdef __cplusplus
 #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-        EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \
+        EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name = \
         { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
 #else
 #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-        const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \
+        const PROPERTYKEY DECLSPEC_SELECTANY name = \
         { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
 #endif
 #else
 #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
-    EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN
+    EXTERN_C const PROPERTYKEY name
 #endif
 
 #ifndef IsEqualPropertyKey
diff --git a/include/rpcndr.h b/include/rpcndr.h
index 2d836726a15..4e2a4e1ddb6 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -40,7 +40,6 @@ extern "C" {
 #ifndef EXTERN_GUID
 #ifdef __cplusplus
 #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \
         EXTERN_C const GUID DECLSPEC_SELECTANY name = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #else
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index 98c9430fdcb..8d4ab259af5 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -242,11 +242,10 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \
 /* define PROXY_CLSID_IS to specify the CLSID data of the PSFactoryBuffer */
 /* define neither to use the GUID of the first interface */
 #ifdef PROXY_CLSID
-# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID DECLSPEC_HIDDEN;
+# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID;
 #else
 # ifdef PROXY_CLSID_IS
-#  define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; \
-    const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS;
+#  define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS;
 #  define PROXY_CLSID CLSID_PSFactoryBuffer
 # else
 #  define CLSID_PSFACTORYBUFFER