diff --git a/ci/create-sdk-mac.sh b/ci/create-sdk-mac.sh
index fda646d880..c6a8f5e5f0 100755
--- a/ci/create-sdk-mac.sh
+++ b/ci/create-sdk-mac.sh
@@ -15,7 +15,7 @@ mkdir -p "$LIB"
 mkdir -p "$LIB/cmake/score"
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $SCRIPTDIR/create-sdk-common.sh
+source "$SCRIPTDIR/create-sdk-common.sh"
 
 export XCODE=$XCODE_ROOT/Contents/Developer
 export XCODE_MACOS_SDK=$XCODE/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
@@ -24,7 +24,7 @@ export XCODE_TOOLCHAIN=$XCODE/Toolchains/XcodeDefault.xctoolchain
 
 # Copy OS API headers
 rsync -ar "$XCODE_MACOS_SDK/usr/include/" "$INCLUDE/"
-rsync -ar "$XCODE_TOOLCHAIN/usr/include/c++" "$INCLUDE/"
+rsync -ar "$XCODE_MACOS_SDK/usr/include/c++" "$INCLUDE/"
 
 # Copy clang lib headers
 export LLVM_VER=$(ls $OSSIA_SDK/llvm-libs/lib/clang | sort -r | head -1)
@@ -35,14 +35,14 @@ rsync -ar "$OSSIA_SDK/llvm-libs/lib/clang/$LLVM_VER/include" "$LIB/clang/$LLVM_V
 for fw in IOKit CFNetwork CoreFoundation CoreAudio CoreText Foundation DiskArbitration Accelerate AudioToolbox Security SystemConfiguration CoreGraphics ApplicationServices CoreServices Carbon Cocoa; do
   echo "$fw"
   mkdir -p "$INCLUDE/macos-sdks/$fw"
-  rsync -ar $XCODE_MACOS_FRAMEWORKS/$fw.framework/Headers/ "$INCLUDE/macos-sdks/$fw/" || true
+  rsync -ar "$XCODE_MACOS_FRAMEWORKS/$fw.framework/Headers/" "$INCLUDE/macos-sdks/$fw/" || true
 
-  if [[ -d $XCODE_MACOS_FRAMEWORKS/$fw.framework/Versions/A/Frameworks/ ]]; then
-    for subfw_path in $XCODE_MACOS_FRAMEWORKS/$fw.framework/Versions/A/Frameworks/* ; do
+  if [[ -d "$XCODE_MACOS_FRAMEWORKS/$fw.framework/Versions/A/Frameworks/" ]]; then
+    for subfw_path in "$XCODE_MACOS_FRAMEWORKS/$fw.framework/Versions/A/Frameworks"/* ; do
       subfw=$(basename $subfw_path | cut -d'.' -f1)
       echo "  :: $subfw"
       mkdir -p "$INCLUDE/macos-sdks/$subfw"
-      rsync -ar $subfw_path/Headers/ "$INCLUDE/macos-sdks/$subfw/" || true
+      rsync -ar "$subfw_path/Headers/" "$INCLUDE/macos-sdks/$subfw/" || true
     done
   fi
 done