diff --git a/symbolic/src/Data/Macaw/Symbolic/MemTraceOps.hs b/symbolic/src/Data/Macaw/Symbolic/MemTraceOps.hs
index f1488b40..edcde3a1 100644
--- a/symbolic/src/Data/Macaw/Symbolic/MemTraceOps.hs
+++ b/symbolic/src/Data/Macaw/Symbolic/MemTraceOps.hs
@@ -28,7 +28,7 @@ import           Data.List
 import           Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import qualified Data.Vector as V
-import           GHC.TypeNats (type (<=), KnownNat)
+import           GHC.TypeNats (KnownNat)
 import           Numeric
 
 import Data.Macaw.CFG.AssignRhs (ArchAddrWidth, MemRepr(..))
diff --git a/x86/src/Data/Macaw/X86/ArchTypes.hs b/x86/src/Data/Macaw/X86/ArchTypes.hs
index 1928220c..3e6e3fc1 100644
--- a/x86/src/Data/Macaw/X86/ArchTypes.hs
+++ b/x86/src/Data/Macaw/X86/ArchTypes.hs
@@ -42,7 +42,6 @@ import           Data.Bits
 import qualified Data.Kind as Kind
 import           Data.Macaw.CFG
 import           Data.Macaw.CFG.Rewriter
-import           Data.Macaw.Memory (Endianness(..))
 import           Data.Macaw.Types
 import qualified Data.Map as Map
 import           Data.Parameterized.Classes
diff --git a/x86/src/Data/Macaw/X86/Generator.hs b/x86/src/Data/Macaw/X86/Generator.hs
index 0cec6f8b..253d053a 100644
--- a/x86/src/Data/Macaw/X86/Generator.hs
+++ b/x86/src/Data/Macaw/X86/Generator.hs
@@ -64,7 +64,9 @@ module Data.Macaw.X86.Generator
 import           Control.Lens
 import           Control.Monad.Cont
 import           Control.Monad.Except
+#if __GLASGOW_HASKELL__ < 808
 import           Control.Monad.Fail
+#endif
 import           Control.Monad.Reader
 import           Control.Monad.ST
 import           Control.Monad.State.Strict
diff --git a/x86/src/Data/Macaw/X86/Getters.hs b/x86/src/Data/Macaw/X86/Getters.hs
index 8d9915f6..ba60cce2 100644
--- a/x86/src/Data/Macaw/X86/Getters.hs
+++ b/x86/src/Data/Macaw/X86/Getters.hs
@@ -52,7 +52,6 @@ import qualified Control.Monad.Fail as MF
 import           Data.Parameterized.NatRepr
 import qualified Data.Text as T
 import qualified Flexdis86 as F
-import           GHC.TypeLits (KnownNat)
 
 import           Data.Macaw.CFG
 import           Data.Macaw.CFG.Block ( TermStmt(TranslateError) )
diff --git a/x86/src/Data/Macaw/X86/InstructionDef.hs b/x86/src/Data/Macaw/X86/InstructionDef.hs
index b027690e..5875186d 100644
--- a/x86/src/Data/Macaw/X86/InstructionDef.hs
+++ b/x86/src/Data/Macaw/X86/InstructionDef.hs
@@ -36,7 +36,6 @@ module Data.Macaw.X86.InstructionDef
 import qualified Flexdis86 as F
 import           Data.Macaw.Types
 import           Data.Parameterized.NatRepr
-import           GHC.TypeLits (KnownNat)
 
 import           Data.Macaw.X86.Conditions
 import           Data.Macaw.X86.Generator
diff --git a/x86/src/Data/Macaw/X86/Semantics.hs b/x86/src/Data/Macaw/X86/Semantics.hs
index 3372b00b..670bde15 100644
--- a/x86/src/Data/Macaw/X86/Semantics.hs
+++ b/x86/src/Data/Macaw/X86/Semantics.hs
@@ -35,7 +35,6 @@ import           Data.Word
 import qualified Flexdis86 as F
 
 import           Data.Macaw.CFG
-import           Data.Macaw.Memory (Endianness (LittleEndian))
 import           Data.Macaw.Types
 
 
diff --git a/x86_symbolic/src/Data/Macaw/X86/Crucible.hs b/x86_symbolic/src/Data/Macaw/X86/Crucible.hs
index 59bd8d4e..94fbe5ab 100644
--- a/x86_symbolic/src/Data/Macaw/X86/Crucible.hs
+++ b/x86_symbolic/src/Data/Macaw/X86/Crucible.hs
@@ -48,7 +48,6 @@ import           Text.PrettyPrint.ANSI.Leijen hiding ( (<$>), (<>), empty )
 import           What4.Concrete
 import           What4.Interface hiding (IsExpr)
 import           What4.InterpretedFloatingPoint
-import           What4.Symbol (userSymbol)
 
 import           Lang.Crucible.Backend (IsSymInterface, assert)
 import           Lang.Crucible.CFG.Expr