diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index da186109f8..95b5fe86fe 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -38,15 +38,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
-extern const GUID CLSID_PSOAInterface;
-
-extern const GUID CLSID_PSDispatch;
-extern const GUID CLSID_PSEnumVariant;
-extern const GUID CLSID_PSTypeInfo;
-extern const GUID CLSID_PSTypeLib;
-extern const GUID CLSID_PSTypeComp;
-
 static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */
 
 HMODULE OLEAUT32_hModule = NULL;
diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c
index 2437967690..1fd61d744a 100644
--- a/dlls/oleaut32/regsvr.c
+++ b/dlls/oleaut32/regsvr.c
@@ -30,6 +30,8 @@
 #include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
+#include "initguid.h"
+#include "typelib.h"
 
 #include "wine/debug.h"
 
@@ -443,22 +445,6 @@ static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
 static GUID const CLSID_RecordInfo = {
     0x0000002F, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
 
-extern GUID const CLSID_PSDispatch;
-
-GUID const CLSID_PSEnumVariant = {
-    0x00020421, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-GUID const CLSID_PSTypeInfo = {
-    0x00020422, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-GUID const CLSID_PSTypeLib = {
-    0x00020423, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-GUID const CLSID_PSTypeComp = {
-    0x00020425, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-extern GUID const CLSID_PSOAInterface;
-
 static GUID const CLSID_OldFont = {
     0x46763EE0, 0xCAB2, 0x11CE, {0x8C,0x20,0x00,0xAA,0x00,0x51,0xE5,0xD4} };
 
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 21c69a9abb..619a286cfd 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -82,9 +82,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 WINE_DECLARE_DEBUG_CHANNEL(typelib);
 
-/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
-const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } };
-
 static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt);
 static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr);
 
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index 534856e535..2ab2ebc862 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -607,5 +607,13 @@ extern void dump_Variant(const VARIANT * pvar);
 
 HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);
 
+/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
+DEFINE_OLEGUID( CLSID_PSDispatch,    0x00020420, 0x0000, 0x0000 );
+DEFINE_OLEGUID( CLSID_PSEnumVariant, 0x00020421, 0x0000, 0x0000 );
+DEFINE_OLEGUID( CLSID_PSTypeInfo,    0x00020422, 0x0000, 0x0000 );
+DEFINE_OLEGUID( CLSID_PSTypeLib,     0x00020423, 0x0000, 0x0000 );
+DEFINE_OLEGUID( CLSID_PSOAInterface, 0x00020424, 0x0000, 0x0000 );
+DEFINE_OLEGUID( CLSID_PSTypeComp,    0x00020425, 0x0000, 0x0000 );
+
 /*---------------------------END--------------------------------------------*/
 #endif
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index a2c81e5003..90782c7675 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -35,6 +35,7 @@
 #include "ole2.h"
 #include "oleauto.h"
 #include "rpcproxy.h"
+#include "typelib.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
@@ -44,12 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align)
 #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align)
 
-/* FIXME: not supposed to be here */
-
-const CLSID CLSID_PSDispatch = {
-  0x20420, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 static CStdPSFactoryBuffer PSFactoryBuffer;
 
 CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)