Merge pull request #2526 from cloudflare/dlapid/cleaner-includes

Fix some incorrect include statements.

src/workerd/api/crypto/x509.c++

@@ -1,8 +1,8 @@
 #include "impl.h"
 #include "x509.h"
-#include "openssl/bio.h"
-#include "openssl/pem.h"
-#include "openssl/x509v3.h"
+#include <openssl/bio.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
 
 KJ_DECLARE_NON_POLYMORPHIC(STACK_OF(ASN1_OBJECT));
 

src/workerd/api/gpu/gpu-adapter.c++

@@ -7,7 +7,7 @@
 #include "gpu-device.h"
 #include "gpu-supported-features.h"
 #include "gpu-supported-limits.h"
-#include "workerd/jsg/exception.h"
+#include <workerd/jsg/exception.h>
 
 #define WGPU_FOR_EACH_LIMIT(X)                                                                     \
   X(maxTextureDimension1D)                                                                         \

src/workerd/api/gpu/gpu-async-runner.c++

@@ -3,7 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu-async-runner.h"
-#include "workerd/io/io-context.h"
+#include <workerd/io/io-context.h>
 #include <kj/common.h>
 #include <kj/debug.h>
 

src/workerd/api/gpu/gpu-buffer.c++

@@ -3,8 +3,8 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu-buffer.h"
-#include "workerd/jsg/exception.h"
-#include "workerd/jsg/jsg.h"
+#include <workerd/jsg/exception.h>
+#include <workerd/jsg/jsg.h>
 
 namespace workerd::api::gpu {
 

src/workerd/api/gpu/gpu-device.c++

@@ -14,8 +14,8 @@
 #include "gpu-sampler.h"
 #include "gpu-texture.h"
 #include "gpu-utils.h"
-#include "workerd/jsg/exception.h"
-#include "workerd/jsg/jsg.h"
+#include <workerd/jsg/exception.h>
+#include <workerd/jsg/jsg.h>
 
 namespace workerd::api::gpu {
 

src/workerd/api/gpu/gpu-device.h

@@ -20,7 +20,7 @@
 #include "gpu-supported-features.h"
 #include "gpu-supported-limits.h"
 #include "gpu-texture.h"
-#include "workerd/jsg/promise.h"
+#include <workerd/jsg/promise.h>
 #include <dawn/native/DawnNative.h>
 #include <webgpu/webgpu_cpp.h>
 #include <workerd/api/basics.h>

src/workerd/api/gpu/gpu-query-set.c++

@@ -3,7 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu-query-set.h"
-#include "workerd/jsg/exception.h"
+#include <workerd/jsg/exception.h>
 
 namespace workerd::api::gpu {
 

src/workerd/api/gpu/gpu-queue.c++

@@ -3,7 +3,8 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu-queue.h"
-#include "workerd/jsg/exception.h"
+#include <workerd/jsg/exception.h>
+
 
 namespace workerd::api::gpu {
 

src/workerd/api/gpu/gpu-texture-view.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "gpu-utils.h"
-#include "workerd/jsg/iterator.h"
+#include <workerd/jsg/iterator.h>
 #include <webgpu/webgpu_cpp.h>
 #include <workerd/jsg/buffersource.h>
 #include <workerd/jsg/jsg.h>

src/workerd/api/gpu/gpu-texture.c++

@@ -3,10 +3,10 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu-texture.h"
-#include "workerd/api/gpu/gpu-texture-view.h"
-#include "workerd/api/gpu/gpu-utils.h"
-#include "workerd/jsg/exception.h"
-#include "workerd/jsg/jsg.h"
+#include <workerd/api/gpu/gpu-texture-view.h>
+#include <workerd/api/gpu/gpu-utils.h>
+#include <workerd/jsg/exception.h>
+#include <workerd/jsg/jsg.h>
 
 namespace workerd::api::gpu {
 

src/workerd/api/gpu/gpu-texture.h

@@ -6,7 +6,7 @@
 
 #include "gpu-texture-view.h"
 #include "gpu-utils.h"
-#include "workerd/jsg/iterator.h"
+#include <workerd/jsg/iterator.h>
 #include <webgpu/webgpu_cpp.h>
 #include <workerd/jsg/buffersource.h>
 #include <workerd/jsg/jsg.h>

src/workerd/api/gpu/gpu.c++

@@ -3,7 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "gpu.h"
-#include "workerd/jsg/exception.h"
+#include <workerd/jsg/exception.h>
 #include <dawn/dawn_proc.h>
 
 namespace workerd::api::gpu {

src/workerd/api/html-rewriter.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "workerd/api/http.h"
+#include <workerd/api/http.h>
 #include <workerd/jsg/jsg.h>
 #include <v8.h>
 

src/workerd/api/node/i18n.h

@@ -8,7 +8,7 @@
 #include <kj/one-of.h>
 #include <kj/string.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 struct UConverter;
 

src/workerd/api/node/zlib-util.h

@@ -9,7 +9,7 @@
 #include "zlib.h"
 
 #include <limits>
-#include <stdint.h>
+#include <cstdint>
 
 namespace workerd::api::node {
 

src/workerd/api/pyodide/pyodide.c++

@@ -1,9 +1,9 @@
 #include "pyodide.h"
 #include <kj/string.h>
 #include <workerd/util/string-buffer.h>
-#include "kj/array.h"
-#include "kj/common.h"
-#include "kj/debug.h"
+#include <kj/array.h>
+#include <kj/common.h>
+#include <kj/debug.h>
 
 namespace workerd::api::pyodide {
 

src/workerd/api/pyodide/pyodide.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "kj/array.h"
-#include "kj/debug.h"
+#include <kj/array.h>
+#include <kj/debug.h>
 #include <kj/common.h>
 #include <kj/filesystem.h>
 #include <pyodide/generated/pyodide_extra.capnp.h>
@@ -12,7 +12,7 @@
 #include <workerd/server/workerd.capnp.h>
 #include <workerd/io/io-context.h>
 #include <workerd/util/autogate.h>
-#include "capnp/serialize.h"
+#include <capnp/serialize.h>
 
 namespace workerd::api::pyodide {
 

src/workerd/api/r2-bucket.c++

@@ -7,7 +7,7 @@
 #include "r2-rpc.h"
 #include "util.h"
 #include <array>
-#include <math.h>
+#include <cmath>
 #include <workerd/api/http.h>
 #include <workerd/api/streams.h>
 #include <workerd/util/mimetype.h>

src/workerd/api/r2-multipart.c++

@@ -6,7 +6,7 @@
 #include "r2-bucket.h"
 #include "r2-rpc.h"
 #include <array>
-#include <math.h>
+#include <cmath>
 #include <kj/compat/http.h>
 #include <capnp/message.h>
 #include <capnp/compat/json.h>

src/workerd/api/sql.c++

@@ -4,7 +4,7 @@
 
 #include "sql.h"
 #include "actor-state.h"
-#include "workerd/io/io-context.h"
+#include <workerd/io/io-context.h>
 
 namespace workerd::api {
 

src/workerd/api/url-standard.c++

@@ -9,7 +9,7 @@
 #include <kj/array.h>
 #include <cmath>
 #include <map>
-#include <string.h>
+#include <cstring>
 #include <unicode/ustring.h>
 #include <unicode/uchar.h>
 #include <unicode/uidna.h>

src/workerd/api/web-socket.h

@@ -9,7 +9,7 @@
 #include "basics.h"
 #include <workerd/io/io-context.h>
 #include <workerd/util/weak-refs.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace workerd {
   class ActorObserver;

src/workerd/io/compatibility-date.c++

@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include <stdio.h>
+#include <cstdio>
 #include "compatibility-date.h"
 #include "time.h"
 #include <capnp/schema.h>

src/workerd/io/worker.c++

@@ -34,7 +34,7 @@
 #include <v8-inspector.h>
 #include <v8-profiler.h>
 #include <map>
-#include <time.h>
+#include <ctime>
 #include <numeric>
 
 #if _WIN32

src/workerd/io/worker.h

@@ -5,7 +5,7 @@
 #pragma once
 // Classes to manage lifetime of workers, scripts, and isolates.
 
-#include "workerd/util/xthreadnotifier.h"
+#include <workerd/util/xthreadnotifier.h>
 #include <workerd/io/worker-interface.h>
 #include <workerd/io/limit-enforcer.h>
 #include <kj/compat/http.h>

src/workerd/jsg/jsg.c++

@@ -4,7 +4,7 @@
 
 #include "jsg.h"
 #include "setup.h"
-#include "workerd/jsg/util.h"
+#include <workerd/jsg/util.h>
 #include <workerd/util/thread-scopes.h>
 
 namespace workerd::jsg {

src/workerd/jsg/rtti-test.c++

@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "workerd/jsg/jsg.h"
+#include <workerd/jsg/jsg.h>
 #include <capnp/message.h>
 #include <capnp/serialize-text.h>
 #include <kj/test.h>

src/workerd/jsg/setup.h

@@ -9,7 +9,7 @@
 #include "async-context.h"
 #include "type-wrapper.h"
 #include "v8-platform-wrapper.h"
-#include "v8-profiler.h"
+#include <v8-profiler.h>
 #include <workerd/util/batch-queue.h>
 #include <kj/map.h>
 #include <kj/mutex.h>

src/workerd/jsg/util.c++

@@ -6,7 +6,7 @@
 #include "setup.h"
 #include "ser.h"
 #include <kj/debug.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #if !_WIN32
 #include <cxxabi.h>

src/workerd/server/server-test.c++

@@ -9,7 +9,7 @@
 #include <workerd/jsg/setup.h>
 #include <kj/async-queue.h>
 #include <regex>
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace workerd::server {
 namespace {

src/workerd/server/server.c++

@@ -20,7 +20,7 @@
 #include <workerd/io/compatibility-date.h>
 #include <workerd/io/io-context.h>
 #include <workerd/io/worker.h>
-#include <time.h>
+#include <ctime>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <workerd/io/actor-cache.h>
@@ -33,9 +33,9 @@
 #include <workerd/util/use-perfetto-categories.h>
 #include <workerd/api/worker-rpc.h>
 #include "workerd-api.h"
-#include "workerd/api/pyodide/pyodide.h"
-#include "workerd/io/hibernation-manager.h"
-#include <stdlib.h>
+#include <workerd/api/pyodide/pyodide.h>
+#include <workerd/io/hibernation-manager.h>
+#include <cstdlib>
 
 namespace workerd::server {
 

src/workerd/server/v8-platform-impl.c++

@@ -3,7 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "v8-platform-impl.h"
-#include "kj/time.h"
+#include <kj/time.h>
 
 namespace workerd::server {
 

src/workerd/tests/bench-json.c++

@@ -6,7 +6,7 @@
 #include <workerd/tests/bench-tools.h>
 #include <workerd/api/r2-api.capnp.h>
 #include <capnp/message.h>
-#include "capnp/compat/json.h"
+#include <capnp/compat/json.h>
 #include <kj/string.h>
 #include <kj/test.h>
 

src/workerd/util/autogate.c++

@@ -5,7 +5,7 @@
 #include <workerd/util/sentry.h>
 #include <capnp/message.h>
 #include <kj/common.h>
-#include "kj/debug.h"
+#include <kj/debug.h>
 
 namespace workerd::util {
 

src/workerd/util/autogate.h

@@ -3,7 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 #pragma once
 
-#include "kj/string.h"
+#include <kj/string.h>
 #include <capnp/blob.h>
 #include <capnp/list.h>
 #include <initializer_list>

src/workerd/util/color-util.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <kj/string.h>
 
 namespace workerd {
@@ -34,4 +34,4 @@ static ColorMode permitsColor() {
   }
 }
 
-}
+} // namespace workerd

src/workerd/util/sentry.h

@@ -11,7 +11,7 @@
 #include <kj/string.h>
 #include <kj/exception.h>
 #include <kj/time.h>
-#include <stdint.h>
+#include <cstdint>
 
 namespace workerd {
 

src/workerd/util/sqlite-test.c++

@@ -6,8 +6,8 @@
 #include <cstdint>
 #include <kj/test.h>
 #include <kj/thread.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cerrno>
 #include <fcntl.h>
 #include <atomic>
 

src/workerd/util/string-buffer-test.c++

@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-#include "workerd/util/string-buffer.h"
+#include "string-buffer.h"
 #include <kj/test.h>
 
 namespace workerd {