diff --git a/include/devpropdef.h b/include/devpropdef.h
index 8db292c7d11..2b0b7f4a849 100644
--- a/include/devpropdef.h
+++ b/include/devpropdef.h
@@ -82,18 +82,18 @@ 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 DECLSPEC_SELECTANY; \
-        EXTERN_C const DEVPROPKEY name = \
+        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) \
-        const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \
-        const DEVPROPKEY name = \
+        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 DECLSPEC_SELECTANY
+    EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN
 #endif
 
 #ifndef IsEqualDevPropKey