diff --git a/demos/Arrays.cpp b/demos/Arrays.cpp
index 181320c79..7b44145be 100644
--- a/demos/Arrays.cpp
+++ b/demos/Arrays.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 Gradient.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 Gradient.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 Gradient.cpp
+// -I../include/ -std=c++11 Gradient.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/BasicUsage.cpp b/demos/BasicUsage.cpp
index 41a316201..e0aae4f01 100644
--- a/demos/BasicUsage.cpp
+++ b/demos/BasicUsage.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 BasicUsage.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 BasicUsage.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 BasicUsage.cpp
+// -I../include/ -std=c++11 BasicUsage.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/ComputerGraphics/smallpt/SmallPT.cpp b/demos/ComputerGraphics/smallpt/SmallPT.cpp
index cffb6d668..54c21c62a 100644
--- a/demos/ComputerGraphics/smallpt/SmallPT.cpp
+++ b/demos/ComputerGraphics/smallpt/SmallPT.cpp
@@ -9,7 +9,7 @@
 
 // To compile the demo please type:
 // path/to/clang++ -O3 -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so -I../../include/ -x c++ -std=c++11 -lstdc++ -lm SmallPT.cpp \
+// path/to/libclad.so -I../../include/ -std=c++11 SmallPT.cpp \
 // -fopenmp=libiomp5 -o SmallPT
 //
 // To run the demo please type:
@@ -18,7 +18,7 @@
 // A typical invocation would be:
 // ../../../../../obj/Debug+Asserts/bin/clang++ -O3 -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../../obj/Debug+Asserts/lib/libclad.dylib \
-// -I../../include/ -x c++ -std=c++11 -lstdc++ -lm SmallPT.cpp -fopenmp=libiomp5 -o SmallPT
+// -I../../include/ -std=c++11 SmallPT.cpp -fopenmp=libiomp5 -o SmallPT
 // ./SmallPT 500 && xv image.ppm
 
 // Necessary for clad to work include
diff --git a/demos/ControlFlow.cpp b/demos/ControlFlow.cpp
index eeb727127..fb67ddbf7 100644
--- a/demos/ControlFlow.cpp
+++ b/demos/ControlFlow.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 ControlFlow.C
+// path/to/libclad.so  -I../include/ -std=c++11 ControlFlow.C
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 ControlFlow.C
+// -I../include/ -std=c++11 ControlFlow.C
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/CustomTypeNumDiff.cpp b/demos/CustomTypeNumDiff.cpp
index f63cc32ce..0f92c22f9 100644
--- a/demos/CustomTypeNumDiff.cpp
+++ b/demos/CustomTypeNumDiff.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 CustomTypeNumDiff.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 CustomTypeNumDiff.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 CustomTypeNumDiff.cpp
+// -I../include/ -std=c++11 CustomTypeNumDiff.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/DebuggingClad.cpp b/demos/DebuggingClad.cpp
index 85ce4822c..16cb3259b 100644
--- a/demos/DebuggingClad.cpp
+++ b/demos/DebuggingClad.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 DebuggingClad.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 DebuggingClad.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 DebuggingClad.cpp
+// -I../include/ -std=c++11 DebuggingClad.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/ErrorEstimation/CustomModel/README.md b/demos/ErrorEstimation/CustomModel/README.md
index b93d90355..0e6d904ba 100644
--- a/demos/ErrorEstimation/CustomModel/README.md
+++ b/demos/ErrorEstimation/CustomModel/README.md
@@ -35,7 +35,7 @@ Now, to use your custom estimation model, you can just specify the `.so` created
 So a typical invocation to clad would then look like the following:
 
 ```bash
-clang++ -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang CLAD_INST/lib/clad.so -ICLAD_INST/include -x c++ -lstdc++ -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model -Xclang -plugin-arg-clad -Xclang ./libCustomModel.so CLAD_BASE/demos/CustomModel/test.cpp
+clang++ -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang CLAD_INST/lib/clad.so -ICLAD_INST/include -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model -Xclang -plugin-arg-clad -Xclang ./libCustomModel.so CLAD_BASE/demos/CustomModel/test.cpp
 ```
 ## Verifying results
 
diff --git a/demos/ErrorEstimation/FloatSum.cpp b/demos/ErrorEstimation/FloatSum.cpp
index 57c6908cc..8c039212c 100644
--- a/demos/ErrorEstimation/FloatSum.cpp
+++ b/demos/ErrorEstimation/FloatSum.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 FloatSum.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 FloatSum.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 FloatSum.cpp
+// -I../include/ -std=c++11 FloatSum.cpp
 //
 // To plot the results install gnuplot and type:
 //
diff --git a/demos/ErrorEstimation/PrintModel/README.md b/demos/ErrorEstimation/PrintModel/README.md
index 3a59905a0..a439941fb 100644
--- a/demos/ErrorEstimation/PrintModel/README.md
+++ b/demos/ErrorEstimation/PrintModel/README.md
@@ -34,7 +34,7 @@ Now, to use your custom estimation model, you can just specify the `.so` created
 So a typical invocation to clad would then look like the following:
 
 ```bash
-clang -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang CLAD_INST/lib/clad.so -ICLAD_INST/include -x c++ -lstdc++ -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model -Xclang -plugin-arg-clad -Xclang ./libPrintModel.so CLAD_BASE/demos/PrintModel/test.cpp
+clang++ -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang CLAD_INST/lib/clad.so -ICLAD_INST/include -Xclang -plugin-arg-clad -Xclang -fcustom-estimation-model -Xclang -plugin-arg-clad -Xclang ./libPrintModel.so CLAD_BASE/demos/PrintModel/test.cpp
 ```
 ## Verifying results
 
diff --git a/demos/Functor.cpp b/demos/Functor.cpp
index 03542701c..c6aeab478 100644
--- a/demos/Functor.cpp
+++ b/demos/Functor.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 Functor.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 Functor.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 Functor.cpp
+// -I../include/ -std=c++11 Functor.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/Gradient.cpp b/demos/Gradient.cpp
index 22cdbf217..8e511c36d 100644
--- a/demos/Gradient.cpp
+++ b/demos/Gradient.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 Gradient.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 Gradient.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 Gradient.cpp
+// -I../include/ -std=c++11 Gradient.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/GradientDescent.cpp b/demos/GradientDescent.cpp
index b67433b31..fffbe0354 100644
--- a/demos/GradientDescent.cpp
+++ b/demos/GradientDescent.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -lstdc++ -lm GradientDescent.cpp
+// path/to/libclad.so  -I../include/ GradientDescent.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -lstdc++ -lm GradientDescent.cpp
+// -I../include/ GradientDescent.cpp
 //
 // To plot the results install gnuplot and type:
 // gnuplot -e "plot 'dataset_gd.dat' with points pt 7; replot 'out_gd.dat' \
diff --git a/demos/Hessian.cpp b/demos/Hessian.cpp
index 2474986a0..438334652 100644
--- a/demos/Hessian.cpp
+++ b/demos/Hessian.cpp
@@ -9,12 +9,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 Hessian.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 Hessian.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 Hessian.cpp
+// -I../include/ -std=c++11 Hessian.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/ODESolverSensitivity.cpp b/demos/ODESolverSensitivity.cpp
index 0214727c5..ce878b4e4 100644
--- a/demos/ODESolverSensitivity.cpp
+++ b/demos/ODESolverSensitivity.cpp
@@ -12,12 +12,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -lstdc++ -lm ODESolverSensitivity.cpp
+// path/to/libclad.so  -I../include/ ODESolverSensitivity.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -lstdc++ -lm ODESolverSensitivity.cpp
+// -I../include/ ODESolverSensitivity.cpp
 //
 // To plot the results install gnuplot and type:
 // gnuplot -e "plot 'sens.dat' using 1:2 with lines; pause -1"
diff --git a/demos/OpenCL/RosenbrockFunction.cpp b/demos/OpenCL/RosenbrockFunction.cpp
index 3713564c1..efa97c133 100644
--- a/demos/OpenCL/RosenbrockFunction.cpp
+++ b/demos/OpenCL/RosenbrockFunction.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -framework opencl -x c++ -std=c++11 RosenbrockFunction.cpp
+// path/to/libclad.so  -I../include/ -framework opencl -std=c++11 RosenbrockFunction.cpp
 //
 // A typical invocation would be:
 // ../../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../../include/ -framework opencl -x c++ -std=c++11 RosenbrockFunction.cpp
+// -I../../include/ -framework opencl -std=c++11 RosenbrockFunction.cpp
 
 // Necessary for clad to work include
 //#include "clad/Differentiator/Differentiator.h"
diff --git a/demos/RosenbrockFunction.cpp b/demos/RosenbrockFunction.cpp
index 0cca03656..1d962db8d 100644
--- a/demos/RosenbrockFunction.cpp
+++ b/demos/RosenbrockFunction.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 RosenbrockFunction.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 RosenbrockFunction.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 RosenbrockFunction.cpp
+// -I../include/ -std=c++11 RosenbrockFunction.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"
diff --git a/demos/Templates.cpp b/demos/Templates.cpp
index 1c909226f..4b5e1f04a 100644
--- a/demos/Templates.cpp
+++ b/demos/Templates.cpp
@@ -8,12 +8,12 @@
 
 // To run the demo please type:
 // path/to/clang++  -Xclang -add-plugin -Xclang clad -Xclang -load -Xclang \
-// path/to/libclad.so  -I../include/ -x c++ -std=c++11 Templates.cpp
+// path/to/libclad.so  -I../include/ -std=c++11 Templates.cpp
 //
 // A typical invocation would be:
 // ../../../../obj/Debug+Asserts/bin/clang++  -Xclang -add-plugin -Xclang clad \
 // -Xclang -load -Xclang ../../../../obj/Debug+Asserts/lib/libclad.dylib     \
-// -I../include/ -x c++ -std=c++11 Templates.cpp
+// -I../include/ -std=c++11 Templates.cpp
 
 // Necessary for clad to work include
 #include "clad/Differentiator/Differentiator.h"