diff --git a/builtins/web/crypto/crypto-algorithm.h b/builtins/web/crypto/crypto-algorithm.h
index d1a36c88..e8b7cac2 100644
--- a/builtins/web/crypto/crypto-algorithm.h
+++ b/builtins/web/crypto/crypto-algorithm.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_CRYPTO_ALGORITHM_H
-#define JS_COMPUTE_RUNTIME_CRYPTO_ALGORITHM_H
+#ifndef BUILTINS_WEB_CRYPTO_CRYPTO_ALGORITHM_H
+#define BUILTINS_WEB_CRYPTO_CRYPTO_ALGORITHM_H
 #include <span>
 
 #include "builtin.h"
diff --git a/builtins/web/crypto/crypto-key-ec-components.h b/builtins/web/crypto/crypto-key-ec-components.h
index 2b958794..e6667075 100644
--- a/builtins/web/crypto/crypto-key-ec-components.h
+++ b/builtins/web/crypto/crypto-key-ec-components.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_CRYPTO_KEY_EC_COMPONENTS_H
-#define JS_COMPUTE_RUNTIME_CRYPTO_KEY_EC_COMPONENTS_H
+#ifndef BUILTINS_WEB_CRYPTO_CRYPTO_KEY_EC_COMPONENTS_H
+#define BUILTINS_WEB_CRYPTO_CRYPTO_KEY_EC_COMPONENTS_H
 #include <string>
 #include <vector>
 
diff --git a/builtins/web/crypto/crypto-key-rsa-components.h b/builtins/web/crypto/crypto-key-rsa-components.h
index 6f031bc1..77c68256 100644
--- a/builtins/web/crypto/crypto-key-rsa-components.h
+++ b/builtins/web/crypto/crypto-key-rsa-components.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_CRYPTO_KEY_RSA_COMPONENTS_H
-#define JS_COMPUTE_RUNTIME_CRYPTO_KEY_RSA_COMPONENTS_H
+#ifndef BUILTINS_WEB_CRYPTO_CRYPTO_KEY_RSA_COMPONENTS_H
+#define BUILTINS_WEB_CRYPTO_CRYPTO_KEY_RSA_COMPONENTS_H
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/builtins/web/crypto/crypto-key.h b/builtins/web/crypto/crypto-key.h
index 44375271..b0a358ba 100644
--- a/builtins/web/crypto/crypto-key.h
+++ b/builtins/web/crypto/crypto-key.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_CRYPTO_KEY_H
-#define JS_COMPUTE_RUNTIME_CRYPTO_KEY_H
+#ifndef BUILTINS_WEB_CRYPTO_CRYPTO_KEY_H
+#define BUILTINS_WEB_CRYPTO_CRYPTO_KEY_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/crypto/crypto.h b/builtins/web/crypto/crypto.h
index 0e2c1963..254b0a8e 100644
--- a/builtins/web/crypto/crypto.h
+++ b/builtins/web/crypto/crypto.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_BUILTIN_CRYPTO_H
-#define JS_COMPUTE_RUNTIME_BUILTIN_CRYPTO_H
+#ifndef BUILTINS_WEB_CRYPTO_H
+#define BUILTINS_WEB_CRYPTO_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/crypto/json-web-key.h b/builtins/web/crypto/json-web-key.h
index 62e24e43..fad2ae67 100644
--- a/builtins/web/crypto/json-web-key.h
+++ b/builtins/web/crypto/json-web-key.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_JSON_WEB_KEY_H
-#define JS_COMPUTE_RUNTIME_JSON_WEB_KEY_H
+#ifndef BUILTINS_WEB_CRYPTO_JSON_WEB_KEY_H
+#define BUILTINS_WEB_CRYPTO_JSON_WEB_KEY_H
 #include "jsapi.h"
 #include <memory>
 #include <optional>
diff --git a/builtins/web/crypto/subtle-crypto.h b/builtins/web/crypto/subtle-crypto.h
index 54cfe17d..5f9354cd 100644
--- a/builtins/web/crypto/subtle-crypto.h
+++ b/builtins/web/crypto/subtle-crypto.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_SUBTLE_CRYPTO_H
-#define JS_COMPUTE_RUNTIME_SUBTLE_CRYPTO_H
+#ifndef BUILTINS_WEB_CRYPTO_SUBTLE_CRYPTO_H
+#define BUILTINS_WEB_CRYPTO_SUBTLE_CRYPTO_H
 
 #include "builtin.h"
 #include "crypto-algorithm.h"
diff --git a/builtins/web/dom-exception.h b/builtins/web/dom-exception.h
index 342ec8e9..11569cb9 100644
--- a/builtins/web/dom-exception.h
+++ b/builtins/web/dom-exception.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_BUILTIN_DOM_EXCEPTION_H
-#define JS_COMPUTE_RUNTIME_BUILTIN_DOM_EXCEPTION_H
+#ifndef BUILTINS_WEB_BUILTIN_DOM_EXCEPTION_H
+#define BUILTINS_WEB_BUILTIN_DOM_EXCEPTION_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/fetch/fetch_event.h b/builtins/web/fetch/fetch_event.h
index c1e95ed6..7fc2a412 100644
--- a/builtins/web/fetch/fetch_event.h
+++ b/builtins/web/fetch/fetch_event.h
@@ -1,5 +1,5 @@
-#ifndef BUILTINS_FETCH_EVENT_H
-#define BUILTINS_FETCH_EVENT_H
+#ifndef BUILTINS_WEB_FETCH_FETCH_EVENT_H
+#define BUILTINS_WEB_FETCH_FETCH_EVENT_H
 
 #include "builtin.h"
 #include "extension-api.h"
diff --git a/builtins/web/fetch/headers.h b/builtins/web/fetch/headers.h
index 50ae8737..aba1685b 100644
--- a/builtins/web/fetch/headers.h
+++ b/builtins/web/fetch/headers.h
@@ -1,5 +1,5 @@
-#ifndef BUILTINS_HEADERS_H
-#define BUILTINS_HEADERS_H
+#ifndef BUILTINS_WEB_FETCH_HEADERS_H
+#define BUILTINS_WEB_FETCH_HEADERS_H
 
 #include "builtin.h"
 #include "host_api.h"
diff --git a/builtins/web/fetch/request-response.h b/builtins/web/fetch/request-response.h
index 0a8400c3..15a5a524 100644
--- a/builtins/web/fetch/request-response.h
+++ b/builtins/web/fetch/request-response.h
@@ -1,5 +1,5 @@
-#ifndef BUILTIN_REQUEST_RESPONSE
-#define BUILTIN_REQUEST_RESPONSE
+#ifndef BUILTINS_WEB_FETCH_REQUEST_RESPONSE
+#define BUILTINS_WEB_FETCH_REQUEST_RESPONSE
 
 #include "fetch-errors.h"
 #include "headers.h"
diff --git a/builtins/web/performance.h b/builtins/web/performance.h
index 59670aeb..a94a2fa3 100644
--- a/builtins/web/performance.h
+++ b/builtins/web/performance.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_BUILTIN_PERFORMANCE_H
-#define JS_COMPUTE_RUNTIME_BUILTIN_PERFORMANCE_H
+#ifndef BUILTINS_WEB_BUILTIN_PERFORMANCE_H
+#define BUILTINS_WEB_BUILTIN_PERFORMANCE_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/queue-microtask.h b/builtins/web/queue-microtask.h
index 29ed75e0..4b190479 100644
--- a/builtins/web/queue-microtask.h
+++ b/builtins/web/queue-microtask.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_QUEUE_MICROTASK_H
-#define JS_COMPUTE_RUNTIME_QUEUE_MICROTASK_H
+#ifndef BUILTINS_WEB_QUEUE_MICROTASK_H
+#define BUILTINS_WEB_QUEUE_MICROTASK_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/compression-stream.h b/builtins/web/streams/compression-stream.h
index f21e60fd..e2085137 100644
--- a/builtins/web/streams/compression-stream.h
+++ b/builtins/web/streams/compression-stream.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_COMPRESSION_STREAM_H
-#define JS_COMPUTE_RUNTIME_COMPRESSION_STREAM_H
+#ifndef BUILTINS_WEB_STREAMS_COMPRESSION_STREAM_H
+#define BUILTINS_WEB_STREAMS_COMPRESSION_STREAM_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/decompression-stream.h b/builtins/web/streams/decompression-stream.h
index f608bb9a..ee4a3008 100644
--- a/builtins/web/streams/decompression-stream.h
+++ b/builtins/web/streams/decompression-stream.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_DECOMPRESSION_STREAM_H
-#define JS_COMPUTE_RUNTIME_DECOMPRESSION_STREAM_H
+#ifndef BUILTINS_WEB_STREAMS_DECOMPRESSION_STREAM_H
+#define BUILTINS_WEB_STREAMS_DECOMPRESSION_STREAM_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/native-stream-sink.h b/builtins/web/streams/native-stream-sink.h
index 258605d5..94c9c2c0 100644
--- a/builtins/web/streams/native-stream-sink.h
+++ b/builtins/web/streams/native-stream-sink.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_NATIVE_STREAM_SINK_H
-#define JS_COMPUTE_RUNTIME_NATIVE_STREAM_SINK_H
+#ifndef BUILTINS_WEB_STREAMS_NATIVE_STREAM_SINK_H
+#define BUILTINS_WEB_STREAMS_NATIVE_STREAM_SINK_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/native-stream-source.h b/builtins/web/streams/native-stream-source.h
index d07ec7bd..3c1ce6f9 100644
--- a/builtins/web/streams/native-stream-source.h
+++ b/builtins/web/streams/native-stream-source.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_NATIVE_STREAM_SOURCE_H
-#define JS_COMPUTE_RUNTIME_NATIVE_STREAM_SOURCE_H
+#ifndef BUILTINS_WEB_STREAMS_NATIVE_STREAM_SOURCE_H
+#define BUILTINS_WEB_STREAMS_NATIVE_STREAM_SOURCE_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/transform-stream-default-controller.h b/builtins/web/streams/transform-stream-default-controller.h
index 28022a3d..ad544852 100644
--- a/builtins/web/streams/transform-stream-default-controller.h
+++ b/builtins/web/streams/transform-stream-default-controller.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_TRANSFORM_STREAM_DEFAULT_CONTROLLER_H
-#define JS_COMPUTE_RUNTIME_TRANSFORM_STREAM_DEFAULT_CONTROLLER_H
+#ifndef BUILTINS_WEB_STREAMS_TRANSFORM_STREAM_DEFAULT_CONTROLLER_H
+#define BUILTINS_WEB_STREAMS_TRANSFORM_STREAM_DEFAULT_CONTROLLER_H
 
 #include "builtin.h"
 
diff --git a/builtins/web/streams/transform-stream.h b/builtins/web/streams/transform-stream.h
index 8d753bd2..982cbcb9 100644
--- a/builtins/web/streams/transform-stream.h
+++ b/builtins/web/streams/transform-stream.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_TRANSFORM_STREAM_H
-#define JS_COMPUTE_RUNTIME_TRANSFORM_STREAM_H
+#ifndef BUILTINS_WEB_STREAMS_TRANSFORM_STREAM_H
+#define BUILTINS_WEB_STREAMS_TRANSFORM_STREAM_H
 
 #include "builtin.h"
 // #include "js-compute-builtins.h"
diff --git a/builtins/web/structured-clone.h b/builtins/web/structured-clone.h
index 3a6348e6..779b30b7 100644
--- a/builtins/web/structured-clone.h
+++ b/builtins/web/structured-clone.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_STRUCTURED_CLONE_H
-#define JS_COMPUTE_RUNTIME_STRUCTURED_CLONE_H
+#ifndef BUILTINS_WEB_STRUCTURED_CLONE_H
+#define BUILTINS_WEB_STRUCTURED_CLONE_H
 
 #include "builtin.h"
 #include "js/StructuredClone.h"
diff --git a/builtins/web/worker-location.h b/builtins/web/worker-location.h
index 4c1d33b9..df054a32 100644
--- a/builtins/web/worker-location.h
+++ b/builtins/web/worker-location.h
@@ -1,5 +1,5 @@
-#ifndef JS_COMPUTE_RUNTIME_WORKER_LOCATION_H
-#define JS_COMPUTE_RUNTIME_WORKER_LOCATION_H
+#ifndef BUILTINS_WEB_WORKER_LOCATION_H
+#define BUILTINS_WEB_WORKER_LOCATION_H
 
 #include "builtin.h"