diff --git a/include/Makefile.in b/include/Makefile.in
index bf3c549fb19..827d25e53cf 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -388,6 +388,7 @@ SRCDIR_INCLUDES = \
 	poppack.h \
 	powrprof.h \
 	profinfo.h \
+	propkeydef.h \
 	propvarutil.h \
 	prsht.h \
 	psapi.h \
diff --git a/include/propkeydef.h b/include/propkeydef.h
new file mode 100644
index 00000000000..8507ddbabc3
--- /dev/null
+++ b/include/propkeydef.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2009 Maarten Lankhorst
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef PID_FIRST_USABLE
+#define PID_FIRST_USABLE 2
+#endif
+
+#ifndef REFPROPERTYKEY
+#ifdef __cplusplus
+#define REFPROPERTYKEY const PROPERTYKEY &
+#else /*!__cplusplus*/
+#define REFPROPERTYKEY const PROPERTYKEY * __MIDL_CONST
+#endif
+#endif
+
+#undef DEFINE_PROPERTYKEY
+
+#ifdef INITGUID
+#ifdef __cplusplus
+#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
+        EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \
+        EXTERN_C const PROPERTYKEY 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 name DECLSPEC_HIDDEN DECLSPEC_ANY; \
+        const PROPERTYKEY 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 DECLSPEC_ANY
+#endif
+
+#ifndef IsEqualPropertyKey
+#define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid))
+#endif
+
+#ifndef _PROPERTYKEY_EQUALITY_OPERATORS_
+#define _PROPERTYKEY_EQUALITY_OPERATORS_
+#ifdef __cplusplus
+inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther)
+{
+    return IsEqualPropertyKey(guidOne, guidTwo);
+}
+inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther)
+{
+    return !(guidOne == guidOther);
+}
+#endif
+#endif