diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml
index c66a2bee3b1..dd418fc0d15 100644
--- a/.github/workflows/generic-dev.yml
+++ b/.github/workflows/generic-dev.yml
@@ -22,184 +22,55 @@ jobs:
 # The master branch exclusive jobs will be in a separate
 # workflow file (the osx tests and meson build that is)
 
-  benchmarking:
-    runs-on: ubuntu-latest
+  meson-msvc:
+    name: 'Meson on Windows MSVC'
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: make benchmarking
-      run: make benchmarking
 
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: make test
-      run: make test
+    # Some replacements:
+    # * https://renenyffenegger.ch/notes/Windows/development/Visual-Studio/environment-variables/index
+    # * https://github.com/microsoft/vswhere/wiki/Start-Developer-Command-Prompt
+    - uses: ilammy/msvc-dev-cmd@v1
 
-  gcc-6-7-libzstd:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: gcc-6 + gcc-7 + libzstdmt compilation
+    - name: install meson
       run: |
-        make gcc6install gcc7install
-        CC=gcc-6 CFLAGS=-Werror make -j all
-        make clean
-        CC=gcc-7 CFLAGS=-Werror make -j all
-        make clean
-        LDFLAGS=-Wl,--no-undefined make -C lib libzstd-mt
-        make -C tests zbufftest-dll
-
-  gcc-8-asan-ubsan-testzstd:
-    runs-on: ubuntu-16.04 # fails on 18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: gcc-8 + ASan + UBSan + Test Zstd
+        pip install -U meson
+
+    - run: |
+        git clone https://github.com/lzutao/lz4/ third-party\lz4
+        cd third-party\lz4
+        git switch std
+        meson setup `
+          --buildtype=release `
+          -Ddefault_library=shared `
+          -Dprefix=C:\lz4 `
+          contrib\meson builddir
+        cd builddir
+        meson compile
+        meson install
+
+    - name: install zlib
       run: |
-        make gcc8install
-        CC=gcc-8 CFLAGS="-Werror" make -j all
-        make clean
-        CC=gcc-8 make -j uasan-test-zstd </dev/null
+        vcpkg integrate install
+        vcpkg install --triplet x64-windows zlib
 
-  gcc-6-asan-ubsan-testzstd-32bit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: gcc-6 + ASan + UBSan + Test Zstd, 32bit mode
-      run: |
-        make gcc6install libc6install
-        CC=gcc-6 CFLAGS="-Werror -m32" make -j all32
-        make clean
-        CC=gcc-6 make -j uasan-test-zstd32
-
-  clang-38-msan-testzstd:
-    runs-on: ubuntu-16.04 # fails on 18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: clang-3.8 + MSan + Test Zstd
+    - name: install liblzma
       run: |
-        # make clang38install (doesn't work)
-        sudo apt-add-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 main"
-        sudo apt-get update
-        sudo apt-get install clang-3.8
-        CC=clang-3.8 make clean msan-test-zstd HAVE_ZLIB=0 HAVE_LZ4=0 HAVE_LZMA=0
+        vcpkg install --triplet x64-windows liblzma
+        Tree C:\vcpkg\packages\liblzma_x64-windows /F
 
-  cmake-build-and-test-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: cmake build and test check
-      run: make cmakebuild
-
-  gcc-8-asan-ubsan-fuzz:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: gcc-8 + ASan + UBSan + Fuzz Test
-      run: |
-        make gcc8install
-        CC=gcc-8 FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
-
-  gcc-6-asan-ubsan-fuzz32:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: gcc-6 + ASan + UBSan + Fuzz Test 32bit
-      run: |
-        make gcc6install libc6install
-        CC=gcc-6 CFLAGS="-O2 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest
-
-  clang-38-msan-fuzz:
-    runs-on: ubuntu-16.04 # fails on 18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: clang-3.8 + MSan + Fuzz Test
-      run: |
-        # make clang38install (doesn't work)
-        sudo apt-add-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 main"
-        sudo apt-get update
-        sudo apt-get install clang-3.8
-        CC=clang-3.8 make clean msan-fuzztest
-
-  asan-ubsan-msan-regression:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: ASan + UBSan + MSan + Regression Test
-      run: |
-        make -j uasanregressiontest
-        make clean
-        make -j msanregressiontest
-
-  cpp-gnu90-c99-compatibility:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: C++, gnu90 and c99 compatibility
-      run: |
-        make cxxtest
-        make clean
-        make gnu90build
-        make clean
-        make c99build
-        make clean
-        make travis-install
-
-  mingw-cross-compilation:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: mingw cross-compilation
-      run: |
-        # sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; (doesn't work)
-        sudo apt-get install gcc-mingw-w64
-        CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CFLAGS="-Werror -O1" make zstd
-
-# TODO: Broken test - fix and uncomment
-#  armbuild:
-#    runs-on: ubuntu-16.04 # doesn't work on latest
-#    steps:
-#    - uses: actions/checkout@v2
-#    - name: ARM Build Test
-#      run: |
-#        make arminstall
-#        make armbuild
-
-# TODO: Broken test - fix and uncomment
-#  armfuzz:
-#    runs-on: ubuntu-16.04 # doesn't work on latest
-#    steps:
-#    - uses: actions/checkout@v2
-#    - name: Qemu ARM emulation + Fuzz Test
-#      run: |
-#        make arminstall
-#        make armfuzz
-
-  bourne-shell:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Bourne shell compatibility (shellcheck)
-      run: |
-        wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz
-        tar -xf shellcheck-v0.7.1.linux.x86_64.tar.xz
-        shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning --exclude=SC2010 tests/playTests.sh
-
-  icc:
-    name: icc-check
-    runs-on: ubuntu-latest
-    steps:
-    - name: install icc
-      run: |
-        export DEBIAN_FRONTEND=noninteractive
-        sudo apt-get -qqq update
-        sudo apt-get install -y wget build-essential pkg-config cmake ca-certificates gnupg
-        sudo wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        sudo apt-get update
-        sudo apt-get install -y intel-oneapi-icc
-    - uses: actions/checkout@v2
-    - name: make check
+    - name: test
       run: |
-        make CC=/opt/intel/oneapi/compiler/latest/linux/bin/intel64/icc check
+        cd build\meson
+        meson setup `
+            --buildtype=debug `
+            -Db_lundef=false `
+            -Dauto_features=enabled `
+            -Dbin_programs=true `
+            -Dbin_contrib=true `
+            -Ddefault_library=shared `
+            -Dpkg_config_path="C:\vcpkg\packages\zlib_x64-windows\lib\pkgconfig;C:\lz4\lib\pkgconfig" `
+            -Dc_args="-IC:\vcpkg\packages\liblzma_x64-windows\include " `
+            builddir
+        meson compile -C builddir
diff --git a/.github/workflows/generic-release.yml b/.github/workflows/generic-release.yml
deleted file mode 100644
index d9e7109e218..00000000000
--- a/.github/workflows/generic-release.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: generic-release
-
-on:
-  pull_request:
-    # This will eventually only be for pushes to master
-    # but for dogfooding purposes, I'm running it even 
-    # on dev pushes
-    branches: [ dev, master, actionsTest ]
-
-jobs:
-  # missing jobs
-  # 
-  # ppc64le + fuzz test
-  # Qemu PPC64 + Fuzz test
-  # Qemu aarch64 + Fuzz Test (on Xenial)
-  # versions comp   
-  # meson test
-
-  osx:
-    runs-on: macos-10.15
-    steps:
-    - uses: actions/checkout@v2
-    - name: OS-X
-      run: |
-        make test
-        # make -c lib all (need to fix. not working right now)
-  
-  zbuff:
-    runs-on: ubuntu-16.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: zbuff test
-      run: |
-        make -C tests test-zbuff
-        
-  tsan:
-    runs-on: ubuntu-16.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: thread sanitizer
-      run: |
-        sudo apt-add-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 main"
-        sudo apt-get update
-        sudo apt-get install clang-3.8
-        CC=clang-3.8 make tsan-test-zstream
-        CC=clang-3.8 make tsan-fuzztest
-  zlib-wrapper:
-    runs-on: ubuntu-16.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: zlib wrapper test
-      run: |
-        make gpp6install valgrindinstall
-        make -C zlibWrapper test
-        make -C zlibWrapper valgrindTest
-  
-  lz4-threadpool-partial-libs:
-    runs-on: ubuntu-16.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: LZ4, thread pool, and partial libs testslib wrapper test
-      run: |
-        make lz4install
-        make -C tests test-lz4
-        make clean
-        make -C tests test-pool
-        make clean
-        bash tests/libzstd_partial_builds.sh
diff --git a/.github/workflows/linux-kernel.yml b/.github/workflows/linux-kernel.yml
deleted file mode 100644
index 35871ff0850..00000000000
--- a/.github/workflows/linux-kernel.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: linux-kernel
-
-on:
-  pull_request:
-    branches: [ dev, master, actionsTest ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Create linux kernel library + build + test
-      run: make -C contrib/linux-kernel test CFLAGS="-Werror -Wunused-const-variable -Wunused-but-set-variable"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 0e14345dc8b..00000000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: CIFuzz
-on: [pull_request]
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer: [address, undefined, memory]
-    steps:
-    - name: Build Fuzzers (${{ matrix.sanitizer }})
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'zstd'
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Run Fuzzers (${{ matrix.sanitizer }})
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'zstd'
-        fuzz-seconds: 600
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Upload Crash
-      uses: actions/upload-artifact@v1
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: ${{ matrix.sanitizer }}-artifacts
-        path: ./out/artifacts
diff --git a/build/meson/contrib/pzstd/meson.build b/build/meson/contrib/pzstd/meson.build
index 8f3822fd776..fa56fbc09ef 100644
--- a/build/meson/contrib/pzstd/meson.build
+++ b/build/meson/contrib/pzstd/meson.build
@@ -11,14 +11,24 @@ zstd_rootdir = '../../../..'
 
 pzstd_includes = include_directories(join_paths(zstd_rootdir, 'programs'),
   join_paths(zstd_rootdir, 'contrib/pzstd'))
-pzstd_sources = [join_paths(zstd_rootdir, 'programs/util.c'),
+pzstd_sources = [
   join_paths(zstd_rootdir, 'contrib/pzstd/main.cpp'),
   join_paths(zstd_rootdir, 'contrib/pzstd/Options.cpp'),
   join_paths(zstd_rootdir, 'contrib/pzstd/Pzstd.cpp'),
-  join_paths(zstd_rootdir, 'contrib/pzstd/SkippableFrame.cpp')]
+  join_paths(zstd_rootdir, 'contrib/pzstd/SkippableFrame.cpp'),
+  join_paths(zstd_rootdir, 'programs/util.c'),
+]
+
+pzstd_cpp_args = []
+if is_like_gcc
+  pzstd_cpp_args += [ '-DNDEBUG', '-Wno-shadow', '-pedantic' ]
+else
+  pzstd_cpp_args += [ '/DNDEBUG' ]
+endif
+
 pzstd = executable('pzstd',
   pzstd_sources,
-  cpp_args: [ '-DNDEBUG', '-Wno-shadow', '-pedantic' ],
+  cpp_args: pzstd_cpp_args,
   include_directories: pzstd_includes,
   dependencies: [ libzstd_dep, thread_dep ],
   install: true)
diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build
index 17806c8dcc3..c80351dc008 100644
--- a/build/meson/lib/meson.build
+++ b/build/meson/lib/meson.build
@@ -50,8 +50,17 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'),
   join_paths(zstd_rootdir, 'lib/deprecated/zbuff_decompress.c')]
 
 # Explicit define legacy support
-add_project_arguments('-DZSTD_LEGACY_SUPPORT=@0@'.format(legacy_level),
-  language: 'c')
+if is_like_gcc
+  add_project_arguments(
+    '-DZSTD_LEGACY_SUPPORT=@0@'.format(legacy_level),
+    language: 'c'
+  )
+else
+  add_project_arguments(
+    '/DZSTD_LEGACY_SUPPORT=@0@'.format(legacy_level),
+    language: 'c'
+  )
+endif
 
 if legacy_level == 0
   message('Legacy support: DISABLED')
@@ -70,35 +79,52 @@ endif
 libzstd_deps = []
 if use_multi_thread
   message('Enable multi-threading support')
-  add_project_arguments('-DZSTD_MULTITHREAD', language: 'c')
+  if is_like_gcc
+    add_project_arguments('-DZSTD_MULTITHREAD', language: 'c')
+  else
+    add_project_arguments('/DZSTD_MULTITHREAD', language: 'c')
+  endif
   libzstd_deps = [ thread_dep ]
 endif
 
 libzstd_c_args = []
-if cc_id == compiler_msvc
+if is_like_msvc
   if default_library_type != 'static'
-    libzstd_sources += [windows_mod.compile_resources(
-      join_paths(zstd_rootdir, 'build/VS2010/libzstd-dll/libzstd-dll.rc'))]
-    libzstd_c_args += ['-DZSTD_DLL_EXPORT=1',
-      '-DZSTD_HEAPMODE=0',
-      '-D_CONSOLE',
-      '-D_CRT_SECURE_NO_WARNINGS']
+    libzstd_sources += [
+      windows_mod.compile_resources(
+        join_paths(zstd_rootdir, 'build/VS2010/libzstd-dll/libzstd-dll.rc'),
+        include_directories: include_directories(join_paths(zstd_rootdir, 'lib')),
+      )
+    ]
+    libzstd_c_args += [
+      '/DZSTD_DLL_EXPORT=1',
+      '/DZSTD_HEAPMODE=0',
+      '/D_CONSOLE',
+      '/D_CRT_SECURE_NO_WARNINGS',
+    ]
   else
-    libzstd_c_args += ['-DZSTD_HEAPMODE=0',
-      '-D_CRT_SECURE_NO_WARNINGS']
+    libzstd_c_args += [
+      '/DZSTD_HEAPMODE=0',
+      '/D_CRT_SECURE_NO_WARNINGS',
+    ]
   endif
 endif
 
 mingw_ansi_stdio_flags = []
-if host_machine_os == os_windows and cc_id == compiler_gcc
+if is_os_windows and cc_id == 'gcc'
   mingw_ansi_stdio_flags = [ '-D__USE_MINGW_ANSI_STDIO' ]
 endif
 libzstd_c_args += mingw_ansi_stdio_flags
 
 libzstd_debug_cflags = []
 if use_debug
-  libzstd_c_args += '-DDEBUGLEVEL=@0@'.format(debug_level)
-  if cc_id == compiler_gcc or cc_id == compiler_clang
+  if is_like_msvc
+    libzstd_c_args += '/DDEBUGLEVEL=@0@'.format(debug_level)
+  else
+    libzstd_c_args += '-DDEBUGLEVEL=@0@'.format(debug_level)
+  endif
+
+  if is_like_gcc
     libzstd_debug_cflags = ['-Wstrict-aliasing=1', '-Wswitch-enum',
       '-Wdeclaration-after-statement', '-Wstrict-prototypes',
       '-Wundef', '-Wpointer-arith', '-Wvla',
diff --git a/build/meson/meson.build b/build/meson/meson.build
index 2a425b2fa39..7338ba6cfb8 100644
--- a/build/meson/meson.build
+++ b/build/meson/meson.build
@@ -17,7 +17,7 @@ project('zstd',
     'buildtype=release'
   ],
   version: 'DUMMY',
-  meson_version: '>=0.47.0')
+  meson_version: '>=0.49.0')
 
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
@@ -25,16 +25,21 @@ pkgconfig = import('pkgconfig')
 windows_mod = import('windows')
 
 host_machine_os = host_machine.system()
-os_windows = 'windows'
-os_linux = 'linux'
-os_darwin = 'darwin'
-os_freebsd = 'freebsd'
-os_sun = 'sunos'
+is_os_windows = host_machine_os == 'windows'
+is_os_linux = host_machine_os == 'linux'
+is_os_darwin = host_machine_os == 'darwin'
+is_os_freebsd = host_machine_os == 'freebsd'
+is_os_sun = host_machine_os == 'sunos'
 
 cc_id = cc.get_id()
-compiler_gcc = 'gcc'
-compiler_clang = 'clang'
-compiler_msvc = 'msvc'
+cc_arg_syntax = cc.get_argument_syntax()
+is_like_clang = cc_id == 'clang'
+is_like_gcc = cc_arg_syntax == 'gcc'
+is_like_msvc = cc_arg_syntax == 'msvc'
+
+if not is_like_msvc and not is_like_gcc
+  error('Unsupported compiler: @0@'.format(cc_id))
+endif
 
 zstd_version = meson.project_version()
 
@@ -103,11 +108,15 @@ use_lz4 = lz4_dep.found()
 # Compiler flags
 # =============================================================================
 
-add_project_arguments('-DXXH_NAMESPACE=ZSTD_', language: ['c'])
+if is_like_gcc
+  add_project_arguments('-DXXH_NAMESPACE=ZSTD_', language: ['c'])
+elif is_like_msvc
+  add_project_arguments('/DXXH_NAMESPACE=ZSTD_', language: ['c'])
+endif
 
-if [compiler_gcc, compiler_clang].contains(cc_id)
+if is_like_gcc
   common_warning_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ]
-  if cc_id == compiler_clang
+  if is_like_clang
     # Should use Meson's own --werror build option
     #common_warning_flags += '-Werror'
     common_warning_flags += ['-Wconversion', '-Wno-sign-conversion', '-Wdocumentation']
@@ -116,8 +125,8 @@ if [compiler_gcc, compiler_clang].contains(cc_id)
   cxx_compile_flags = cxx.get_supported_arguments(common_warning_flags)
   add_project_arguments(cc_compile_flags, language : 'c')
   add_project_arguments(cxx_compile_flags, language : 'cpp')
-elif cc_id == compiler_msvc
-  msvc_compile_flags = [ '/D_UNICODE', '/DUNICODE' ]
+elif is_like_msvc
+  msvc_compile_flags = [ '/D_UNICODE', '/DUNICODE', '/DNOMINMAX' ]
   if use_multi_thread
     msvc_compile_flags += '/MP'
   endif
diff --git a/build/meson/programs/meson.build b/build/meson/programs/meson.build
index 363818f9d64..c07e96d3bb1 100644
--- a/build/meson/programs/meson.build
+++ b/build/meson/programs/meson.build
@@ -21,38 +21,66 @@ zstd_programs_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'),
 
 zstd_c_args = libzstd_debug_cflags
 if use_multi_thread
-  zstd_c_args += [ '-DZSTD_MULTITHREAD' ]
+  if is_like_msvc
+    zstd_c_args += [ '/DZSTD_MULTITHREAD' ]
+  else
+    zstd_c_args += [ '-DZSTD_MULTITHREAD' ]
+  endif
 endif
 
 zstd_deps = [ libzstd_dep ]
 if use_zlib
   zstd_deps += [ zlib_dep ]
-  zstd_c_args += [ '-DZSTD_GZCOMPRESS', '-DZSTD_GZDECOMPRESS' ]
+  if is_like_msvc
+    zstd_c_args += [ '/DZSTD_GZCOMPRESS', '/DZSTD_GZDECOMPRESS' ]
+  else
+    zstd_c_args += [ '-DZSTD_GZCOMPRESS', '-DZSTD_GZDECOMPRESS' ]
+  endif
 endif
 
 if use_lzma
   zstd_deps += [ lzma_dep ]
-  zstd_c_args += [ '-DZSTD_LZMACOMPRESS', '-DZSTD_LZMADECOMPRESS' ]
+  if is_like_msvc
+    zstd_c_args += [ '/DZSTD_LZMACOMPRESS', '/DZSTD_LZMADECOMPRESS' ]
+  else
+    zstd_c_args += [ '-DZSTD_LZMACOMPRESS', '-DZSTD_LZMADECOMPRESS' ]
+  endif
 endif
 
 if use_lz4
   zstd_deps += [ lz4_dep ]
-  zstd_c_args += [ '-DZSTD_LZ4COMPRESS', '-DZSTD_LZ4DECOMPRESS' ]
+  if is_like_msvc
+    zstd_c_args += [ '/DZSTD_LZ4COMPRESS', '/DZSTD_LZ4DECOMPRESS' ]
+  else
+    zstd_c_args += [ '-DZSTD_LZ4COMPRESS', '-DZSTD_LZ4DECOMPRESS' ]
+  endif
 endif
 
 export_dynamic_on_windows = false
 # explicit backtrace enable/disable for Linux & Darwin
 if not use_backtrace
-  zstd_c_args += '-DBACKTRACE_ENABLE=0'
-elif use_debug and host_machine_os == os_windows  # MinGW target
-  zstd_c_args += '-DBACKTRACE_ENABLE=1'
+  if is_like_msvc
+    zstd_c_args += [ '/DBACKTRACE_ENABLE=0' ]
+  else
+    zstd_c_args += '-DBACKTRACE_ENABLE=0'
+  endif
+elif use_debug and is_os_windows  # MinGW target
+  if is_like_msvc
+    zstd_c_args += [ '/DDBACKTRACE_ENABLE=1' ]
+  else
+    zstd_c_args += '-DBACKTRACE_ENABLE=1'
+  endif
   export_dynamic_on_windows = true
 endif
 
-if cc_id == compiler_msvc
+if is_like_msvc
   if default_library_type != 'static'
-    zstd_programs_sources += [windows_mod.compile_resources(
-      join_paths(zstd_rootdir, 'build/VS2010/zstd/zstd.rc'))]
+    zstd_programs_sources += [
+      windows_mod.compile_resources(
+        join_paths(zstd_rootdir, 'build/VS2010/zstd/zstd.rc'),
+        include_directories: include_directories(join_paths(zstd_rootdir, 'lib')),
+      )
+    ]
   endif
 endif
 
@@ -70,10 +98,15 @@ zstd_frugal_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'),
 
 # Minimal target, with only zstd compression and decompression.
 # No bench. No legacy.
+if is_like_msvc
+  zstd_frugal_c_args = [ '/DZSTD_NOBENCH', '/DZSTD_NODICT' ]
+else
+  zstd_frugal_c_args = [ '-DZSTD_NOBENCH', '-DZSTD_NODICT' ]
+endif
 executable('zstd-frugal',
   zstd_frugal_sources,
   dependencies: libzstd_dep,
-  c_args: [ '-DZSTD_NOBENCH', '-DZSTD_NODICT' ],
+  c_args: zstd_frugal_c_args,
   install: true)
 
 install_data(join_paths(zstd_rootdir, 'programs/zstdgrep'),
@@ -90,7 +123,7 @@ install_man(join_paths(zstd_rootdir, 'programs/zstd.1'),
 
 InstallSymlink_py = '../InstallSymlink.py'
 zstd_man1_dir = join_paths(zstd_mandir, 'man1')
-bin_EXT = host_machine_os == os_windows ? '.exe' : ''
+bin_EXT = is_os_windows ? '.exe' : ''
 man1_EXT = meson.version().version_compare('>=0.49.0') ? '.1' : '.1.gz'
 
 foreach f : ['zstdcat', 'unzstd']
diff --git a/build/meson/tests/meson.build b/build/meson/tests/meson.build
index 0587f9a70d5..cae86b90c34 100644
--- a/build/meson/tests/meson.build
+++ b/build/meson/tests/meson.build
@@ -10,8 +10,8 @@
 
 zstd_rootdir = '../../..'
 
-tests_supported_oses = [os_linux, 'gnu/kfreebsd', os_darwin, 'gnu', 'openbsd',
-  os_freebsd, 'netbsd', 'dragonfly', os_sun]
+tests_supported_oses = ['linux', 'gnu/kfreebsd', 'darwin', 'gnu', 'openbsd',
+  'freebsd', 'netbsd', 'dragonfly', 'sunos']
 
 # =============================================================================
 # Test flags
@@ -31,9 +31,14 @@ test_includes = [ include_directories(join_paths(zstd_rootdir, 'programs')) ]
 
 datagen_sources = [join_paths(zstd_rootdir, 'programs/datagen.c'),
   join_paths(zstd_rootdir, 'tests/datagencli.c')]
+if is_like_msvc
+  datagen_c_args = [ '/DNDEBUG' ]
+else
+  datagen_c_args = [ '-DNDEBUG' ]
+endif
 datagen = executable('datagen',
   datagen_sources,
-  c_args: [ '-DNDEBUG' ],
+  c_args: datagen_c_args,
   include_directories: test_includes,
   dependencies: libzstd_dep,
   install: false)
@@ -153,7 +158,7 @@ if tests_supported_oses.contains(host_machine_os)
     timeout: 600) # Timeout should work on HDD drive
 endif
 
-if host_machine_os != os_windows
+if not is_os_windows
   playTests_sh = find_program(join_paths(zstd_rootdir, 'tests/playTests.sh'), required: true)
   test('test-zstd',
     playTests_sh,
diff --git a/lib/common/xxhash.c b/lib/common/xxhash.c
index e708df3c338..6160662b430 100644
--- a/lib/common/xxhash.c
+++ b/lib/common/xxhash.c
@@ -459,7 +459,7 @@ FORCE_INLINE_TEMPLATE U64 XXH64_endian_align(const void* input, size_t len, U64
 }
 
 
-XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
+XXHASH_DLL_PUBLIC XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
 {
 #if 0
     /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
diff --git a/lib/common/xxhash.h b/lib/common/xxhash.h
index eceb55d5e07..cefed82719d 100644
--- a/lib/common/xxhash.h
+++ b/lib/common/xxhash.h
@@ -88,6 +88,20 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
 #  define XXH_PUBLIC_API   /* do nothing */
 #endif /* XXH_PRIVATE_API */
 
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef __GNUC__
+    #define XXHASH_DLL_PUBLIC __attribute__ ((dllexport))
+  #else
+    #define XXHASH_DLL_PUBLIC __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.
+  #endif
+#else
+  #if __GNUC__ >= 4
+    #define XXHASH_DLL_PUBLIC __attribute__ ((visibility ("default")))
+  #else
+    #define XXHASH_DLL_PUBLIC
+  #endif
+#endif
+
 /*!XXH_NAMESPACE, aka Namespace Emulation :
 
 If you want to include _and expose_ xxHash functions from within your own library,
@@ -141,7 +155,7 @@ typedef unsigned int       XXH32_hash_t;
 typedef unsigned long long XXH64_hash_t;
 
 XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed);
-XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
+XXHASH_DLL_PUBLIC XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
 
 /*!
 XXH32() :
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index b1bb9fa1021..1b51f2acf94 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -1057,7 +1057,7 @@ ZSTD_clampCParams(ZSTD_compressionParameters cParams)
 
 /** ZSTD_cycleLog() :
  *  condition for correct operation : hashLog > 1 */
-U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat)
+ZSTD_COMPRESS_DLL_PUBLIC U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat)
 {
     U32 const btScale = ((U32)strat >= (U32)ZSTD_btlazy2);
     return hashLog - btScale;
diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h
index a0a9d53bac5..b82ebdd8be0 100644
--- a/lib/compress/zstd_compress_internal.h
+++ b/lib/compress/zstd_compress_internal.h
@@ -24,6 +24,20 @@
 #  include "zstdmt_compress.h"
 #endif
 
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef __GNUC__
+    #define ZSTD_COMPRESS_DLL_PUBLIC __attribute__ ((dllexport))
+  #else
+    #define ZSTD_COMPRESS_DLL_PUBLIC __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.
+  #endif
+#else
+  #if __GNUC__ >= 4
+    #define ZSTD_COMPRESS_DLL_PUBLIC __attribute__ ((visibility ("default")))
+  #else
+    #define ZSTD_COMPRESS_DLL_PUBLIC
+  #endif
+#endif
+
 #if defined (__cplusplus)
 extern "C" {
 #endif
@@ -1173,6 +1187,6 @@ size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSe
 
 /** ZSTD_cycleLog() :
  *  condition for correct operation : hashLog > 1 */
-U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat);
+ZSTD_COMPRESS_DLL_PUBLIC U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat);
 
 #endif /* ZSTD_COMPRESS_H */
diff --git a/lib/dictBuilder/zdict.c b/lib/dictBuilder/zdict.c
index 6bb66347753..69399ebe5f3 100644
--- a/lib/dictBuilder/zdict.c
+++ b/lib/dictBuilder/zdict.c
@@ -968,16 +968,11 @@ static size_t ZDICT_addEntropyTablesFromBuffer_advanced(
     return MIN(dictBufferCapacity, hSize+dictContentSize);
 }
 
-/* Hidden declaration for dbio.c */
-size_t ZDICT_trainFromBuffer_unsafe_legacy(
-                            void* dictBuffer, size_t maxDictSize,
-                            const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-                            ZDICT_legacy_params_t params);
 /*! ZDICT_trainFromBuffer_unsafe_legacy() :
 *   Warning : `samplesBuffer` must be followed by noisy guard band.
 *   @return : size of dictionary, or an error code which can be tested with ZDICT_isError()
 */
-size_t ZDICT_trainFromBuffer_unsafe_legacy(
+ZDICTLIB_API size_t ZDICT_trainFromBuffer_unsafe_legacy(
                             void* dictBuffer, size_t maxDictSize,
                             const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
                             ZDICT_legacy_params_t params)
diff --git a/programs/platform.h b/programs/platform.h
index 68be70bb333..ef320d14613 100644
--- a/programs/platform.h
+++ b/programs/platform.h
@@ -138,6 +138,7 @@ extern "C" {
 #  define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream))
 #elif defined(WIN32) || defined(_WIN32)
 #  include <io.h>      /* _isatty */
+   #define NOMINMAX    /* Avoid clashing name with max in windows.h and std */
 #  include <windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */
 #  include <stdio.h>   /* FILE */
 static __inline int IS_CONSOLE(FILE* stdStream) {