diff --git a/clientapi/routing/consent_tracking.go b/clientapi/routing/consent_tracking.go
index feeac530a..313675647 100644
--- a/clientapi/routing/consent_tracking.go
+++ b/clientapi/routing/consent_tracking.go
@@ -133,7 +133,7 @@ func sendServerNoticeForConsent(userAPI userapi.ClientUserAPI, rsAPI api.ClientR
 	cfgNotices *config.ServerNotices,
 	cfgClient *config.ClientAPI,
 	senderDevice *userapi.Device,
-	asAPI appserviceAPI.AppServiceQueryAPI,
+	asAPI appserviceAPI.AppServiceInternalAPI,
 ) {
 	res := &userapi.QueryOutdatedPolicyResponse{}
 	if err := userAPI.QueryOutdatedPolicy(context.Background(), &userapi.QueryOutdatedPolicyRequest{
diff --git a/clientapi/routing/server_notices.go b/clientapi/routing/server_notices.go
index 28ed989a1..40efe03a2 100644
--- a/clientapi/routing/server_notices.go
+++ b/clientapi/routing/server_notices.go
@@ -95,7 +95,7 @@ func sendServerNotice(
 	cfgNotices *config.ServerNotices,
 	cfgClient *config.ClientAPI,
 	senderDevice *userapi.Device,
-	asAPI appserviceAPI.AppServiceQueryAPI,
+	asAPI appserviceAPI.AppServiceInternalAPI,
 	userAPI userapi.ClientUserAPI,
 	txnID *string,
 	device *userapi.Device,
diff --git a/internal/httputil/httpapi.go b/internal/httputil/httpapi.go
index 0e5552ffe..55cd92620 100644
--- a/internal/httputil/httpapi.go
+++ b/internal/httputil/httpapi.go
@@ -28,11 +28,11 @@ import (
 	"github.com/getsentry/sentry-go"
 	"github.com/matrix-org/dendrite/clientapi/auth"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
-	federationapiAPI "github.com/matrix-org/dendrite/federationapi/api"
 	"github.com/matrix-org/dendrite/setup/config"
 	userapi "github.com/matrix-org/dendrite/userapi/api"
+	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"