diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 82260576468fb52593acd09d292d8b998f52debc..c82cb783e31781415d756fe730544de98e93b909 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -32,8 +32,8 @@ libffi_EnableShared    = no
 endif
 
 libffi_STATIC_LIB  = libffi/build/inst/lib/libffi.a
-libffi_HEADERS     = rts/dist-install/build/ffi.h \
-                     rts/dist-install/build/ffitarget.h
+libffi_HEADERS     = rts/dist-install/build/include/ffi.h \
+                     rts/dist-install/build/include/ffitarget.h
 
 ifeq "$(HostOS_CPP)" "mingw32"
 LIBFFI_NAME = ffi-6
diff --git a/rts/ghc.mk b/rts/ghc.mk
index b4cef0956c02eabf670b264a373f4429f81605d3..3643e07e9eb37b7aa981bcc7da3d402f6c198515 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -99,7 +99,7 @@ $(rts_AUTO_APPLY_CMM): $$(genapply_INPLACE)
 rts_H_FILES := $(wildcard rts/*.h rts/*/*.h)
 
 ifeq "$(USE_DTRACE)" "YES"
-DTRACEPROBES_H = rts/dist-install/build/RtsProbes.h
+DTRACEPROBES_H = rts/dist-install/build/include/RtsProbes.h
 rts_H_FILES += $(DTRACEPROBES_H)
 endif
 
diff --git a/rts/package.conf.in b/rts/package.conf.in
index 46103e49b9e629bd017c95519405d61aaaabbce9..1d3611f93066e7e566f6f09fcdd3fc9bd3f1fdce 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -70,11 +70,10 @@ extra-libraries:
 #if defined(INSTALLING)
 include-dirs:           INCLUDE_DIR FFI_INCLUDE_DIR
 #else /* !INSTALLING */
-include-dirs:           TOP"/rts/dist-install/build"
-                        TOP"/rts/include"
+include-dirs:           TOP"/rts/include"
+                        TOP"/rts/dist-install/build/include"
                         FFI_INCLUDE_DIR
                         LIBDW_INCLUDE_DIR
-                        TOP"/rts/dist-install/build/include"
 #endif
 
 includes:               Stg.h