diff --git a/src/Protolude.hs b/src/Protolude.hs
index 0a2665b88..dd3ea31d6 100644
--- a/src/Protolude.hs
+++ b/src/Protolude.hs
@@ -492,8 +492,10 @@ import qualified Control.Exception
 import Control.Monad.STM as X (
     STM
   , atomically
+#if ( __GLASGOW_HASKELL__ < 806 )
   , always
   , alwaysSucceeds
+#endif
   , retry
   , orElse
   , check
diff --git a/src/Protolude/Base.hs b/src/Protolude/Base.hs
index bda508886..f4cae809d 100644
--- a/src/Protolude/Base.hs
+++ b/src/Protolude/Base.hs
@@ -122,8 +122,10 @@ import GHC.Records as X (
 
 #if ( __GLASGOW_HASKELL__ >= 800 )
 import Data.Kind as X (
-    type (*)
-  , type Type
+  type Type
+#if ( __GLASGOW_HASKELL__ < 806 )
+  , type (*)
+#endif
   )
 #endif