diff --git a/keyserver/api/api.go b/keyserver/api/api.go
index d5bd7c870..f46a9ee26 100644
--- a/keyserver/api/api.go
+++ b/keyserver/api/api.go
@@ -40,12 +40,6 @@ type KeyInternalAPI interface {
 	QueryDeviceMessages(ctx context.Context, req *QueryDeviceMessagesRequest, res *QueryDeviceMessagesResponse)
 }
 
-// Map of purpose -> public key
-type CrossSigningKeyMap map[gomatrixserverlib.CrossSigningKeyPurpose]gomatrixserverlib.Base64Bytes
-
-// Map of user ID -> key ID -> signature
-type CrossSigningSigMap map[string]map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes
-
 // KeyError is returned if there was a problem performing/querying the server
 type KeyError struct {
 	Err                string `json:"error"`
diff --git a/keyserver/internal/cross_signing.go b/keyserver/internal/cross_signing.go
index 2fcdcf0ba..802d02b36 100644
--- a/keyserver/internal/cross_signing.go
+++ b/keyserver/internal/cross_signing.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"github.com/matrix-org/dendrite/keyserver/api"
+	"github.com/matrix-org/dendrite/keyserver/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/sirupsen/logrus"
 )
@@ -164,7 +165,7 @@ func (a *KeyInternalAPI) PerformUploadDeviceKeys(ctx context.Context, req *api.P
 
 	// Work out which things we need to verify the signatures for.
 	toVerify := make(map[gomatrixserverlib.CrossSigningKeyPurpose]gomatrixserverlib.CrossSigningKey, 3)
-	toStore := api.CrossSigningKeyMap{}
+	toStore := types.CrossSigningKeyMap{}
 	if len(req.MasterKey.Keys) > 0 {
 		toVerify[gomatrixserverlib.CrossSigningKeyPurposeMaster] = req.MasterKey
 	}
@@ -351,7 +352,7 @@ func (a *KeyInternalAPI) crossSigningKeysFromDatabase(
 
 			appendSignature := func(originUserID string, originKeyID gomatrixserverlib.KeyID, signature gomatrixserverlib.Base64Bytes) {
 				if key.Signatures == nil {
-					key.Signatures = api.CrossSigningSigMap{}
+					key.Signatures = types.CrossSigningSigMap{}
 				}
 				if _, ok := key.Signatures[originUserID]; !ok {
 					key.Signatures[originUserID] = make(map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes)