Eliminate re-exports from `Predicates`

src/Predicates.hs

+-- | Convenient predicates
 module Predicates (
-    module GHC,
-    module Oracles.Config.Flag,
-    module Oracles.Config.Setting,
     stage, package, builder, stagedBuilder, file, way,
     stage0, stage1, stage2, notStage0, notPackage, registerPackage, splitObjects
     ) where
@@ -10,7 +8,6 @@ import Base
 import Expression
 import GHC
 import Oracles.Config.Flag
-import Oracles.Config.Setting
 
 -- Basic predicates
 stage :: Stage -> Predicate

src/Rules/Library.hs

@@ -2,8 +2,8 @@ module Rules.Library (buildPackageLibrary, cSources, hSources) where
 
 import Data.Char
 
-import Base
-import Expression hiding (splitPath)
+import Base hiding (splitPath)
+import Expression
 import GHC
 import Oracles
 import Predicates (splitObjects)

src/Settings/Builders/Haddock.hs

@@ -2,6 +2,7 @@ module Settings.Builders.Haddock (haddockArgs) where
 
 import Development.Shake.FilePath
 import Base
+import GHC
 import Package
 import Expression
 import Oracles

src/Settings/Packages.hs

@@ -2,7 +2,9 @@ module Settings.Packages (getPackages, knownPackages, findKnownPackage) where
 
 import Base
 import Expression
+import GHC
 import Predicates
+import Oracles.Config.Setting
 import Settings.User
 
 -- Combining default list of packages with user modifications

src/Settings/User.hs

@@ -6,8 +6,8 @@ module Settings.User (
     verboseCommands, turnWarningsIntoErrors
     ) where
 
+import GHC
 import Expression
-import Predicates
 
 -- No user-specific settings by default
 -- TODO: rename to userArgs

src/Settings/Ways.hs

@@ -4,6 +4,7 @@ import Data.Monoid
 import Expression
 import Predicates
 import Settings.User
+import Oracles.Config.Flag
 
 -- TODO: use a single expression Ways parameterised by package instead of
 -- expressions libWays and rtsWays