diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c
index 6fe380c8e38..d17c3b7a97d 100644
--- a/dlls/crypt32/collectionstore.c
+++ b/dlls/crypt32/collectionstore.c
@@ -135,7 +135,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store,
  */
 static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store,
  PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs,
- PCWINE_CONTEXT_INTERFACE contextInterface, void *pPrev, size_t contextSize)
+ const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize)
 {
     void *ret, *child;
     struct list *storeNext = list_next(&store->stores, &storeEntry->entry);
diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c
index bf4ccf3cac1..1cfc03af72f 100644
--- a/dlls/crypt32/context.c
+++ b/dlls/crypt32/context.c
@@ -214,14 +214,14 @@ void Context_CopyProperties(const void *to, const void *from,
 
 struct ContextList
 {
-    PCWINE_CONTEXT_INTERFACE contextInterface;
+    const WINE_CONTEXT_INTERFACE *contextInterface;
     size_t contextSize;
     CRITICAL_SECTION cs;
     struct list contexts;
 };
 
 struct ContextList *ContextList_Create(
- PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize)
+ const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize)
 {
     struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList));
 
diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index ea85cbc7e28..94a3e52e253 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -194,12 +194,11 @@ typedef struct _WINE_CONTEXT_INTERFACE
     SerializeElementFunc         serialize;
     FreeContextFunc              free;
     DeleteContextFunc            deleteFromStore;
-} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE;
-typedef const WINE_CONTEXT_INTERFACE *PCWINE_CONTEXT_INTERFACE;
+} WINE_CONTEXT_INTERFACE;
 
-extern PCWINE_CONTEXT_INTERFACE pCertInterface DECLSPEC_HIDDEN;
-extern PCWINE_CONTEXT_INTERFACE pCRLInterface DECLSPEC_HIDDEN;
-extern PCWINE_CONTEXT_INTERFACE pCTLInterface DECLSPEC_HIDDEN;
+extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN;
+extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN;
+extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN;
 
 /* (Internal) certificate store types and functions */
 struct WINE_CRYPTCERTSTORE;
@@ -404,7 +403,7 @@ void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list) DECLSPEC_HIDDEN;
 struct ContextList;
 
 struct ContextList *ContextList_Create(
- PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize) DECLSPEC_HIDDEN;
+ const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN;
 
 void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN;
 
diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c
index f4b4295835a..ccf37fcba2f 100644
--- a/dlls/crypt32/regstore.c
+++ b/dlls/crypt32/regstore.c
@@ -349,7 +349,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store,
 
 static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store,
  struct list *deleteList, const void *context,
- PCWINE_CONTEXT_INTERFACE contextInterface)
+ const WINE_CONTEXT_INTERFACE *contextInterface)
 {
     BOOL ret;
 
diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 7ca881c4033..59dde5afa91 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -41,7 +41,7 @@ typedef struct _WINE_CERT_PROP_HEADER
 
 static BOOL CRYPT_SerializeStoreElement(const void *context,
  const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID,
- PCWINE_CONTEXT_INTERFACE contextInterface, DWORD dwFlags, BOOL omitHashes,
+ const WINE_CONTEXT_INTERFACE *contextInterface, DWORD dwFlags, BOOL omitHashes,
  BYTE *pbElement, DWORD *pcbElement)
 {
     BOOL ret;
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index 6d27fc1c356..e0a9686ae93 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -54,7 +54,7 @@ static const WINE_CONTEXT_INTERFACE gCertInterface = {
     (FreeContextFunc)CertFreeCertificateContext,
     (DeleteContextFunc)CertDeleteCertificateFromStore,
 };
-PCWINE_CONTEXT_INTERFACE pCertInterface = &gCertInterface;
+const WINE_CONTEXT_INTERFACE *pCertInterface = &gCertInterface;
 
 static const WINE_CONTEXT_INTERFACE gCRLInterface = {
     (CreateContextFunc)CertCreateCRLContext,
@@ -69,7 +69,7 @@ static const WINE_CONTEXT_INTERFACE gCRLInterface = {
     (FreeContextFunc)CertFreeCRLContext,
     (DeleteContextFunc)CertDeleteCRLFromStore,
 };
-PCWINE_CONTEXT_INTERFACE pCRLInterface = &gCRLInterface;
+const WINE_CONTEXT_INTERFACE *pCRLInterface = &gCRLInterface;
 
 static const WINE_CONTEXT_INTERFACE gCTLInterface = {
     (CreateContextFunc)CertCreateCTLContext,
@@ -84,7 +84,7 @@ static const WINE_CONTEXT_INTERFACE gCTLInterface = {
     (FreeContextFunc)CertFreeCTLContext,
     (DeleteContextFunc)CertDeleteCTLFromStore,
 };
-PCWINE_CONTEXT_INTERFACE pCTLInterface = &gCTLInterface;
+const WINE_CONTEXT_INTERFACE *pCTLInterface = &gCTLInterface;
 
 typedef struct _WINE_MEMSTORE
 {