diff --git a/src/amd/vulkan/tests/helpers.h b/src/amd/vulkan/tests/helpers.h
index ffdd7a67912..5fc2ffce8c0 100644
--- a/src/amd/vulkan/tests/helpers.h
+++ b/src/amd/vulkan/tests/helpers.h
@@ -13,6 +13,8 @@
 #include <string>
 #include <unordered_map>
 
+#include "util/os_misc.h"
+
 #define FUNCTION_LIST                                                                                                  \
    ITEM(CreateInstance)                                                                                                \
    ITEM(DestroyInstance)                                                                                               \
diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c
index a7cb8413e48..3d1ccb0eda0 100644
--- a/src/asahi/lib/decode.c
+++ b/src/asahi/lib/decode.c
@@ -1022,7 +1022,7 @@ agxdecode_dump_file_open(void)
       return;
 
    /* This does a os_get_option every frame, so it is possible to use
-    * setenv to change the base at runtime.
+    * os_set_option to change the base at runtime.
     */
    const char *dump_file_base =
       os_get_option("AGXDECODE_DUMP_FILE") ?: "agxdecode.dump";
diff --git a/src/freedreno/decode/pager.c b/src/freedreno/decode/pager.c
index 11a7649b6c7..e967a61da0a 100644
--- a/src/freedreno/decode/pager.c
+++ b/src/freedreno/decode/pager.c
@@ -13,6 +13,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include "util/os_misc.h"
+
 #include "pager.h"
 
 static pid_t pager_pid;
diff --git a/src/nouveau/drm-shim/nouveau_noop.c b/src/nouveau/drm-shim/nouveau_noop.c
index c87ff52b685..367962852bc 100644
--- a/src/nouveau/drm-shim/nouveau_noop.c
+++ b/src/nouveau/drm-shim/nouveau_noop.c
@@ -440,7 +440,7 @@ drm_shim_driver_init(void)
    nouveau_driver_get_device_info();
 
    /* Ask userspace to consider all fences completed. */
-   setenv("NOUVEAU_DISABLE_FENCES", "true", true);
+   os_set_option("NOUVEAU_DISABLE_FENCES", "true", true);
 
    /* nothing looks at the pci id, so fix it to a GTX 780 */
    static const char uevent_content[] =
diff --git a/src/panfrost/genxml/decode_common.c b/src/panfrost/genxml/decode_common.c
index 52c0b7ed96e..844e83ddb89 100644
--- a/src/panfrost/genxml/decode_common.c
+++ b/src/panfrost/genxml/decode_common.c
@@ -252,7 +252,7 @@ pandecode_dump_file_open(struct pandecode_context *ctx)
    simple_mtx_assert_locked(&ctx->lock);
 
    /* This does a os_get_option every frame, so it is possible to use
-    * setenv to change the base at runtime.
+    * os_set_option to change the base at runtime.
     */
    const char *dump_file_base =
       debug_get_option("PANDECODE_DUMP_FILE", "pandecode.dump");
diff --git a/src/util/disk_cache_os.h b/src/util/disk_cache_os.h
index 9c9253adc21..8950839e463 100644
--- a/src/util/disk_cache_os.h
+++ b/src/util/disk_cache_os.h
@@ -25,6 +25,7 @@
 #define DISK_CACHE_OS_H
 
 #include "util/u_queue.h"
+#include "util/disk_cache.h"
 
 #if DETECT_OS_WINDOWS
 
diff --git a/src/util/tests/cache_test.cpp b/src/util/tests/cache_test.cpp
index d1772f3240f..b0914b4a8a9 100644
--- a/src/util/tests/cache_test.cpp
+++ b/src/util/tests/cache_test.cpp
@@ -39,9 +39,10 @@
 #include <utime.h>
 
 #include "util/detect_os.h"
-#include "util/mesa-sha1.h"
-#include "util/disk_cache.h"
 #include "util/disk_cache_os.h"
+#include "util/disk_cache.h"
+#include "util/mesa-sha1.h"
+#include "util/os_misc.h"
 #include "util/ralloc.h"
 
 #ifdef FOZ_DB_UTIL_DYNAMIC_LIST
diff --git a/src/util/tests/xmlconfig.cpp b/src/util/tests/xmlconfig.cpp
index ed5a19c9857..8d081dc1895 100644
--- a/src/util/tests/xmlconfig.cpp
+++ b/src/util/tests/xmlconfig.cpp
@@ -23,7 +23,9 @@
 
 #include <gtest/gtest.h>
 #include <driconf.h>
-#include <xmlconfig.h>
+
+#include "util/xmlconfig.h"
+#include "util/os_misc.h"
 
 class xmlconfig_test : public ::testing::Test {
 protected: