diff --git a/.ci/bootstrap.sh b/.ci/bootstrap.sh
index 5cacdd352..ac43d2b76 100755
--- a/.ci/bootstrap.sh
+++ b/.ci/bootstrap.sh
@@ -28,7 +28,7 @@ cp -r internal/source/* internal/temp/
 cd internal/c
 echo -n "Bootstrapping QB64..."
 if [[ $OS == "osx" ]]; then
-    clang -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -lcurses -o ../../qb64_bootstrap
+    clang++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -lcurses -o ../../qb64_bootstrap
 else
     g++ -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lcurses -lpthread -ldl -lrt -D FREEGLUT_STATIC -DDEPENDENCY_USER_MODS -o ../../qb64_bootstrap
 fi
diff --git a/internal/c/libqb/os/osx/build_test.command b/internal/c/libqb/os/osx/build_test.command
index 2e8b54995..0d6da4916 100755
--- a/internal/c/libqb/os/osx/build_test.command
+++ b/internal/c/libqb/os/osx/build_test.command
@@ -1,5 +1,5 @@
 cd "$(dirname "$0")"
-clang -c -w -Wall ../../../libqb.mm -D DEPENDENCY_AUDIO_OUT -D DEPENDENCY_AUDIO_DECODE -D DEPENDENCY_AUDIO_CONVERSION -o libqb_test_only.o
+clang++ -c -w -Wall ../../../libqb.mm -D DEPENDENCY_AUDIO_OUT -D DEPENDENCY_AUDIO_DECODE -D DEPENDENCY_AUDIO_CONVERSION -o libqb_test_only.o
 echo "Press any key to continue"
 Pause()
 {
diff --git a/internal/c/libqb/os/osx/setup_build.command b/internal/c/libqb/os/osx/setup_build.command
index 1c3a4cd57..6db7d8eb1 100755
--- a/internal/c/libqb/os/osx/setup_build.command
+++ b/internal/c/libqb/os/osx/setup_build.command
@@ -1,3 +1,3 @@
 cd "$(dirname "$0")"
-clang -c -w -Wall ../../../libqb.mm -D DEPENDENCY_LOADFONT -o libqb_setup.o
+clang++ -c -w -Wall ../../../libqb.mm -D DEPENDENCY_LOADFONT -o libqb_setup.o
 
diff --git a/internal/c/makeline_macos.txt b/internal/c/makeline_macos.txt
index 8323298da..f44517f5c 100644
--- a/internal/c/makeline_macos.txt
+++ b/internal/c/makeline_macos.txt
@@ -1,4 +1,4 @@
-clang -w qbx.cpp  -framework OpenGL -framework IOKit -framework GLUT -framework OpenGL -framework Cocoa  -o 
+clang++ -w qbx.cpp  -framework OpenGL -framework IOKit -framework GLUT -framework OpenGL -framework Cocoa  -o 
 
 (below for reference purposes only, above is minimum viable)
-clang -w qbx.cpp -framework ApplicationServices -framework OpenGL -framework IOKit -framework CoreServices -framework CoreFoundation -framework GLUT -framework OpenGL -framework Cocoa  -o 
\ No newline at end of file
+clang++ -w qbx.cpp -framework ApplicationServices -framework OpenGL -framework IOKit -framework CoreServices -framework CoreFoundation -framework GLUT -framework OpenGL -framework Cocoa  -o 
\ No newline at end of file
diff --git a/internal/c/parts/video/font/ttf/os/osx/build.command b/internal/c/parts/video/font/ttf/os/osx/build.command
index 89ae17c1a..0f64658b1 100755
--- a/internal/c/parts/video/font/ttf/os/osx/build.command
+++ b/internal/c/parts/video/font/ttf/os/osx/build.command
@@ -1,5 +1,5 @@
 cd "$(dirname "$0")"
-clang -s -c -w -Wall ../../src/freetypeamalgam.c -o src.o
+clang++ -s -c -w -Wall ../../src/freetypeamalgam.c -o src.o
 echo "Press any key to continue..."
 Pause()
 {
diff --git a/internal/c/parts/video/font/ttf/os/osx/setup_build.command b/internal/c/parts/video/font/ttf/os/osx/setup_build.command
index dbce6d1e5..0ea7f68d1 100755
--- a/internal/c/parts/video/font/ttf/os/osx/setup_build.command
+++ b/internal/c/parts/video/font/ttf/os/osx/setup_build.command
@@ -1,2 +1,2 @@
 cd "$(dirname "$0")"
-clang -s -c -w -Wall ../../src/freetypeamalgam.c -o src.o
+clang++ -s -c -w -Wall ../../src/freetypeamalgam.c -o src.o
diff --git a/setup_macos.command b/setup_macos.command
index 79fddb89d..01cb7a0bc 100755
--- a/setup_macos.command
+++ b/setup_macos.command
@@ -48,7 +48,7 @@ popd >/dev/null
 echo "Building 'QB64' (~3 min)"
 cp ./internal/source/* ./internal/temp/
 pushd internal/c >/dev/null
-clang -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
+clang++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
 popd >/dev/null
 
 echo ""