diff --git a/Distribution/Simple/Build.hs b/Distribution/Simple/Build.hs
index 4c4fd044293b8b302b1a47303d498cd67772eb39..1026016c0b61c39e8d55ea15b1ce2c1a1dfc3baf 100644
--- a/Distribution/Simple/Build.hs
+++ b/Distribution/Simple/Build.hs
@@ -281,6 +281,7 @@ constructGHCCmdLine comp srcLocs bi deps =
             then ["-hide-all-packages"]
             else [])
      ++ ["--make"]
+     ++ ["-i"]
      ++ ["-i" ++ l | l <- nub (hsSourceDirs bi ++ srcLocs)]
      ++ [ "-#include \"" ++ inc ++ "\"" | inc <- includes bi ]
      ++ nub (flags ++ hcOptions GHC (options bi))
diff --git a/package.conf.in b/package.conf.in
index 916addbf4fa09aa13c8f0d87be74abde5e9892dc..d6f3c1d83a3fd2960cafb9d3fd51638555eacdd8 100644
--- a/package.conf.in
+++ b/package.conf.in
@@ -43,7 +43,7 @@ library-dirs:	LIB_DIR
 hs-libraries:   "HSCabal"
 extra-libraries:
 #if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER)
-	     "shell32"
+	     "shfolder"
 #endif
 
 include-dirs: