diff --git a/arpack-ng/cppbuild.sh b/arpack-ng/cppbuild.sh
index d0e1e29ebe..868fcd6af3 100755
--- a/arpack-ng/cppbuild.sh
+++ b/arpack-ng/cppbuild.sh
@@ -83,7 +83,18 @@ case $PLATFORM in
         make -j $MAKEJ
         make install-strip
         ;;
-    macosx-*)
+    macosx-arm64)
+        sed -i="" 's/install_name \\$rpath/install_name @rpath/g' configure m4/libtool.m4
+        export CC="$(compgen -cX '!gcc*')"
+        export CXX="$(compgen -cX '!g++*')"
+        export FC="$(compgen -cX '!gfortran*') -Wl,-rpath,@loader_path/"
+        export F77="$FC"
+        export FLIBS="-lgfortran"
+        ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas
+        make -j $MAKEJ
+        make install-strip
+        ;;
+    macosx-x86_64)
         sed -i="" 's/install_name \\$rpath/install_name @rpath/g' configure m4/libtool.m4
         export CC="$(ls -1 /usr/local/bin/gcc-* | head -n 1)"
         export CXX="$(ls -1 /usr/local/bin/g++-* | head -n 1)"
diff --git a/fftw/cppbuild.sh b/fftw/cppbuild.sh
index c2b7e18311..0a3d79f2cb 100755
--- a/fftw/cppbuild.sh
+++ b/fftw/cppbuild.sh
@@ -132,12 +132,21 @@ case $PLATFORM in
         make -j $MAKEJ V=0
         make install-strip
         ;;
-    macosx-*)
+    macosx-arm64)
         patch -Np1 < ../../../fftw-macosx.patch
-        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads --enable-sse2
+        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads
         make -j $MAKEJ V=0
         make install-strip
-        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads --enable-sse2 --enable-float
+        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads --enable-float
+        make -j $MAKEJ V=0
+        make install-strip
+        ;;
+    macosx-x86_64)
+        patch -Np1 < ../../../fftw-macosx.patch
+        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads --enable-sse2 --enable-avx
+        make -j $MAKEJ V=0
+        make install-strip
+        ./configure --prefix=$INSTALL_PATH --disable-fortran --enable-shared --enable-threads --with-combined-threads --enable-sse2 --enable-avx --enable-float
         make -j $MAKEJ V=0
         make install-strip
         ;;
diff --git a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java
index 7e04f0738f..4e27ca4b9f 100644
--- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java
+++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java
@@ -64,6 +64,7 @@
 //                "onnxruntime/core/providers/rocm/rocm_provider_factory.h",
 //                "onnxruntime/core/providers/dml/dml_provider_factory.h",
             },
+            exclude = {"CL/opencl.h", "CL/cl_version.h", "CL/cl_platform.h", "CL/cl.h"/*, "CL/cl_gl.h", "CL/cl_gl_ext.h", "CL/cl_ext.h"*/},
             link = {"onnxruntime_providers_shared", "onnxruntime@.1"}
         ),
         @Platform(
@@ -117,7 +118,8 @@ public class onnxruntime implements LoadEnabled, InfoMapper {
     }
 
     public void map(InfoMap infoMap) {
-        infoMap.put(new Info("ORTCHAR_T", "std::basic_string<ORTCHAR_T>",
+        infoMap.putFirst(new Info("opencl.h", "cl_version.h", "cl_platform.h", "cl.h"/*, "cl_gl.h", "cl_gl_ext.h", "cl_ext.h"*/).skip())
+               .put(new Info("ORTCHAR_T", "std::basic_string<ORTCHAR_T>",
                              "onnxruntime_float16::BFloat16Impl<BFloat16_t>",
                              "onnxruntime_float16::Float16Impl<Float16_t>").cppText("").cppTypes().cast().pointerTypes("Pointer"))
                .put(new Info("ORT_EXPORT", "ORT_API_CALL", "ORT_FILE", "NO_EXCEPTION", "ORT_ALL_ARGS_NONNULL", "OrtCustomOpApi").cppTypes().annotations())