diff --git a/contrib/devtools/BGL-tidy/BGL-tidy.cpp b/contrib/devtools/BGL-tidy/BGL-tidy.cpp
index b7a5e1b922..76c8c4aa43 100644
--- a/contrib/devtools/BGL-tidy/BGL-tidy.cpp
+++ b/contrib/devtools/BGL-tidy/BGL-tidy.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "logprintf.h"
+#include <logprintf.h>
 
 #include <clang-tidy/ClangTidyModule.h>
 #include <clang-tidy/ClangTidyModuleRegistry.h>
diff --git a/contrib/devtools/BGL-tidy/logprintf.cpp b/contrib/devtools/BGL-tidy/logprintf.cpp
index f963f8c921..9c0c33227f 100644
--- a/contrib/devtools/BGL-tidy/logprintf.cpp
+++ b/contrib/devtools/BGL-tidy/logprintf.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "logprintf.h"
+#include <logprintf.h>
 
 #include <clang/AST/ASTContext.h>
 #include <clang/ASTMatchers/ASTMatchFinder.h>
diff --git a/src/assumptions.h b/src/assumptions.h
index 50c150f080..35cbed9eae 100644
--- a/src/assumptions.h
+++ b/src/assumptions.h
@@ -9,7 +9,7 @@
 
 #include <limits.h>
 
-#include "util.h"
+#include <util.h>
 
 /* This library, like most software, relies on a number of compiler implementation defined (but not undefined)
    behaviours. Although the behaviours we require are essentially universal we test them specifically here to
diff --git a/src/crc32c_arm64_check.h b/src/crc32c_arm64_check.h
index 6b80f70037..883a5092b7 100644
--- a/src/crc32c_arm64_check.h
+++ b/src/crc32c_arm64_check.h
@@ -11,7 +11,7 @@
 #include <cstdint>
 
 #ifdef CRC32C_HAVE_CONFIG_H
-#include "crc32c/crc32c_config.h"
+#include <crc32c/crc32c_config.h>
 #endif
 
 #if HAVE_ARM64_CRC32C
diff --git a/src/ecmult_compute_table_impl.h b/src/ecmult_compute_table_impl.h
index 69d59ce595..c7ddf4c017 100644
--- a/src/ecmult_compute_table_impl.h
+++ b/src/ecmult_compute_table_impl.h
@@ -7,11 +7,11 @@
 #ifndef SECP256K1_ECMULT_COMPUTE_TABLE_IMPL_H
 #define SECP256K1_ECMULT_COMPUTE_TABLE_IMPL_H
 
-#include "ecmult_compute_table.h"
-#include "group_impl.h"
-#include "field_impl.h"
-#include "ecmult.h"
-#include "util.h"
+#include <ecmult_compute_table.h>
+#include <group_impl.h>
+#include <field_impl.h>
+#include <ecmult.h>
+#include <util.h>
 
 static void secp256k1_ecmult_compute_table(secp256k1_ge_storage* table, int window_g, const secp256k1_gej* gen) {
     secp256k1_gej gj;
diff --git a/src/ecmult_gen_compute_table.h b/src/ecmult_gen_compute_table.h
index bd41803a87..69970a7507 100644
--- a/src/ecmult_gen_compute_table.h
+++ b/src/ecmult_gen_compute_table.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_ECMULT_GEN_COMPUTE_TABLE_H
 #define SECP256K1_ECMULT_GEN_COMPUTE_TABLE_H
 
-#include "ecmult_gen.h"
+#include <ecmult_gen.h>
 
 static void secp256k1_ecmult_gen_compute_table(secp256k1_ge_storage* table, const secp256k1_ge* gen, int blocks, int teeth, int spacing);
 
diff --git a/src/ecmult_gen_compute_table_impl.h b/src/ecmult_gen_compute_table_impl.h
index 6aa8d84082..b7faa5f8c1 100644
--- a/src/ecmult_gen_compute_table_impl.h
+++ b/src/ecmult_gen_compute_table_impl.h
@@ -7,12 +7,12 @@
 #ifndef SECP256K1_ECMULT_GEN_COMPUTE_TABLE_IMPL_H
 #define SECP256K1_ECMULT_GEN_COMPUTE_TABLE_IMPL_H
 
-#include "ecmult_gen_compute_table.h"
-#include "group_impl.h"
-#include "field_impl.h"
-#include "scalar_impl.h"
-#include "ecmult_gen.h"
-#include "util.h"
+#include <ecmult_gen_compute_table.h>
+#include <group_impl.h>
+#include <field_impl.h>
+#include <scalar_impl.h>
+#include <ecmult_gen.h>
+#include <util.h>
 
 static void secp256k1_ecmult_gen_compute_table(secp256k1_ge_storage* table, const secp256k1_ge* gen, int blocks, int teeth, int spacing) {
     size_t points = ((size_t)1) << (teeth - 1);
diff --git a/src/hash.h b/src/hash.h
index ae642f0b4b..7047cfb5b0 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "logging.h"
+#include <logging.h>
 
 extern "C" {
 #include <crypto/sha3/sha3.h>
diff --git a/src/hsort_impl.h b/src/hsort_impl.h
index 1c674ff1c4..011e024ea4 100644
--- a/src/hsort_impl.h
+++ b/src/hsort_impl.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_HSORT_IMPL_H
 #define SECP256K1_HSORT_IMPL_H
 
-#include "hsort.h"
+#include <hsort.h>
 
 /* An array is a heap when, for all non-zero indexes i, the element at index i
  * compares as less than or equal to the element at index parent(i) = (i-1)/2.
diff --git a/src/int128.h b/src/int128.h
index 5355fbfae0..b1a8648b1e 100644
--- a/src/int128.h
+++ b/src/int128.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_INT128_H
 #define SECP256K1_INT128_H
 
-#include "util.h"
+#include <util.h>
 
 #if defined(SECP256K1_WIDEMUL_INT128)
 #  if defined(SECP256K1_INT128_NATIVE)
diff --git a/src/int128_native_impl.h b/src/int128_native_impl.h
index 7f02e1590b..2a49c4923d 100644
--- a/src/int128_native_impl.h
+++ b/src/int128_native_impl.h
@@ -1,8 +1,8 @@
 #ifndef SECP256K1_INT128_NATIVE_IMPL_H
 #define SECP256K1_INT128_NATIVE_IMPL_H
 
-#include "int128.h"
-#include "util.h"
+#include <int128.h>
+#include <util.h>
 
 static SECP256K1_INLINE void secp256k1_u128_load(secp256k1_uint128 *r, uint64_t hi, uint64_t lo) {
     *r = (((uint128_t)hi) << 64) + lo;
diff --git a/src/int128_struct_impl.h b/src/int128_struct_impl.h
index 962a71d13b..883849c94c 100644
--- a/src/int128_struct_impl.h
+++ b/src/int128_struct_impl.h
@@ -1,8 +1,8 @@
 #ifndef SECP256K1_INT128_STRUCT_IMPL_H
 #define SECP256K1_INT128_STRUCT_IMPL_H
 
-#include "int128.h"
-#include "util.h"
+#include <int128.h>
+#include <util.h>
 
 #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) /* MSVC */
 #    include <intrin.h>
diff --git a/src/precomputed_ecmult.h b/src/precomputed_ecmult.h
index 17df102967..a96c6a772d 100644
--- a/src/precomputed_ecmult.h
+++ b/src/precomputed_ecmult.h
@@ -11,8 +11,8 @@
 extern "C" {
 #endif
 
-#include "ecmult.h"
-#include "group.h"
+#include <ecmult.h>
+#include <group.h>
 #if defined(EXHAUSTIVE_TEST_ORDER)
 #    if EXHAUSTIVE_TEST_ORDER == 7
 #        define WINDOW_G 3
diff --git a/src/precomputed_ecmult_gen.h b/src/precomputed_ecmult_gen.h
index 283738a5ce..c1e3bffffd 100644
--- a/src/precomputed_ecmult_gen.h
+++ b/src/precomputed_ecmult_gen.h
@@ -11,8 +11,8 @@
 extern "C" {
 #endif
 
-#include "group.h"
-#include "ecmult_gen.h"
+#include <group.h>
+#include <ecmult_gen.h>
 #ifdef EXHAUSTIVE_TEST_ORDER
 static secp256k1_ge_storage secp256k1_ecmult_gen_prec_table[COMB_BLOCKS][COMB_POINTS];
 #else
diff --git a/src/selftest.h b/src/selftest.h
index 0e37510c1e..2077ea9202 100644
--- a/src/selftest.h
+++ b/src/selftest.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_SELFTEST_H
 #define SECP256K1_SELFTEST_H
 
-#include "hash.h"
+#include <hash.h>
 
 #include <string.h>
 
diff --git a/src/span.h b/src/span.h
index 65d5b55741..74f43e180a 100644
--- a/src/span.h
+++ b/src/span.h
@@ -10,8 +10,6 @@
 #include <cstddef>
 #include <span>
 #include <type_traits>
-#include <cstddef>
-#include <algorithm>
 #include <assert.h>
 
 #ifdef DEBUG
diff --git a/src/testutil.h b/src/testutil.h
index 8296a5fb99..eac850bca2 100644
--- a/src/testutil.h
+++ b/src/testutil.h
@@ -6,10 +6,10 @@
 #ifndef SECP256K1_TESTUTIL_H
 #define SECP256K1_TESTUTIL_H
 
-#include "field.h"
-#include "group.h"
-#include "testrand.h"
-#include "util.h"
+#include <field.h>
+#include <group.h>
+#include <testrand.h>
+#include <util.h>
 
 static void testutil_random_fe(secp256k1_fe *x) {
     unsigned char bin[32];
diff --git a/test/lint/lint-includes.py b/test/lint/lint-includes.py
index 81ed4c0840..90884299d5 100755
--- a/test/lint/lint-includes.py
+++ b/test/lint/lint-includes.py
@@ -30,7 +30,6 @@
                            "boost/multi_index/tag.hpp",
                            "boost/multi_index_container.hpp",
                            "boost/operators.hpp",
-                           "boost/process.hpp",
                            "boost/signals2/connection.hpp",
                            "boost/signals2/optional_last_value.hpp",
                            "boost/signals2/signal.hpp",