diff --git a/.config b/.config
index bea90a28a9..8e2a6d042b 100644
--- a/.config
+++ b/.config
@@ -1,3 +1,3 @@
 PODMAN_BUILD?=0
 REDBEAR_ALLOW_PROTECTED_FETCH=1
-COOKBOOK_MAKE_JOBS=16
+COOKBOOK_MAKE_JOBS=8
diff --git a/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt b/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt
index a64c7d46ac..b4ab9fe6ca 100644
--- a/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt
+++ b/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt
@@ -1278,6 +1278,20 @@ qt_internal_extend_target(Core CONDITION REDOX
         io/qstorageinfo_unix.cpp
 )
 
+# Redox: POSIX statvfs, not Linux statfs
+qt_internal_extend_target(Core CONDITION REDOX
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
+# Redox: POSIX statvfs, not Linux statfs
+qt_internal_extend_target(Core CONDITION REDOX
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
 qt_internal_extend_target(Core CONDITION QT_FEATURE_cpp_winrt
     SOURCES
         platform/windows/qfactorycacheregistration_p.h
@@ -1383,6 +1397,20 @@ qt_internal_extend_target(Core CONDITION REDOX
         io/qstorageinfo_unix.cpp
 )
 
+# Redox: POSIX statvfs, not Linux statfs
+qt_internal_extend_target(Core CONDITION REDOX
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
+# Redox: POSIX statvfs, not Linux statfs
+qt_internal_extend_target(Core CONDITION REDOX
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
 qt_internal_extend_target(Core CONDITION QT_FEATURE_itemmodel
     SOURCES
         itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h
diff --git a/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h b/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h
index 11d19e7af4..c603ba7de4 100644
--- a/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h
+++ b/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h
@@ -188,6 +188,8 @@ static_assert(std::is_signed_v<qint128>,
 #include <assert.h>
 #include <assert.h>
 #include <assert.h>
+#include <assert.h>
+#include <assert.h>
 #ifndef static_assert
 #define static_assert _Static_assert
 #endif
diff --git a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp
index 15e8f140e1..23745b3a3d 100644
--- a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp
+++ b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp
@@ -1132,6 +1132,8 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
 #ifdef IPV6_HOPLIMIT
 #ifdef IPV6_HOPLIMIT
 #ifdef IPV6_HOPLIMIT
+#ifdef IPV6_HOPLIMIT
+#ifdef IPV6_HOPLIMIT
 #ifdef IPV6_HOPLIMIT
         if (header.hopLimit != -1) {
             msg.msg_controllen += CMSG_SPACE(sizeof(int));
@@ -1151,6 +1153,8 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
 #endif
 #endif
 #endif
+#endif
+#endif
 #endif
         if (header.ifindex != 0 || !header.senderAddress.isNull()) {
             struct in6_pktinfo *data = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr));
diff --git a/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h b/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h
index b8c6801ec1..8941edc5cc 100644
--- a/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h
+++ b/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h
@@ -32,6 +32,8 @@
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
+#include <sys/ioctl.h>
+#include <sys/ioctl.h>
 #include <netinet/in.h>
 
 #if defined(Q_OS_VXWORKS)
diff --git a/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h b/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
index fa9c85dfb5..1193d9fd66 100644
--- a/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
+++ b/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
@@ -62,6 +62,8 @@ public:
 #if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
+#if QT_CONFIG(opengl)
+#if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
     virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0;
 #endif /* QT_CONFIG(opengl) */
@@ -74,6 +76,8 @@ public:
 #endif /* QT_CONFIG(opengl) */
 #endif /* QT_CONFIG(opengl) */
 #endif /* QT_CONFIG(opengl) */
+#endif /* QT_CONFIG(opengl) */
+#endif /* QT_CONFIG(opengl) */
 #endif /* QT_CONFIG(opengl) */
     virtual bool canCreatePlatformOffscreenSurface() const { return false; }
 #if QT_CONFIG(opengl)
@@ -97,6 +101,8 @@ public:
 #if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
+#if QT_CONFIG(opengl)
+#if QT_CONFIG(opengl)
 #if QT_CONFIG(opengl)
     virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; }
 #endif /* QT_CONFIG(opengl) */
@@ -110,6 +116,8 @@ public:
 #endif /* QT_CONFIG(opengl) */
 #endif /* QT_CONFIG(opengl) */
 #endif /* QT_CONFIG(opengl) */
+#endif /* QT_CONFIG(opengl) */
+#endif /* QT_CONFIG(opengl) */
 };
 
 }