7 files changed, 1 insertions, 16 deletions
diff --git a/compiler/GHC/Stg/Lift.hs b/compiler/GHC/Stg/Lift.hs
index 32e94234b4..5527f37165 100644
--- a/compiler/GHC/Stg/Lift.hs
+++ b/compiler/GHC/Stg/Lift.hs
@@ -15,8 +15,6 @@ module GHC.Stg.Lift
    )
 where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Types.Basic
diff --git a/compiler/GHC/Stg/Lift/Monad.hs b/compiler/GHC/Stg/Lift/Monad.hs
index c34c74d505..0671bd537e 100644
--- a/compiler/GHC/Stg/Lift/Monad.hs
+++ b/compiler/GHC/Stg/Lift/Monad.hs
@@ -20,8 +20,6 @@ module GHC.Stg.Lift.Monad (
     substOcc, isLifted, formerFreeVars, liftedIdsExpander
   ) where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Types.Basic
diff --git a/compiler/GHC/Stg/Pipeline.hs b/compiler/GHC/Stg/Pipeline.hs
index d9f1342b66..8c57ad7577 100644
--- a/compiler/GHC/Stg/Pipeline.hs
+++ b/compiler/GHC/Stg/Pipeline.hs
@@ -11,8 +11,6 @@
 
 module GHC.Stg.Pipeline ( stg2stg ) where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Stg.Syntax
diff --git a/compiler/GHC/Stg/Stats.hs b/compiler/GHC/Stg/Stats.hs
index debe53201f..485ddbf055 100644
--- a/compiler/GHC/Stg/Stats.hs
+++ b/compiler/GHC/Stg/Stats.hs
@@ -25,8 +25,6 @@ The program gather statistics about
 
 module GHC.Stg.Stats ( showStgStats ) where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Stg.Syntax
diff --git a/compiler/GHC/Stg/Subst.hs b/compiler/GHC/Stg/Subst.hs
index 798a1f38bd..c5aa65c7f1 100644
--- a/compiler/GHC/Stg/Subst.hs
+++ b/compiler/GHC/Stg/Subst.hs
@@ -2,8 +2,6 @@
 
 module GHC.Stg.Subst where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Types.Id
@@ -57,8 +55,7 @@ lookupIdSubst id (Subst in_scope env)
   | not (isLocalId id) = id
   | Just id' <- lookupVarEnv env id = id'
   | Just id' <- lookupInScope in_scope id = id'
-  | otherwise = WARN( True, text "StgSubst.lookupIdSubst" <+> ppr id $$ ppr in_scope)
-                id
+  | otherwise = warnPprTrace True (text "StgSubst.lookupIdSubst" <+> ppr id $$ ppr in_scope) id
 
 -- | Substitutes an occurrence of an identifier for its counterpart recorded
 -- in the 'Subst'. Does not generate a debug warning if the identifier to
diff --git a/compiler/GHC/Stg/Syntax.hs b/compiler/GHC/Stg/Syntax.hs
index 50fdea3dce..6728a3fc87 100644
--- a/compiler/GHC/Stg/Syntax.hs
+++ b/compiler/GHC/Stg/Syntax.hs
@@ -65,8 +65,6 @@ module GHC.Stg.Syntax (
         pprGenStgTopBindings, pprStgTopBindings
     ) where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Core     ( AltCon )
diff --git a/compiler/GHC/Stg/Unarise.hs b/compiler/GHC/Stg/Unarise.hs
index 4a4fef1402..014d3807a1 100644
--- a/compiler/GHC/Stg/Unarise.hs
+++ b/compiler/GHC/Stg/Unarise.hs
@@ -241,8 +241,6 @@ STG programs after unarisation have these invariants:
 
 module GHC.Stg.Unarise (unarise) where
 
-#include "HsVersions.h"
-
 import GHC.Prelude
 
 import GHC.Types.Basic