diff --git a/Makefile b/Makefile
index 0ca51a594..263a4b90c 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ SRCHEADERS_GENERIC=src/generic/numberparsing.h src/generic/stage1_find_marks.h s
 SRCHEADERS_ARM64=      src/arm64/bitmanipulation.h    src/arm64/bitmask.h    src/arm64/intrinsics.h    src/arm64/numberparsing.h    src/arm64/simd.h    src/arm64/stage1_find_marks.h    src/arm64/stage2_build_tape.h    src/arm64/stringparsing.h
 SRCHEADERS_HASWELL=  src/haswell/bitmanipulation.h  src/haswell/bitmask.h  src/haswell/intrinsics.h  src/haswell/numberparsing.h  src/haswell/simd.h  src/haswell/stage1_find_marks.h  src/haswell/stage2_build_tape.h  src/haswell/stringparsing.h
 SRCHEADERS_WESTMERE=src/westmere/bitmanipulation.h src/westmere/bitmask.h src/westmere/intrinsics.h src/westmere/numberparsing.h src/westmere/simd.h src/westmere/stage1_find_marks.h src/westmere/stage2_build_tape.h src/westmere/stringparsing.h
-SRCHEADERS_SRC=src/isadetection.h src/jsoncharutils.h src/simdprune_tables.h src/error.cpp src/jsonioutil.cpp src/implementation.cpp src/stage1_find_marks.cpp src/stage2_build_tape.cpp src/inline/document_parser_callbacks.h
+SRCHEADERS_SRC=src/isadetection.h src/jsoncharutils.h src/simdprune_tables.h src/error.cpp src/jsonioutil.cpp src/implementation.cpp src/stage1_find_marks.cpp src/stage2_build_tape.cpp src/document_parser_callbacks.h
 SRCHEADERS=$(SRCHEADERS_SRC) $(SRCHEADERS_GENERIC) $(SRCHEADERS_ARM64) $(SRCHEADERS_HASWELL) $(SRCHEADERS_WESTMERE)
 
 INCLUDEHEADERS=include/simdjson.h include/simdjson/common_defs.h include/simdjson/internal/jsonformatutils.h include/simdjson/jsonioutil.h include/simdjson/jsonminifier.h include/simdjson/jsonparser.h include/simdjson/padded_string.h include/simdjson/document.h include/simdjson/inline/document.h include/simdjson/document_iterator.h include/simdjson/inline/document_iterator.h include/simdjson/implementation.h include/simdjson/parsedjson.h include/simdjson/jsonstream.h include/simdjson/inline/jsonstream.h include/simdjson/portability.h include/simdjson/error.h include/simdjson/simdjson.h include/simdjson/simdjson_version.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 597698c5b..bfe7bf7fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ set(SIMDJSON_SRC_HEADERS
   haswell/stage1_find_marks.h
   haswell/stage2_build_tape.h
   haswell/stringparsing.h
-  inline/document_parser_callbacks.h
+  document_parser_callbacks.h
   westmere/bitmanipulation.h
   westmere/implementation.h
   westmere/intrinsics.h
diff --git a/src/arm64/bitmanipulation.h b/src/arm64/bitmanipulation.h
index 16429e49e..369e8cb69 100644
--- a/src/arm64/bitmanipulation.h
+++ b/src/arm64/bitmanipulation.h
@@ -1,8 +1,7 @@
 #ifndef SIMDJSON_ARM64_BITMANIPULATION_H
 #define SIMDJSON_ARM64_BITMANIPULATION_H
 
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
@@ -15,9 +14,10 @@ namespace simdjson::arm64 {
 // but the algorithms do not end up using the returned value.
 // Sadly, sanitizers are not smart enough to figure it out. 
 __attribute__((no_sanitize("undefined"))) // this is deliberate
-#endif
+#endif // _MSC_VER
 /* result might be undefined when input_num is zero */
 really_inline int trailing_zeroes(uint64_t input_num) {
+
 #ifdef _MSC_VER
   unsigned long ret;
   // Search the mask data from least significant bit (LSB) 
@@ -26,8 +26,9 @@ really_inline int trailing_zeroes(uint64_t input_num) {
   return (int)ret;
 #else
   return __builtin_ctzll(input_num);
-#endif// _MSC_VER
-}
+#endif // _MSC_VER
+
+} // namespace simdjson::arm64
 
 /* result might be undefined when input_num is zero */
 really_inline uint64_t clear_lowest_bit(uint64_t input_num) {
@@ -54,8 +55,7 @@ really_inline int hamming(uint64_t input_num) {
    return vaddv_u8(vcnt_u8((uint8x8_t)input_num));
 }
 
-really_inline bool add_overflow(uint64_t value1, uint64_t value2,
-                                uint64_t *result) {
+really_inline bool add_overflow(uint64_t value1, uint64_t value2, uint64_t *result) {
 #ifdef _MSC_VER
   // todo: this might fail under visual studio for ARM
   return _addcarry_u64(0, value1, value2,
@@ -70,20 +70,19 @@ really_inline bool add_overflow(uint64_t value1, uint64_t value2,
 #pragma intrinsic(_umul128) // todo: this might fail under visual studio for ARM
 #endif
 
-really_inline bool mul_overflow(uint64_t value1, uint64_t value2,
-                                uint64_t *result) {
+really_inline bool mul_overflow(uint64_t value1, uint64_t value2, uint64_t *result) {
 #ifdef _MSC_VER
   // todo: this might fail under visual studio for ARM
   uint64_t high;
   *result = _umul128(value1, value2, &high);
   return high;
 #else
-  return __builtin_umulll_overflow(value1, value2,
-                                   (unsigned long long *)result);
+  return __builtin_umulll_overflow(value1, value2, (unsigned long long *)result);
 #endif
 }
 
-}// namespace simdjson::arm64
+} // namespace simdjson::arm64
 
-#endif //IS_ARM64
-#endif //  SIMDJSON_ARM64_BITMANIPULATION_H
+#endif // IS_ARM64
+
+#endif // SIMDJSON_ARM64_BITMANIPULATION_H
diff --git a/src/arm64/bitmask.h b/src/arm64/bitmask.h
index dc0a0faf6..8ba86b1e8 100644
--- a/src/arm64/bitmask.h
+++ b/src/arm64/bitmask.h
@@ -1,11 +1,10 @@
 #ifndef SIMDJSON_ARM64_BITMASK_H
 #define SIMDJSON_ARM64_BITMASK_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
-#include "simdjson/common_defs.h"
 #include "arm64/intrinsics.h"
 
 namespace simdjson::arm64 {
diff --git a/src/arm64/implementation.h b/src/arm64/implementation.h
index 0f6d76445..fa3a3293e 100644
--- a/src/arm64/implementation.h
+++ b/src/arm64/implementation.h
@@ -1,11 +1,10 @@
-#ifndef __SIMDJSON_ARM64_IMPLEMENTATION_H
-#define __SIMDJSON_ARM64_IMPLEMENTATION_H
+#ifndef SIMDJSON_ARM64_IMPLEMENTATION_H
+#define SIMDJSON_ARM64_IMPLEMENTATION_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
-#include "simdjson/implementation.h"
 #include "isadetection.h"
 
 namespace simdjson::arm64 {
@@ -23,4 +22,4 @@ public:
 
 #endif // IS_ARM64
 
-#endif // __SIMDJSON_ARM64_IMPLEMENTATION_H
+#endif // SIMDJSON_ARM64_IMPLEMENTATION_H
diff --git a/src/arm64/intrinsics.h b/src/arm64/intrinsics.h
index 9dc12e625..9b7e0b368 100644
--- a/src/arm64/intrinsics.h
+++ b/src/arm64/intrinsics.h
@@ -1,9 +1,13 @@
 #ifndef SIMDJSON_ARM64_INTRINSICS_H
 #define SIMDJSON_ARM64_INTRINSICS_H
+
+#include <simdjson.h>
+
 #ifdef IS_ARM64
 
 // This should be the correct header whether
 // you use visual studio or other compilers.
 #include <arm_neon.h>
+
 #endif //   IS_ARM64
 #endif //  SIMDJSON_ARM64_INTRINSICS_H
diff --git a/src/arm64/numberparsing.h b/src/arm64/numberparsing.h
index b3b092e7d..f22119900 100644
--- a/src/arm64/numberparsing.h
+++ b/src/arm64/numberparsing.h
@@ -1,14 +1,13 @@
 #ifndef SIMDJSON_ARM64_NUMBERPARSING_H
 #define SIMDJSON_ARM64_NUMBERPARSING_H
 
+#include <simdjson.h>
+
 #ifdef IS_ARM64
 
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
+#include "jsoncharutils.h"
 #include "arm64/intrinsics.h"
 #include "arm64/bitmanipulation.h"
-#include "simdjson/inline/document.h"
-#include "jsoncharutils.h"
 #include <cmath>
 #include <limits>
 
diff --git a/src/arm64/simd.h b/src/arm64/simd.h
index b0a7a51e8..dfe85b1ce 100644
--- a/src/arm64/simd.h
+++ b/src/arm64/simd.h
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_ARM64_SIMD_H
 #define SIMDJSON_ARM64_SIMD_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
-#include "simdjson/common_defs.h"
-#include "simdjson/simdjson.h"
 #include "arm64/intrinsics.h"
 
 namespace simdjson::arm64::simd {
diff --git a/src/arm64/stage1_find_marks.h b/src/arm64/stage1_find_marks.h
index 1be1ea178..65af541fa 100644
--- a/src/arm64/stage1_find_marks.h
+++ b/src/arm64/stage1_find_marks.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_ARM64_STAGE1_FIND_MARKS_H
 #define SIMDJSON_ARM64_STAGE1_FIND_MARKS_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
diff --git a/src/arm64/stage2_build_tape.h b/src/arm64/stage2_build_tape.h
index 317d50185..3d3a3b9f6 100644
--- a/src/arm64/stage2_build_tape.h
+++ b/src/arm64/stage2_build_tape.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_ARM64_STAGE2_BUILD_TAPE_H
 #define SIMDJSON_ARM64_STAGE2_BUILD_TAPE_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
diff --git a/src/arm64/stringparsing.h b/src/arm64/stringparsing.h
index ae07c5ee3..a4931ce73 100644
--- a/src/arm64/stringparsing.h
+++ b/src/arm64/stringparsing.h
@@ -1,14 +1,12 @@
 #ifndef SIMDJSON_ARM64_STRINGPARSING_H
 #define SIMDJSON_ARM64_STRINGPARSING_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_ARM64
 
-#include "arm64/simd.h"
-#include "simdjson/common_defs.h"
-#include "simdjson/inline/document.h"
 #include "jsoncharutils.h"
+#include "arm64/simd.h"
 #include "arm64/intrinsics.h"
 #include "arm64/bitmanipulation.h"
 
@@ -47,4 +45,5 @@ really_inline parse_string_helper find_bs_bits_and_quote_bits(const uint8_t *src
 // namespace simdjson::amd64
 
 #endif // IS_ARM64
-#endif
+
+#endif // SIMDJSON_ARM64_STRINGPARSING_H
diff --git a/src/inline/document_parser_callbacks.h b/src/document_parser_callbacks.h
similarity index 99%
rename from src/inline/document_parser_callbacks.h
rename to src/document_parser_callbacks.h
index 84199dc70..f6354a66e 100644
--- a/src/inline/document_parser_callbacks.h
+++ b/src/document_parser_callbacks.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_DOCUMENT_PARSER_CALLBACKS_H
 #define SIMDJSON_DOCUMENT_PARSER_CALLBACKS_H
 
-#include "simdjson/document.h"
+#include <simdjson.h>
 
 namespace simdjson {
 
diff --git a/src/error.cpp b/src/error.cpp
index 671ea7d0e..0fedd63f4 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -1,4 +1,4 @@
-#include "simdjson/error.h"
+#include <simdjson.h>
 #include <map>
 
 namespace simdjson {
diff --git a/src/haswell/bitmanipulation.h b/src/haswell/bitmanipulation.h
index e1df2f60e..3acf7f864 100644
--- a/src/haswell/bitmanipulation.h
+++ b/src/haswell/bitmanipulation.h
@@ -1,9 +1,10 @@
 #ifndef SIMDJSON_HASWELL_BITMANIPULATION_H
 #define SIMDJSON_HASWELL_BITMANIPULATION_H
 
-#include "simdjson/common_defs.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
+
 #include "haswell/intrinsics.h"
 
 TARGET_HASWELL
@@ -74,5 +75,7 @@ really_inline bool mul_overflow(uint64_t value1, uint64_t value2,
 }
 }// namespace simdjson::haswell
 UNTARGET_REGION
-#endif
-#endif //  SIMDJSON_HASWELL_BITMANIPULATION_H
+
+#endif // IS_X86_64
+
+#endif // SIMDJSON_HASWELL_BITMANIPULATION_H
diff --git a/src/haswell/bitmask.h b/src/haswell/bitmask.h
index 131ee7e44..26fc040de 100644
--- a/src/haswell/bitmask.h
+++ b/src/haswell/bitmask.h
@@ -1,11 +1,10 @@
 #ifndef SIMDJSON_HASWELL_BITMASK_H
 #define SIMDJSON_HASWELL_BITMASK_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
 #include "haswell/intrinsics.h"
 
 TARGET_HASWELL
@@ -28,4 +27,5 @@ really_inline uint64_t prefix_xor(const uint64_t bitmask) {
 UNTARGET_REGION
 
 #endif // IS_X86_64
-#endif
+
+#endif // SIMDJSON_HASWELL_BITMASK_H
diff --git a/src/haswell/implementation.h b/src/haswell/implementation.h
index 8bb9f5cdc..c1dd6153a 100644
--- a/src/haswell/implementation.h
+++ b/src/haswell/implementation.h
@@ -1,11 +1,10 @@
-#ifndef __SIMDJSON_HASWELL_IMPLEMENTATION_H
-#define __SIMDJSON_HASWELL_IMPLEMENTATION_H
+#ifndef SIMDJSON_HASWELL_IMPLEMENTATION_H
+#define SIMDJSON_HASWELL_IMPLEMENTATION_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "simdjson/implementation.h"
 #include "isadetection.h"
 
 namespace simdjson::haswell {
@@ -27,4 +26,4 @@ public:
 
 #endif // IS_X86_64
 
-#endif // __SIMDJSON_HASWELL_IMPLEMENTATION_H
\ No newline at end of file
+#endif // SIMDJSON_HASWELL_IMPLEMENTATION_H
\ No newline at end of file
diff --git a/src/haswell/intrinsics.h b/src/haswell/intrinsics.h
index 8dcfc1811..93db0c035 100644
--- a/src/haswell/intrinsics.h
+++ b/src/haswell/intrinsics.h
@@ -1,12 +1,16 @@
 #ifndef SIMDJSON_HASWELL_INTRINSICS_H
 #define SIMDJSON_HASWELL_INTRINSICS_H
 
+#include <simdjson.h>
+
 #ifdef IS_X86_64
 
 #ifdef _MSC_VER
 #include <intrin.h> // visual studio
 #else
 #include <x86intrin.h> // elsewhere
-#endif //  _MSC_VER
-#endif //  IS_X86_64
-#endif //  SIMDJSON_HASWELL_INTRINSICS_H
+#endif // _MSC_VER
+
+#endif // IS_X86_64
+
+#endif // SIMDJSON_HASWELL_INTRINSICS_H
diff --git a/src/haswell/numberparsing.h b/src/haswell/numberparsing.h
index 88f1e0b66..bf26e4c51 100644
--- a/src/haswell/numberparsing.h
+++ b/src/haswell/numberparsing.h
@@ -1,18 +1,16 @@
 #ifndef SIMDJSON_HASWELL_NUMBERPARSING_H
 #define SIMDJSON_HASWELL_NUMBERPARSING_H
 
+#include <simdjson.h>
+
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
+#include "jsoncharutils.h"
 #include "haswell/intrinsics.h"
 #include "haswell/bitmanipulation.h"
-#include "simdjson/inline/document.h"
-#include "jsoncharutils.h"
 #include <cmath>
 #include <limits>
 
-
 #ifdef JSON_TEST_NUMBERS // for unit testing
 void found_invalid_number(const uint8_t *buf);
 void found_integer(int64_t result, const uint8_t *buf);
@@ -47,10 +45,6 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) {
 } // namespace simdjson::haswell
 UNTARGET_REGION
 
-
-
-
 #endif // IS_X86_64
 
-
-#endif //  SIMDJSON_HASWELL_NUMBERPARSING_H
+#endif // SIMDJSON_HASWELL_NUMBERPARSING_H
diff --git a/src/haswell/simd.h b/src/haswell/simd.h
index d9791253a..76a879d16 100644
--- a/src/haswell/simd.h
+++ b/src/haswell/simd.h
@@ -1,11 +1,10 @@
 #ifndef SIMDJSON_HASWELL_SIMD_H
 #define SIMDJSON_HASWELL_SIMD_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
 #include "haswell/intrinsics.h"
 
 TARGET_HASWELL
@@ -313,4 +312,5 @@ namespace simdjson::haswell::simd {
 UNTARGET_REGION
 
 #endif // IS_X86_64
+
 #endif // SIMDJSON_HASWELL_SIMD_H
diff --git a/src/haswell/stage1_find_marks.h b/src/haswell/stage1_find_marks.h
index 4ed0e2d6d..54f28453e 100644
--- a/src/haswell/stage1_find_marks.h
+++ b/src/haswell/stage1_find_marks.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_HASWELL_STAGE1_FIND_MARKS_H
 #define SIMDJSON_HASWELL_STAGE1_FIND_MARKS_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
@@ -56,4 +56,5 @@ WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, do
 UNTARGET_REGION
 
 #endif // IS_X86_64
+
 #endif // SIMDJSON_HASWELL_STAGE1_FIND_MARKS_H
diff --git a/src/haswell/stage2_build_tape.h b/src/haswell/stage2_build_tape.h
index 4dc8d977e..bfdebe65c 100644
--- a/src/haswell/stage2_build_tape.h
+++ b/src/haswell/stage2_build_tape.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_HASWELL_STAGE2_BUILD_TAPE_H
 #define SIMDJSON_HASWELL_STAGE2_BUILD_TAPE_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
diff --git a/src/haswell/stringparsing.h b/src/haswell/stringparsing.h
index 5a4ea5cf3..796922a29 100644
--- a/src/haswell/stringparsing.h
+++ b/src/haswell/stringparsing.h
@@ -1,14 +1,12 @@
 #ifndef SIMDJSON_HASWELL_STRINGPARSING_H
 #define SIMDJSON_HASWELL_STRINGPARSING_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "haswell/simd.h"
-#include "simdjson/common_defs.h"
-#include "simdjson/inline/document.h"
 #include "jsoncharutils.h"
+#include "haswell/simd.h"
 #include "haswell/intrinsics.h"
 #include "haswell/bitmanipulation.h"
 
@@ -44,4 +42,4 @@ UNTARGET_REGION
 
 #endif // IS_X86_64
 
-#endif
+#endif // SIMDJSON_HASWELL_STRINGPARSING_H
diff --git a/src/implementation.cpp b/src/implementation.cpp
index 652c8dcba..f8606e0cd 100644
--- a/src/implementation.cpp
+++ b/src/implementation.cpp
@@ -1,6 +1,4 @@
-#include "simdjson/portability.h"
-#include "isadetection.h"
-#include "simdjson/implementation.h"
+#include <simdjson.h>
 #include <initializer_list>
 
 // Static array of known implementations. We're hoping these get baked into the executable
diff --git a/src/jsoncharutils.h b/src/jsoncharutils.h
index 299f55bf6..28f206eae 100644
--- a/src/jsoncharutils.h
+++ b/src/jsoncharutils.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_JSONCHARUTILS_H
 #define SIMDJSON_JSONCHARUTILS_H
 
-#include "simdjson/common_defs.h"
+#include <simdjson.h>
 
 namespace simdjson {
 // structural chars here are
diff --git a/src/jsonioutil.cpp b/src/jsonioutil.cpp
index acf5cea19..dc2eeec3f 100644
--- a/src/jsonioutil.cpp
+++ b/src/jsonioutil.cpp
@@ -1,4 +1,4 @@
-#include "simdjson/jsonioutil.h"
+#include <simdjson.h>
 #include <cstdlib>
 #include <cstring>
 #include <climits>
diff --git a/src/jsonminifier.cpp b/src/jsonminifier.cpp
index cb821e78f..41b3706ff 100644
--- a/src/jsonminifier.cpp
+++ b/src/jsonminifier.cpp
@@ -1,4 +1,4 @@
-#include "simdjson/portability.h"
+#include <simdjson.h>
 #include <cstdint>
 
 #ifndef SIMDJSON_ISSUE384RESOLVED // to avoid tripping users
diff --git a/src/simdjson.cpp b/src/simdjson.cpp
index 5a7688db4..9cee8eab6 100644
--- a/src/simdjson.cpp
+++ b/src/simdjson.cpp
@@ -1,3 +1,4 @@
+#include <simdjson.h>
 #include "error.cpp"
 #include "implementation.cpp"
 #include "jsonioutil.cpp"
diff --git a/src/stage2_build_tape.cpp b/src/stage2_build_tape.cpp
index 891abf5a8..859a3bea1 100644
--- a/src/stage2_build_tape.cpp
+++ b/src/stage2_build_tape.cpp
@@ -1,11 +1,8 @@
+#include <simdjson.h>
 #include <cassert>
 #include <cstring>
-
-#include "simdjson/portability.h"
-#include "simdjson/common_defs.h"
 #include "jsoncharutils.h"
-#include "simdjson/inline/document.h"
-#include "inline/document_parser_callbacks.h"
+#include "document_parser_callbacks.h"
 
 using namespace simdjson;
 
diff --git a/src/westmere/bitmanipulation.h b/src/westmere/bitmanipulation.h
index 8bc75fb9c..61166ff3e 100644
--- a/src/westmere/bitmanipulation.h
+++ b/src/westmere/bitmanipulation.h
@@ -1,9 +1,10 @@
 #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H
 #define SIMDJSON_WESTMERE_BITMANIPULATION_H
 
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
+#include <simdjson.h>
+
 #ifdef IS_X86_64
+
 #include "westmere/intrinsics.h"
 
 TARGET_WESTMERE
@@ -86,5 +87,6 @@ really_inline bool mul_overflow(uint64_t value1, uint64_t value2,
 }// namespace simdjson::westmere
 UNTARGET_REGION
 
-#endif
-#endif //  SIMDJSON_WESTMERE_BITMANIPULATION_H
+#endif // IS_X86_64
+
+#endif // SIMDJSON_WESTMERE_BITMANIPULATION_H
diff --git a/src/westmere/bitmask.h b/src/westmere/bitmask.h
index ced065b52..b0e8f6ec2 100644
--- a/src/westmere/bitmask.h
+++ b/src/westmere/bitmask.h
@@ -1,11 +1,10 @@
 #ifndef SIMDJSON_WESTMERE_BITMASK_H
 #define SIMDJSON_WESTMERE_BITMASK_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
 #include "westmere/intrinsics.h"
 
 TARGET_WESTMERE
@@ -28,4 +27,5 @@ really_inline uint64_t prefix_xor(const uint64_t bitmask) {
 UNTARGET_REGION
 
 #endif // IS_X86_64
-#endif
+
+#endif // SIMDJSON_WESTMERE_BITMASK_H
diff --git a/src/westmere/implementation.h b/src/westmere/implementation.h
index a992152cd..853c151db 100644
--- a/src/westmere/implementation.h
+++ b/src/westmere/implementation.h
@@ -1,7 +1,7 @@
-#ifndef __SIMDJSON_WESTMERE_IMPLEMENTATION_H
-#define __SIMDJSON_WESTMERE_IMPLEMENTATION_H
+#ifndef SIMDJSON_WESTMERE_IMPLEMENTATION_H
+#define SIMDJSON_WESTMERE_IMPLEMENTATION_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
@@ -23,4 +23,4 @@ public:
 
 #endif // IS_X86_64
 
-#endif // __SIMDJSON_WESTMERE_IMPLEMENTATION_H
\ No newline at end of file
+#endif // SIMDJSON_WESTMERE_IMPLEMENTATION_H
\ No newline at end of file
diff --git a/src/westmere/intrinsics.h b/src/westmere/intrinsics.h
index b20718841..129bbd1bf 100644
--- a/src/westmere/intrinsics.h
+++ b/src/westmere/intrinsics.h
@@ -6,6 +6,7 @@
 #include <intrin.h> // visual studio
 #else
 #include <x86intrin.h> // elsewhere
-#endif //  _MSC_VER
-#endif //  IS_X86_64
-#endif //  SIMDJSON_WESTMERE_INTRINSICS_H
+#endif // _MSC_VER
+#endif // IS_X86_64
+
+#endif // SIMDJSON_WESTMERE_INTRINSICS_H
diff --git a/src/westmere/numberparsing.h b/src/westmere/numberparsing.h
index babfebc0f..6a1a28d63 100644
--- a/src/westmere/numberparsing.h
+++ b/src/westmere/numberparsing.h
@@ -1,17 +1,13 @@
 #ifndef SIMDJSON_WESTMERE_NUMBERPARSING_H
 #define SIMDJSON_WESTMERE_NUMBERPARSING_H
 
+#include <simdjson.h>
+
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
-#include "westmere/intrinsics.h"
-#include "simdjson/common_defs.h"
-#include "simdjson/portability.h"
+#include "jsoncharutils.h"
 #include "westmere/intrinsics.h"
 #include "westmere/bitmanipulation.h"
-#include "simdjson/inline/document.h"
-#include "jsoncharutils.h"
 #include <cmath>
 #include <limits>
 
diff --git a/src/westmere/simd.h b/src/westmere/simd.h
index c2b752fc8..8ec75444b 100644
--- a/src/westmere/simd.h
+++ b/src/westmere/simd.h
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_WESTMERE_SIMD_H
 #define SIMDJSON_WESTMERE_SIMD_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "simdjson/common_defs.h"
-#include "simdjson/simdjson.h"
 #include "westmere/intrinsics.h"
 
 TARGET_WESTMERE
diff --git a/src/westmere/stage1_find_marks.h b/src/westmere/stage1_find_marks.h
index 46a5ab79f..745a5b71a 100644
--- a/src/westmere/stage1_find_marks.h
+++ b/src/westmere/stage1_find_marks.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_WESTMERE_STAGE1_FIND_MARKS_H
 #define SIMDJSON_WESTMERE_STAGE1_FIND_MARKS_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
diff --git a/src/westmere/stage2_build_tape.h b/src/westmere/stage2_build_tape.h
index 14294f463..6571f1b04 100644
--- a/src/westmere/stage2_build_tape.h
+++ b/src/westmere/stage2_build_tape.h
@@ -1,7 +1,7 @@
 #ifndef SIMDJSON_WESTMERE_STAGE2_BUILD_TAPE_H
 #define SIMDJSON_WESTMERE_STAGE2_BUILD_TAPE_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
diff --git a/src/westmere/stringparsing.h b/src/westmere/stringparsing.h
index b6acd9508..717ad4012 100644
--- a/src/westmere/stringparsing.h
+++ b/src/westmere/stringparsing.h
@@ -1,14 +1,12 @@
 #ifndef SIMDJSON_WESTMERE_STRINGPARSING_H
 #define SIMDJSON_WESTMERE_STRINGPARSING_H
 
-#include "simdjson/portability.h"
+#include <simdjson.h>
 
 #ifdef IS_X86_64
 
-#include "westmere/simd.h"
-#include "simdjson/common_defs.h"
-#include "simdjson/inline/document.h"
 #include "jsoncharutils.h"
+#include "westmere/simd.h"
 #include "westmere/intrinsics.h"
 #include "westmere/bitmanipulation.h"
 
@@ -46,4 +44,4 @@ UNTARGET_REGION
 
 #endif // IS_X86_64
 
-#endif
+#endif // SIMDJSON_WESTMERE_STRINGPARSING_H