diff --git a/Makefile b/Makefile
index cc5cac6..ae8d7e7 100644
--- a/Makefile
+++ b/Makefile
@@ -124,10 +124,14 @@ CROSS_TOOLS_NOCC := \
 
 CROSS_TOOLS := \
 	CC="$(heads_cc)" \
+	CPP="$(CROSS)cpp" \
+	CXXCPP="$(CROSS)cpp" \
+	CC_FOR_BUILD="$(CC_FOR_BUILD)" \
+	BUILD_CC="$(BUILD_CC)" \
+	HOSTCC="$(HOSTCC)" \
 	$(CROSS_TOOLS_NOCC) \
 
 
-
 ifeq "$(CONFIG_COREBOOT)" "y"
 all: $(build)/$(BOARD)/coreboot.rom
 else ifeq "$(CONFIG_LINUXBOOT)" "y"
@@ -348,7 +352,7 @@ define define_module =
 		echo "$(MAKE) \
 			-C \"$(build)/$($1_dir)\" \
 			$($1_target)" ;  \
-		$(MAKE) \
+		$($1_make_environment) $(MAKE) \
 			-C "$(build)/$($1_dir)" \
 			$($1_target)  \
 	) \
@@ -453,7 +457,7 @@ $(COREBOOT_UTIL_DIR)/inteltool/inteltool \
 : $(build)/$(coreboot_base_dir)/.canary \
 	$(build)/$(musl_dir)/.build
 	+$(call do,MAKE,$(notdir $@),\
-		$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
+		CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH= $(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
 	)
 
 # superio depends on zlib and pciutils
diff --git a/modules/busybox b/modules/busybox
index f8f8a83..4836780 100644
--- a/modules/busybox
+++ b/modules/busybox
@@ -11,6 +11,7 @@ busybox_hash := 604553b7dbd59ded9e3ad7c6af49ed2cff599adf3e54d9463e5e0027b362019c
 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig
 busybox_config := config/busybox.config
 busybox_output := busybox
+busybox_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 busybox_target := \
 	$(CROSS_TOOLS) \
 	$(MAKE_JOBS) \
diff --git a/modules/cairo b/modules/cairo
index 647ed2c..00f6cac 100644
--- a/modules/cairo
+++ b/modules/cairo
@@ -23,6 +23,7 @@ cairo_configure := \
 	&& mv libtool-2 libtool \
 	&& chmod 755 libtool
 
+cairo_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 cairo_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/cryptsetup b/modules/cryptsetup
index 4cea7f3..d68da0c 100644
--- a/modules/cryptsetup
+++ b/modules/cryptsetup
@@ -20,6 +20,7 @@ cryptsetup_configure := ./configure \
 
 # but after building, replace prefix so that they will be installed
 # in the correct directory.
+cryptsetup_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 cryptsetup_target := \
 	$(MAKE_JOBS) \
 	&& $(MAKE) \
diff --git a/modules/dropbear b/modules/dropbear
index 998087c..834a3ef 100644
--- a/modules/dropbear
+++ b/modules/dropbear
@@ -19,6 +19,7 @@ dropbear_configure := ./configure \
 	--disable-wtmpx \
 	
 dropbear_output := ssh scp dropbear
+dropbear_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 dropbear_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/fbwhiptail b/modules/fbwhiptail
index f54a62d..1359677 100644
--- a/modules/fbwhiptail
+++ b/modules/fbwhiptail
@@ -6,6 +6,7 @@ fbwhiptail_version := git
 fbwhiptail_dir := fbwhiptail
 fbwhiptail_repo := https://source.puri.sm/coreboot/fbwhiptail.git
 
+fbwhiptail_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 fbwhiptail_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/flashrom b/modules/flashrom
index 0a29b18..d695818 100644
--- a/modules/flashrom
+++ b/modules/flashrom
@@ -11,6 +11,7 @@ flashrom_tar := flashrom-$(flashrom_version).tar.bz2
 flashrom_url := https://download.flashrom.org/releases/$(flashrom_tar)
 flashrom_hash := 3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64
 
+flashrom_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 flashrom_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/flashtools b/modules/flashtools
index d95c215..090362c 100644
--- a/modules/flashtools
+++ b/modules/flashtools
@@ -11,6 +11,7 @@ flashtools_tar := flashtools-$(flashtools_version).tar.gz
 flashtools_url := https://github.com/osresearch/flashtools/archive/v$(flashtools_version).tar.gz
 flashtools_hash := e8205aa3d19e536080f5974ed06ab9a88c4c3f37870c2f6a3a08a2f39302c22c
 
+flashtools_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 flashtools_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/frotz b/modules/frotz
index 611e04a..e2c2e22 100644
--- a/modules/frotz
+++ b/modules/frotz
@@ -8,6 +8,7 @@ frotz_hash := dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f
 
 frotz_configure := touch .config
 
+frotz_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 frotz_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/gpg b/modules/gpg
index 4d4440a..6a48664 100644
--- a/modules/gpg
+++ b/modules/gpg
@@ -39,6 +39,7 @@ gpg_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
+gpg_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 gpg_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(gpg_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/gpg2 b/modules/gpg2
index 318a4cd..522e518 100644
--- a/modules/gpg2
+++ b/modules/gpg2
@@ -50,6 +50,7 @@ gpg2_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
+gpg2_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 gpg2_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(gpg2_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/kexec b/modules/kexec
index d2311c2..b507d81 100644
--- a/modules/kexec
+++ b/modules/kexec
@@ -14,6 +14,7 @@ kexec_configure := ./configure \
 	--without-lzma \
 	&& $(MAKE) clean
 
+kexec_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 kexec_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libassuan b/modules/libassuan
index 3c4e319..6138ec2 100644
--- a/modules/libassuan
+++ b/modules/libassuan
@@ -14,6 +14,7 @@ libassuan_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
+libassuan_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libassuan_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libgcrypt b/modules/libgcrypt
index aa7e1ef..384f672 100644
--- a/modules/libgcrypt
+++ b/modules/libgcrypt
@@ -14,6 +14,7 @@ libgcrypt_configure := ./configure \
 	--disable-asm \
 	--disable-nls \
 	
+libgcrypt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libgcrypt_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libgpg-error b/modules/libgpg-error
index 752e11a..3d4d217 100644
--- a/modules/libgpg-error
+++ b/modules/libgpg-error
@@ -16,6 +16,7 @@ libgpg-error_configure := ./configure \
 	--disable-tests \
 	--disable-asm \
 
+libgpg-error_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH= CC_FOR_BUILD="$(CC_FOR_BUILD)"
 libgpg-error_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libksba b/modules/libksba
index d352913..bd1835b 100644
--- a/modules/libksba
+++ b/modules/libksba
@@ -14,6 +14,7 @@ libksba_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
+libksba_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libksba_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libpng b/modules/libpng
index d6d9e65..33306e2 100644
--- a/modules/libpng
+++ b/modules/libpng
@@ -12,6 +12,7 @@ libpng_configure := \
         --host i386-elf-linux \
 	--prefix="/" \
 
+libpng_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libpng_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification
index c9b9d45..e7fab7d 100644
--- a/modules/libremkey-hotp-verification
+++ b/modules/libremkey-hotp-verification
@@ -6,6 +6,7 @@ libremkey-hotp-verification_version := git
 libremkey-hotp-verification_dir := libremkey-hotp-verification
 libremkey-hotp-verification_repo := --recursive https://github.com/Nitrokey/nitrokey-hotp-verification
 
+libremkey-hotp-verification_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libremkey-hotp-verification_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libusb b/modules/libusb
index b7fe959..fe274e9 100644
--- a/modules/libusb
+++ b/modules/libusb
@@ -19,6 +19,7 @@ libusb_configure := ./configure\
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
 
+libusb_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libusb_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libusb-compat b/modules/libusb-compat
index f95854e..78033ef 100644
--- a/modules/libusb-compat
+++ b/modules/libusb-compat
@@ -22,6 +22,7 @@ libusb-compat_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
+libusb-compat_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 libusb-compat_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/lvm2 b/modules/lvm2
index 91f0f53..def7544 100644
--- a/modules/lvm2
+++ b/modules/lvm2
@@ -34,6 +34,7 @@ lvm2_configure := \
 	--with-cluster=none \
 
 # not sure why LIB_SUFFIX is not defined in the cross build
+lvm2_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 lvm2_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/mbedtls b/modules/mbedtls
index d844b16..2611866 100644
--- a/modules/mbedtls
+++ b/modules/mbedtls
@@ -10,6 +10,7 @@ mbedtls_libraries := library/libmbedcrypto.so.0
 
 mbedtls_configure :=
 
+mbedtls_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 mbedtls_target := \
 	SHARED=1 \
 	DESTDIR=$(INSTALL) \
diff --git a/modules/msrtools b/modules/msrtools
index 9adfab0..85b5954 100644
--- a/modules/msrtools
+++ b/modules/msrtools
@@ -11,6 +11,7 @@ msrtools_tar := msr-tools-$(msrtools_version).tar.gz
 msrtools_url := https://github.com/intel/msr-tools/archive/msr-tools-$(msrtools_version).tar.gz
 msrtools_hash := e8205aa3d19e536080f5974ed06ab9a88c4c3f37870c2f6a3a08a2f39302c22c
 
+msrtools_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 msrtools_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/musl b/modules/musl
index eec76de..89b9a0f 100644
--- a/modules/musl
+++ b/modules/musl
@@ -24,6 +24,7 @@ musl_configure := ./configure \
 	--enable-gcc-wrapper \
 	--enable-shared \
 
+musl_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 musl_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS_NOCC) \
diff --git a/modules/newt b/modules/newt
index cc6341d..bad67c7 100644
--- a/modules/newt
+++ b/modules/newt
@@ -8,6 +8,7 @@ newt_tar := newt-$(newt_version).tar.gz
 newt_url := https://releases.pagure.org/newt/$(newt_tar)
 newt_hash := 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc
 
+newt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 newt_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/npth b/modules/npth
index e0f30c6..a43d626 100644
--- a/modules/npth
+++ b/modules/npth
@@ -14,6 +14,7 @@ npth_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
+npth_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 npth_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/pciutils b/modules/pciutils
index 2ea5b9b..dfee3a0 100644
--- a/modules/pciutils
+++ b/modules/pciutils
@@ -16,6 +16,7 @@ pciutils_hash := 64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe6
 # reproducible.  Otherwise the build path will be embedded
 # in the library and executables.
 
+pciutils_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 pciutils_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/pinentry b/modules/pinentry
index c0e93d7..a541ce0 100644
--- a/modules/pinentry
+++ b/modules/pinentry
@@ -33,6 +33,7 @@ pinentry_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
+pinentry_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 pinentry_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(pinentry_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/pixman b/modules/pixman
index 65a2e20..198f8ac 100644
--- a/modules/pixman
+++ b/modules/pixman
@@ -13,6 +13,7 @@ pixman_configure := \
 	--prefix="/" \
 	--disable-gtk
 
+pixman_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 pixman_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/popt b/modules/popt
index b3b0b04..242ae03 100644
--- a/modules/popt
+++ b/modules/popt
@@ -11,6 +11,7 @@ popt_configure := ./configure \
 	--prefix "/" \
 	--host i386-elf-linux \
 
+popt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 popt_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/qrencode b/modules/qrencode
index fb73c7b..afded70 100644
--- a/modules/qrencode
+++ b/modules/qrencode
@@ -14,6 +14,7 @@ qrencode_configure := ./configure \
 	--without-tools \
 	--host i386-elf-linux \
 
+qrencode_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 qrencode_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/slang b/modules/slang
index a4ac84b..a338639 100644
--- a/modules/slang
+++ b/modules/slang
@@ -18,6 +18,7 @@ slang_configure := ./configure \
   && mkdir -p src/elfobjs
 
 # Disable parallel make for the install target
+slang_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 slang_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/tpmtotp b/modules/tpmtotp
index 792dd51..02c6c10 100644
--- a/modules/tpmtotp
+++ b/modules/tpmtotp
@@ -11,6 +11,7 @@ tpmtotp_tar := tpmtotp-$(tpmtotp_version).tar.gz
 tpmtotp_url := https://github.com/osresearch/tpmtotp/archive/v$(tpmtotp_version).tar.gz
 tpmtotp_hash := e8205aa3d19e536080f5974ed06ab9a88c4c3f37870c2f6a3a08a2f39302c22c
 
+tpmtotp_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 tpmtotp_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/util-linux b/modules/util-linux
index e3377f6..a50bf40 100644
--- a/modules/util-linux
+++ b/modules/util-linux
@@ -22,6 +22,7 @@ util-linux_configure := ./configure \
 	--enable-libblkid \
 
 
+util-linux_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 util-linux_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/zlib b/modules/zlib
index dbdb44e..a6290b2 100644
--- a/modules/zlib
+++ b/modules/zlib
@@ -12,6 +12,7 @@ zlib_configure := \
 	./configure \
 	--prefix="/" \
 
+zlib_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
 zlib_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \