diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
deleted file mode 100644
index a3bac5cf..00000000
--- a/.github/workflows/CI-mingw.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-name: CI-mingw
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    shell: msys2 {0}
-
-jobs:
-  build:
-
-    strategy:
-      matrix:
-        compiler: [g++, clang++]
-        # TODO: add MSYS after #556 is fixed
-        msystem: [MINGW32, MINGW64, CLANG64]
-        include:
-          #- msystem: MSYS
-          #  pkg-prefix: ''
-          - msystem: MINGW32
-            pkg-prefix: 'mingw-w64-i686-'
-          - msystem: MINGW64
-            pkg-prefix: 'mingw-w64-x86_64-'
-          - msystem: CLANG64
-            pkg-prefix: 'mingw-w64-clang-x86_64-'
-          - compiler: g++
-            compiler-pkg: gcc
-          - compiler: clang++
-            compiler-pkg: clang
-        exclude:
-          - msystem: CLANG64
-            compiler: g++
-      fail-fast: false
-
-    runs-on: windows-2025
-
-    env:
-      CXX: ${{ matrix.compiler }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Set up MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          release: false # use pre-installed
-          msystem: ${{ matrix.msystem }}
-          # TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
-          # TODO: also run tests with non-prefixed Python?
-          install: >-
-            make
-            ${{ matrix.pkg-prefix }}cmake
-            ${{ matrix.pkg-prefix }}python
-            ${{ matrix.pkg-prefix }}python-pytest
-
-      - name: install compiler
-        run: |
-          pacman -S --noconfirm ${{ matrix.pkg-prefix }}${{ matrix.compiler-pkg }}
-          ${CXX} -v
-
-      - name: make simplecpp
-        run: |
-          make -j$(nproc) CXXOPTS="-Werror"
-
-      # gcc *and* clang are required to run-tests.py
-      # install it at this point since it has gcc as dependency which might interfere with the build
-      - name: install compiler (clang)
-        if: matrix.compiler == 'g++'
-        run: |
-          pacman -S --noconfirm clang
-
-      - name: install compiler (gcc)
-        if: matrix.compiler == 'clang++'
-        run: |
-          pacman -S --noconfirm gcc
-
-      - name: make test
-        run: |
-          # TODO: run tests with Windows paths
-          make -j$(nproc) test
-
-      - name: selfcheck
-        run: |
-          # TODO: run tests with Windows paths
-          make -j$(nproc) selfcheck
-
-      - name: make (c++14)
-        run: |
-          make clean
-          make -j$(nproc) CXXOPTS="-Werror -std=c++14"
-
-      - name: make (c++17)
-        run: |
-          make clean
-          make -j$(nproc) CXXOPTS="-Werror -std=c++17"
-
-      - name: make (c++20)
-        run: |
-          make clean
-          make -j$(nproc) CXXOPTS="-Werror -std=c++20"
-
-      - name: make (c++23)
-        run: |
-          make clean
-          make -j$(nproc) CXXOPTS="-Werror -std=c++23"
-
-      - name: Run CMake
-        run: |
-          cmake -S . -B cmake.output -DCMAKE_COMPILE_WARNING_AS_ERROR=On
-
-      - name: CMake simplecpp
-        run: |
-          cmake --build cmake.output --target simplecpp -- -j $(nproc)
-
-      - name: CMake testrunner
-        run: |
-          cmake --build cmake.output --target testrunner -- -j $(nproc)
-
-      - name: Run testrunner
-        run: |
-          ./cmake.output/testrunner
-
-      - name: Run with libstdc++ debug mode
-        if: matrix.compiler == 'g++'
-        run: |
-          make clean
-          make -j$(nproc) test selfcheck CXXOPTS="-Werror -g3 -D_GLIBCXX_DEBUG"
-
-      - name: Run with libc++ hardening mode
-        if: matrix.compiler == 'clang++' && matrix.msystem == 'CLANG64'
-        run: |
-          make clean
-          make -j$(nproc) test selfcheck CXXOPTS="-Werror -stdlib=libc++ -g3 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG" LDOPTS="-lc++"
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
deleted file mode 100644
index 6fd8a429..00000000
--- a/.github/workflows/CI-unixish.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-name: CI-unixish
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-14, macos-15, macos-15-intel, macos-26]
-        compiler: [clang++]
-        include:
-          - os: ubuntu-22.04
-            compiler: g++
-          - os: ubuntu-24.04
-            compiler: g++
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      CXX: ${{ matrix.compiler }}
-
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        persist-credentials: false
-
-    # the man-db trigger causes package installations to stall for several minutes at times. so just drop the package.
-    # see https://github.com/actions/runner/issues/4030
-    - name: Remove man-db package on ubuntu
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-        sudo apt-get update
-        sudo apt-get remove man-db
-
-    - name: Install missing software on ubuntu
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-          sudo apt-get update
-          sudo apt-get install valgrind
-
-    # llvm contains llvm-profdata
-    - name: Install missing software on ubuntu (clang++)
-      if: contains(matrix.os, 'ubuntu') && matrix.compiler == 'clang++'
-      run: |
-        sudo apt-get update
-        sudo apt-get install libc++-dev llvm
-
-      # coreutils contains "nproc"
-    - name: Install missing software on macos
-      if: contains(matrix.os, 'macos')
-      run: |
-        brew install coreutils
-
-    - name: Install missing Python packages
-      run: |
-        python3 -m pip config set global.break-system-packages true
-        python3 -m pip install pytest
-
-    - name: make simplecpp
-      run: make -j$(nproc) CXXOPTS="-Werror"
-
-    - name: make test
-      run: make -j$(nproc) test CXXOPTS="-Werror"
-
-    - name: selfcheck
-      run: |
-        make -j$(nproc) selfcheck
-
-    - name: make (c++14)
-      run: |
-        make clean
-        make -j$(nproc) CXXOPTS="-Werror -std=c++14"
-
-    - name: make (c++17)
-      run: |
-        make clean
-        make -j$(nproc) CXXOPTS="-Werror -std=c++17"
-
-    - name: make (c++20)
-      run: |
-        make clean
-        make -j$(nproc) CXXOPTS="-Werror -std=c++20"
-
-    - name: make (c++23)
-      run: |
-        make clean
-        # ubuntu-22.04 and macos-14 do not support c++23 yet
-        make -j$(nproc) CXXOPTS="-Werror -std=c++2b"
-
-    - name: Run CMake
-      run: |
-        cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On
-
-    - name: CMake simplecpp
-      run: |
-        cmake --build cmake.output --target simplecpp -- -j $(nproc)
-
-    - name: CMake testrunner
-      run: |
-        cmake --build cmake.output --target testrunner -- -j $(nproc)
-        ./cmake.output/testrunner
-        # Re-run tests from within the build directory to validate that
-        # SIMPLECPP_TEST_SOURCE_DIR is correctly defined and resolved
-        (cd cmake.output && ./testrunner)
-
-    - name: Run valgrind
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-          make clean
-          make -j$(nproc) CXXOPTS="-O1"
-          valgrind --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --gen-suppressions=all --error-exitcode=42 ./testrunner
-          # TODO: run Python tests with valgrind
-          VALGRIND_TOOL=memcheck ./selfcheck.sh
-
-    - name: Run with libstdc++ debug mode
-      if: matrix.os == 'ubuntu-24.04' && matrix.compiler == 'g++'
-      run: |
-        make clean
-        make -j$(nproc) test selfcheck CXXOPTS="-Werror -g3 -D_GLIBCXX_DEBUG"
-
-    - name: Run with libc++ hardening mode
-      if: matrix.os == 'ubuntu-24.04' && matrix.compiler == 'clang++'
-      run: |
-        make clean
-        make -j$(nproc) test selfcheck CXXOPTS="-Werror -stdlib=libc++ -g3 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG" LDOPTS="-lc++"
-
-    - name: Run AddressSanitizer
-      if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-26'
-      run: |
-        make clean
-        make -j$(nproc) test selfcheck CXXOPTS="-Werror -O2 -g3 -fsanitize=address" LDOPTS="-fsanitize=address"
-      env:
-        ASAN_OPTIONS: detect_stack_use_after_return=1
-
-    - name: Run UndefinedBehaviorSanitizer
-      if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-26'
-      run: |
-        make clean
-        make -j$(nproc) test selfcheck CXXOPTS="-Werror -O2 -g3 -fsanitize=undefined -fno-sanitize=signed-integer-overflow" LDOPTS="-fsanitize=undefined -fno-sanitize=signed-integer-overflow"
-      env:
-        UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1
-
-    # TODO: requires instrumented libc++
-    - name: Run MemorySanitizer
-      if: false && matrix.os == 'ubuntu-24.04' && matrix.compiler == 'clang++'
-      run: |
-        make clean
-        make -j$(nproc) test selfcheck CXXOPTS="-Werror -O2 -g3 -stdlib=libc++ -fsanitize=memory" LDOPTS="-lc++ -fsanitize=memory"
-
-    - name: Run callgrind
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-        wget https://github.com/danmar/simplecpp/archive/refs/tags/1.5.1.tar.gz
-        tar xvf 1.5.1.tar.gz
-        rm -f 1.5.1.tar.gz
-        
-        make clean
-        make -j$(nproc) CXXOPTS="-O2 -g3" simplecpp
-        VALGRIND_TOOL=callgrind SIMPLECPP_PATH=simplecpp-1.5.1 ./selfcheck.sh >callgrind.log || (cat callgrind.log && false)
-        cat callgrind.log
-        
-        # PGO - start
-        make clean
-        make -j$(nproc) CXXOPTS="-O2 -g3 -fprofile-generate" LDOPTS="-fprofile-generate" simplecpp
-        SIMPLECPP_PATH=simplecpp-1.5.1 ./selfcheck.sh >/dev/null
-        
-        if compgen -G "default_*.profraw" > /dev/null; then
-          llvm-profdata merge -output=default.profdata default_*.profraw
-        fi
-        
-        make clean
-        make -j$(nproc) CXXOPTS="-O2 -g3 -fprofile-use" LDOPTS="-fprofile-use" simplecpp
-        VALGRIND_TOOL=callgrind SIMPLECPP_PATH=simplecpp-1.5.1 ./selfcheck.sh >callgrind_pgo.log || (cat callgrind_pgo.log && false)
-        cat callgrind_pgo.log
-        # PGO - end
-        
-        for f in callgrind.out.*;
-        do
-          callgrind_annotate --auto=no $f > $f.annotated.log
-          head -50 $f.annotated.log
-        done
-        rm -rf simplecpp-1.5.1
-
-    - uses: actions/upload-artifact@v4
-      if: matrix.os == 'ubuntu-24.04'
-      with:
-        name: Callgrind Output - ${{ matrix.compiler }}
-        path: |
-          ./callgrind.*
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 521bc24c..06b12cef 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -64,6 +64,25 @@ jobs:
           set SIMPLECPP_EXE_PATH=.\${{ matrix.config }}\simplecpp.exe
           python -m pytest integration_test.py -vv || exit /b !errorlevel!
 
+      - name: Build (AddressSanitizer)
+        run: |
+          msbuild -m simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 /t:Clean;Rebuild || exit /b !errorlevel!
+        env:
+          _CL_: /fsanitize=address /fsanitize-address-use-after-return /Zi
+
+      - name: Test (AddressSanitizer)
+        run: |
+          .\${{ matrix.config }}\testrunner.exe || exit /b !errorlevel!
+
+      - name: Selfcheck (AddressSanitizer)
+        run: |
+          .\${{ matrix.config }}\simplecpp.exe simplecpp.cpp -e || exit /b !errorlevel!
+
+      - name: integration test (AddressSanitizer)
+        run: |
+          set SIMPLECPP_EXE_PATH=.\${{ matrix.config }}\simplecpp.exe
+          python -m pytest integration_test.py -vv || exit /b !errorlevel!
+
       - name: Run CMake (c++17)
         run: |
           cmake -S . -B build.cxx17 -G "Visual Studio 17 2022" -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=17 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
deleted file mode 100644
index 9109be9e..00000000
--- a/.github/workflows/clang-tidy.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-name: clang-tidy
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      # the man-db trigger causes package installations to stall for several minutes at times. so just drop the package.
-      # see https://github.com/actions/runner/issues/4030
-      - name: Remove man-db package
-        run: |
-          sudo apt-get update
-          sudo apt-get remove man-db
-
-      - name: Install missing software
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake make
-
-      - name: Install clang
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21
-          sudo apt-get install clang-tidy-21
-
-      - name: Verify clang-tidy configuration
-        run: |
-          clang-tidy-21 --verify-config
-
-      - name: Prepare CMake
-        run: |
-          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-        env:
-          CXX: clang-21
-
-      - name: Clang-Tidy
-        run: |
-          run-clang-tidy-21 -q -j $(nproc) -p=cmake.output
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
deleted file mode 100644
index e9f1361d..00000000
--- a/.github/workflows/format.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-name: format
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'releases/**'
-      - '1.*'
-    tags:
-      - '1.*'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  format:
-
-    runs-on: ubuntu-22.04
-
-    defaults:
-      run:
-        shell: bash -euo pipefail {0}
-
-    env:
-      UNCRUSTIFY_INSTALL_DIR: ${{ github.workspace }}/runformat-uncrustify
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      - name: Determine uncrustify version
-        id: get-uncrustify-version
-        run: |
-          version="$(./runformat --expected-uncrustify-version)"
-          echo "Expected uncrustify version: $version"
-          echo "version=$version" >> "$GITHUB_OUTPUT"
-
-      - name: Set UNCRUSTIFY_VERSION env variable
-        run: |
-          version=$(./runformat --expected-uncrustify-version)
-          echo "version [$version]"
-          echo "UNCRUSTIFY_VERSION=${version}" >> "$GITHUB_ENV"
-
-      - name: Cache uncrustify
-        uses: actions/cache@v4
-        id: cache-uncrustify
-        with:
-          path: ${{ env.UNCRUSTIFY_INSTALL_DIR }}
-          key: ${{ runner.os }}-uncrustify-${{ steps.get-uncrustify-version.outputs.version }}
-
-      - name: Install uncrustify
-        if: steps.cache-uncrustify.outputs.cache-hit != 'true'
-        run: |
-          ./runformat --install --install-dir "${UNCRUSTIFY_INSTALL_DIR}"
-
-      - name: Uncrustify check
-        run: |
-          ./runformat
diff --git a/.gitignore b/.gitignore
index 34d9c55d..9545fc31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,16 @@ testrunner
 
 # python
 __pycache__/
+
+# Visual Studio (CI build)
+/Debug
+/simplecpp.dir
+/simplecpp_obj.dir
+/testrunner.dir
+/x64
+/*.vcxproj
+/*.vcxproj.filters
+/cmake_install.cmake
+/CMakeCache.txt
+/CTestTestfile.cmake
+/simplecpp.sln
\ No newline at end of file