diff --git a/Cargo.lock b/Cargo.lock
index 3bea31f7..9b1d895b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -985,8 +985,8 @@ dependencies = [
 
 [[package]]
 name = "redoxer"
-version = "0.2.61"
-source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#4cbd0fce38d19427c8619dd67f1d94f899100683"
+version = "0.2.62"
+source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#3a5882bf173f72a9d4e679679919e24e4f103c6f"
 dependencies = [
  "anyhow",
  "dirs",
diff --git a/recipes/web/netsurf/recipe.toml b/recipes/web/netsurf/recipe.toml
index afadba99..153963e7 100644
--- a/recipes/web/netsurf/recipe.toml
+++ b/recipes/web/netsurf/recipe.toml
@@ -33,7 +33,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 COOKBOOK_MAKE_JOBS="$(( ${COOKBOOK_MAKE_JOBS} > 8 ? 8 : ${COOKBOOK_MAKE_JOBS} ))"
 
 export TARGET="framebuffer"
-export CFLAGS="${CFLAGS} -I${PWD}/inst-${TARGET}/include"
+export CFLAGS="${CFLAGS} ${CPPFLAGS} -I${PWD}/inst-${TARGET}/include"
 export LDFLAGS="${LDFLAGS} -L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"
 # nghttp2 is not linked for some reason
 export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
diff --git a/src/cook/script.rs b/src/cook/script.rs
index 66ffbf96..9cf21e9d 100644
--- a/src/cook/script.rs
+++ b/src/cook/script.rs
@@ -94,8 +94,7 @@ export CARGO_TARGET_DIR="${COOKBOOK_BUILD}/target"
 
 # This adds the sysroot includes for most C compilation
 #TODO: check paths for spaces!
-export CFLAGS="-I${COOKBOOK_SYSROOT}/include"
-export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include"
+export CPPFLAGS="$CPPFLAGS -I${COOKBOOK_SYSROOT}/include"
 
 # This adds the sysroot libraries and compiles binaries statically for most C compilation
 #TODO: check paths for spaces!
@@ -121,7 +120,6 @@ then
     install_flags=--debug
     build_flags=
     build_type=debug
-    export CFLAGS="${CFLAGS} -g"
     export CPPFLAGS="${CPPFLAGS} -g"
 fi
 
@@ -229,6 +227,12 @@ set(CMAKE_SYSTEM_NAME ${SYSTEM_NAME})
 set(CMAKE_SYSTEM_PROCESSOR ${arch})
 EOF
 
+    if [ "$target" = "$TARGET" ]
+    then
+        echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
+        echo "set(CMAKE_CXX_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
+    fi
+
     if [ -n "${CC_WRAPPER}" ]
     then
         echo "set(CMAKE_C_COMPILER_LAUNCHER ${CC_WRAPPER})" >> $file
@@ -291,9 +295,9 @@ function cookbook_meson {
     echo "[properties]" >> cross_file.txt
     echo "needs_exe_wrapper = true" >> cross_file.txt
     echo "sys_root = '${COOKBOOK_SYSROOT}'" >> cross_file.txt
-    echo "c_args = [$(printf "'%s', " $CFLAGS | sed 's/, $//')]" >> cross_file.txt
-    echo "cpp_args = [$(printf "'%s', " $CPPFLAGS | sed 's/, $//')]" >> cross_file.txt
-    echo "c_link_args = [$(printf "'%s', " $LDFLAGS | sed 's/, $//')]" >> cross_file.txt
+    echo "c_args = [$(printf "'%s', " "$CFLAGS $CPPFLAGS" | sed 's/, $//')]" >> cross_file.txt
+    echo "cpp_args = [$(printf "'%s', " "$CXXFLAGS $CPPFLAGS" | sed 's/, $//')]" >> cross_file.txt
+    echo "c_link_args = [$(printf "'%s', " "$LDFLAGS" | sed 's/, $//')]" >> cross_file.txt
 
     unset AR
     unset AS