diff --git a/clientapi/auth/storage/accounts/postgres/account_data_table.go b/clientapi/auth/storage/accounts/postgres/account_data_table.go
index f8b2c6065..4219200ab 100644
--- a/clientapi/auth/storage/accounts/postgres/account_data_table.go
+++ b/clientapi/auth/storage/accounts/postgres/account_data_table.go
@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/gomatrixserverlib"
diff --git a/clientapi/auth/storage/accounts/postgres/membership_table.go b/clientapi/auth/storage/accounts/postgres/membership_table.go
index cbac9f88b..d1a05b1c7 100644
--- a/clientapi/auth/storage/accounts/postgres/membership_table.go
+++ b/clientapi/auth/storage/accounts/postgres/membership_table.go
@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"
diff --git a/common/keydb/postgres/server_key_table.go b/common/keydb/postgres/server_key_table.go
index 0cf856a4b..b33179d36 100644
--- a/common/keydb/postgres/server_key_table.go
+++ b/common/keydb/postgres/server_key_table.go
@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"
diff --git a/common/log.go b/common/log.go
index dd417c89c..39c993b83 100644
--- a/common/log.go
+++ b/common/log.go
@@ -17,13 +17,14 @@ package common
 import (
 	"context"
 	"fmt"
-	"github.com/matrix-org/util"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/matrix-org/util"
+
 	"github.com/matrix-org/dendrite/common/config"
 	"github.com/matrix-org/dugong"
 	"github.com/sirupsen/logrus"
diff --git a/common/partition_offset_table.go b/common/partition_offset_table.go
index e9ccfde4d..6771f9116 100644
--- a/common/partition_offset_table.go
+++ b/common/partition_offset_table.go
@@ -90,7 +90,7 @@ func (s *PartitionOffsetStatements) selectPartitionOffsets(
 	if err != nil {
 		return nil, err
 	}
-	defer common.LogIfError(ctx, rows.Close(), "rows.close() failed")
+	defer LogIfError(ctx, rows.Close(), "rows.close() failed")
 	var results []PartitionOffset
 	for rows.Next() {
 		var offset PartitionOffset
diff --git a/mediaapi/storage/postgres/thumbnail_table.go b/mediaapi/storage/postgres/thumbnail_table.go
index d00037f8f..a4474b3a1 100644
--- a/mediaapi/storage/postgres/thumbnail_table.go
+++ b/mediaapi/storage/postgres/thumbnail_table.go
@@ -18,9 +18,10 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	"github.com/matrix-org/dendrite/common"
 	"time"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/matrix-org/dendrite/mediaapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )
diff --git a/mediaapi/storage/sqlite3/thumbnail_table.go b/mediaapi/storage/sqlite3/thumbnail_table.go
index c70fd2f1b..49674d631 100644
--- a/mediaapi/storage/sqlite3/thumbnail_table.go
+++ b/mediaapi/storage/sqlite3/thumbnail_table.go
@@ -18,9 +18,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	"github.com/matrix-org/dendrite/common"
 	"time"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/matrix-org/dendrite/mediaapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )
diff --git a/publicroomsapi/storage/postgres/public_rooms_table.go b/publicroomsapi/storage/postgres/public_rooms_table.go
index 83be98be5..9dd7fccb5 100644
--- a/publicroomsapi/storage/postgres/public_rooms_table.go
+++ b/publicroomsapi/storage/postgres/public_rooms_table.go
@@ -20,6 +20,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"
diff --git a/roomserver/storage/postgres/event_json_table.go b/roomserver/storage/postgres/event_json_table.go
index e2dbe5b9a..4311504be 100644
--- a/roomserver/storage/postgres/event_json_table.go
+++ b/roomserver/storage/postgres/event_json_table.go
@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/roomserver/types"
diff --git a/roomserver/storage/postgres/event_types_table.go b/roomserver/storage/postgres/event_types_table.go
index ca33e97f6..07a48e1b5 100644
--- a/roomserver/storage/postgres/event_types_table.go
+++ b/roomserver/storage/postgres/event_types_table.go
@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"
diff --git a/roomserver/storage/postgres/room_aliases_table.go b/roomserver/storage/postgres/room_aliases_table.go
index da3e1b2d4..c9bb7b52c 100644
--- a/roomserver/storage/postgres/room_aliases_table.go
+++ b/roomserver/storage/postgres/room_aliases_table.go
@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 )
 
diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go
index ec3c2829d..d8279b2da 100644
--- a/roomserver/storage/postgres/state_block_table.go
+++ b/roomserver/storage/postgres/state_block_table.go
@@ -19,9 +19,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/matrix-org/dendrite/common"
 	"sort"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/lib/pq"
 	"github.com/matrix-org/dendrite/roomserver/types"
 	"github.com/matrix-org/util"
diff --git a/roomserver/storage/postgres/state_snapshot_table.go b/roomserver/storage/postgres/state_snapshot_table.go
index d25a1c2e7..79dda177f 100644
--- a/roomserver/storage/postgres/state_snapshot_table.go
+++ b/roomserver/storage/postgres/state_snapshot_table.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"
diff --git a/syncapi/storage/postgres/backward_extremities_table.go b/syncapi/storage/postgres/backward_extremities_table.go
index d0ae9a75e..a6e6ccbde 100644
--- a/syncapi/storage/postgres/backward_extremities_table.go
+++ b/syncapi/storage/postgres/backward_extremities_table.go
@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 )
 
diff --git a/syncapi/storage/postgres/output_room_events_topology_table.go b/syncapi/storage/postgres/output_room_events_topology_table.go
index b4d1ae1b8..8c0fb2402 100644
--- a/syncapi/storage/postgres/output_room_events_topology_table.go
+++ b/syncapi/storage/postgres/output_room_events_topology_table.go
@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/syncapi/types"
diff --git a/syncapi/storage/sqlite3/account_data_table.go b/syncapi/storage/sqlite3/account_data_table.go
index 48a3d9235..e1fd0ab82 100644
--- a/syncapi/storage/sqlite3/account_data_table.go
+++ b/syncapi/storage/sqlite3/account_data_table.go
@@ -18,6 +18,7 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/syncapi/types"