Integrate PR change requests

Author: fendor

Cabal/Distribution/Simple/Build.hs

@@ -25,6 +25,7 @@ module Distribution.Simple.Build (
     initialBuildSteps,
     createInternalPackageDB,
     componentInitialBuildSteps,
+    writeAutogenFiles
   ) where
 
 import Prelude ()

Cabal/Distribution/Simple/Utils/Json.hs

@@ -1,3 +1,5 @@
+-- | Utility json lib for Cabal
+-- TODO: Remove it again.
 module Distribution.Simple.Utils.Json
     ( Json(..)
     , renderJson