diff --git a/blockchain/claimtrie.go b/blockchain/claimtrie.go
index 1c90665c..33a288dd 100644
--- a/blockchain/claimtrie.go
+++ b/blockchain/claimtrie.go
@@ -7,14 +7,17 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
 	btcutil "github.com/lbryio/lbcutil"
 
 	"github.com/lbryio/lbcd/claimtrie"
 	"github.com/lbryio/lbcd/claimtrie/change"
+	"github.com/lbryio/lbcd/claimtrie/merkletrie"
 	"github.com/lbryio/lbcd/claimtrie/node"
 	"github.com/lbryio/lbcd/claimtrie/normalization"
+	"github.com/lbryio/lbcd/claimtrie/param"
 )
 
 func (b *BlockChain) SetClaimtrieHeader(block *btcutil.Block, view *UtxoViewpoint) error {
diff --git a/blockchain/validate.go b/blockchain/validate.go
index 8f32842b..a5f6a59c 100644
--- a/blockchain/validate.go
+++ b/blockchain/validate.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
+	"github.com/lbryio/lbcd/claimtrie/param"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
 	btcutil "github.com/lbryio/lbcutil"
diff --git a/claimtrie/claimtrie_test.go b/claimtrie/claimtrie_test.go
index 20ee4eba..2adf335e 100644
--- a/claimtrie/claimtrie_test.go
+++ b/claimtrie/claimtrie_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/lbryio/lbcd/claimtrie/config"
 	"github.com/lbryio/lbcd/claimtrie/merkletrie"
+	"github.com/lbryio/lbcd/claimtrie/node"
 	"github.com/lbryio/lbcd/claimtrie/param"
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
diff --git a/claimtrie/node/hashfork_manager.go b/claimtrie/node/hashfork_manager.go
index 840b5202..31477bba 100644
--- a/claimtrie/node/hashfork_manager.go
+++ b/claimtrie/node/hashfork_manager.go
@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
+	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/lbryio/lbcd/claimtrie/param"
 )