diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0b2156c..b2fcad7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -44,11 +44,13 @@ jobs:
         if: "${{ matrix.os == 'macos-latest' }}"
         run: |
           brew update
-          brew install cmake gcc
+          brew install llvm@18
 
-      - name: "Install clang/llvm"
+      - name: "Linux: install clang/llvm"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
         run: |
-          pip install clang-format clang-tidy
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          sudo apt install clang-format-18 clang-tidy-18
 
       - name: "Build for compile commands.json"
         run: |
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 13ba499..8cf7a51 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -71,9 +71,13 @@ target_compile_options(${LIB_NAME}
 )
 
 target_include_directories(${LIB_NAME}
-    PRIVATE
+    SYSTEM PRIVATE
     ${CLP_SRC_DIR}/components/core/submodules
     ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_include_directories(${LIB_NAME}
+    PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
diff --git a/lib/libclp_ffi_darwin_arm64.a b/lib/libclp_ffi_darwin_arm64.a
deleted file mode 100644
index 56264af..0000000
Binary files a/lib/libclp_ffi_darwin_arm64.a and /dev/null differ