diff --git a/Makefile b/Makefile
index 3720c6c20..e9550ee53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 CXXFLAGS=-Wall -Wextra -pedantic -g
+COMPILER=g++
 BIN=${DESTDIR}/usr/bin
 
 
@@ -71,12 +72,12 @@ TESTOBJ =     test/testbufferoverrun.o \
 ###### Targets
 
 cppcheck:	$(OBJECTS)
-	g++ $(CXXFLAGS) -o cppcheck $(OBJECTS)
+	$(COMPILER) $(CXXFLAGS) -o cppcheck $(OBJECTS)
 
 all:	cppcheck	testrunner	tools
 
 testrunner:	$(TESTOBJ)
-	g++ $(CXXFLAGS) -o testrunner $(TESTOBJ)
+	$(COMPILER) $(CXXFLAGS) -o testrunner $(TESTOBJ)
 
 test:	all
 	./testrunner
@@ -84,10 +85,10 @@ test:	all
 tools:	tools/errmsg	tools/dmake
 
 tools/errmsg:	tools/errmsg.cpp
-	g++ $(CXXFLAGS) -o tools/errmsg tools/errmsg.cpp
+	$(COMPILER) $(CXXFLAGS) -o tools/errmsg tools/errmsg.cpp
 
 tools/dmake:	tools/dmake.cpp	src/filelister.cpp	src/filelister.h
-	g++ $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp
+	$(COMPILER) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp
 
 clean:
 	rm -f src/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg
@@ -100,133 +101,133 @@ install:	cppcheck
 ###### Build
 
 src/checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/settings.h src/tokenize.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkbufferoverrun.o src/checkbufferoverrun.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkbufferoverrun.o src/checkbufferoverrun.cpp
 
 src/checkclass.o: src/checkclass.cpp src/checkclass.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkclass.o src/checkclass.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkclass.o src/checkclass.cpp
 
 src/checkdangerousfunctions.o: src/checkdangerousfunctions.cpp src/checkdangerousfunctions.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkdangerousfunctions.o src/checkdangerousfunctions.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkdangerousfunctions.o src/checkdangerousfunctions.cpp
 
 src/checkfunctionusage.o: src/checkfunctionusage.cpp src/checkfunctionusage.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkfunctionusage.o src/checkfunctionusage.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkfunctionusage.o src/checkfunctionusage.cpp
 
 src/checkheaders.o: src/checkheaders.cpp src/checkheaders.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/filelister.h
-	g++ $(CXXFLAGS) -c -o src/checkheaders.o src/checkheaders.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkheaders.o src/checkheaders.cpp
 
 src/checkmemoryleak.o: src/checkmemoryleak.cpp src/checkmemoryleak.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkmemoryleak.o src/checkmemoryleak.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkmemoryleak.o src/checkmemoryleak.cpp
 
 src/checkother.o: src/checkother.cpp src/checkother.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/checkother.o src/checkother.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkother.o src/checkother.cpp
 
 src/checksecurity.o: src/checksecurity.cpp src/checksecurity.h src/errorlogger.h src/settings.h src/token.h src/tokenize.h
-	g++ $(CXXFLAGS) -c -o src/checksecurity.o src/checksecurity.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checksecurity.o src/checksecurity.cpp
 
 src/checkstl.o: src/checkstl.cpp src/checkstl.h src/errorlogger.h src/settings.h src/token.h src/tokenize.h
-	g++ $(CXXFLAGS) -c -o src/checkstl.o src/checkstl.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/checkstl.o src/checkstl.cpp
 
 src/cppcheck.o: src/cppcheck.cpp src/cppcheck.h src/settings.h src/errorlogger.h src/checkfunctionusage.h src/tokenize.h src/token.h src/preprocessor.h src/checkmemoryleak.h src/checkbufferoverrun.h src/checkdangerousfunctions.h src/checkclass.h src/checkheaders.h src/checkother.h src/checkstl.h src/filelister.h
-	g++ $(CXXFLAGS) -c -o src/cppcheck.o src/cppcheck.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/cppcheck.o src/cppcheck.cpp
 
 src/cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h src/threadexecutor.h
-	g++ $(CXXFLAGS) -c -o src/cppcheckexecutor.o src/cppcheckexecutor.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/cppcheckexecutor.o src/cppcheckexecutor.cpp
 
 src/errorlogger.o: src/errorlogger.cpp src/errorlogger.h src/settings.h src/tokenize.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/errorlogger.o src/errorlogger.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/errorlogger.o src/errorlogger.cpp
 
 src/filelister.o: src/filelister.cpp src/filelister.h
-	g++ $(CXXFLAGS) -c -o src/filelister.o src/filelister.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/filelister.o src/filelister.cpp
 
 src/main.o: src/main.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h
-	g++ $(CXXFLAGS) -c -o src/main.o src/main.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/main.o src/main.cpp
 
 src/preprocessor.o: src/preprocessor.cpp src/preprocessor.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/preprocessor.o src/preprocessor.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/preprocessor.o src/preprocessor.cpp
 
 src/settings.o: src/settings.cpp src/settings.h
-	g++ $(CXXFLAGS) -c -o src/settings.o src/settings.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/settings.o src/settings.cpp
 
 src/threadexecutor.o: src/threadexecutor.cpp src/threadexecutor.h src/settings.h src/errorlogger.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h
-	g++ $(CXXFLAGS) -c -o src/threadexecutor.o src/threadexecutor.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/threadexecutor.o src/threadexecutor.cpp
 
 src/token.o: src/token.cpp src/token.h
-	g++ $(CXXFLAGS) -c -o src/token.o src/token.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/token.o src/token.cpp
 
 src/tokenize.o: src/tokenize.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/filelister.h
-	g++ $(CXXFLAGS) -c -o src/tokenize.o src/tokenize.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o src/tokenize.o src/tokenize.cpp
 
 test/testbufferoverrun.o: test/testbufferoverrun.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkbufferoverrun.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testbufferoverrun.o test/testbufferoverrun.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testbufferoverrun.o test/testbufferoverrun.cpp
 
 test/testcharvar.o: test/testcharvar.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testcharvar.o test/testcharvar.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testcharvar.o test/testcharvar.cpp
 
 test/testclass.o: test/testclass.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testclass.o test/testclass.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testclass.o test/testclass.cpp
 
 test/testconstructors.o: test/testconstructors.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testconstructors.o test/testconstructors.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testconstructors.o test/testconstructors.cpp
 
 test/testcppcheck.o: test/testcppcheck.cpp test/testsuite.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkfunctionusage.h src/tokenize.h src/token.h
-	g++ $(CXXFLAGS) -c -o test/testcppcheck.o test/testcppcheck.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testcppcheck.o test/testcppcheck.cpp
 
 test/testdangerousfunctions.o: test/testdangerousfunctions.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkdangerousfunctions.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testdangerousfunctions.o test/testdangerousfunctions.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testdangerousfunctions.o test/testdangerousfunctions.cpp
 
 test/testdivision.o: test/testdivision.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testdivision.o test/testdivision.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testdivision.o test/testdivision.cpp
 
 test/testfilelister.o: test/testfilelister.cpp test/testsuite.h src/errorlogger.h src/settings.h src/filelister.h
-	g++ $(CXXFLAGS) -c -o test/testfilelister.o test/testfilelister.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testfilelister.o test/testfilelister.cpp
 
 test/testfunctionusage.o: test/testfunctionusage.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h test/testsuite.h src/checkfunctionusage.h
-	g++ $(CXXFLAGS) -c -o test/testfunctionusage.o test/testfunctionusage.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testfunctionusage.o test/testfunctionusage.cpp
 
 test/testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/token.h src/checkother.h
-	g++ $(CXXFLAGS) -c -o test/testincompletestatement.o test/testincompletestatement.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testincompletestatement.o test/testincompletestatement.cpp
 
 test/testmemleak.o: test/testmemleak.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testmemleak.o test/testmemleak.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testmemleak.o test/testmemleak.cpp
 
 test/testmemleakmp.o: test/testmemleakmp.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testmemleakmp.o test/testmemleakmp.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testmemleakmp.o test/testmemleakmp.cpp
 
 test/testother.o: test/testother.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testother.o test/testother.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testother.o test/testother.cpp
 
 test/testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h src/errorlogger.h src/settings.h src/preprocessor.h
-	g++ $(CXXFLAGS) -c -o test/testpreprocessor.o test/testpreprocessor.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testpreprocessor.o test/testpreprocessor.cpp
 
 test/testredundantif.o: test/testredundantif.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testredundantif.o test/testredundantif.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testredundantif.o test/testredundantif.cpp
 
 test/testrunner.o: test/testrunner.cpp test/testsuite.h src/errorlogger.h src/settings.h
-	g++ $(CXXFLAGS) -c -o test/testrunner.o test/testrunner.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testrunner.o test/testrunner.cpp
 
 test/testsecurity.o: test/testsecurity.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checksecurity.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testsecurity.o test/testsecurity.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testsecurity.o test/testsecurity.cpp
 
 test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/token.h
-	g++ $(CXXFLAGS) -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp
 
 test/teststl.o: test/teststl.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkstl.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/teststl.o test/teststl.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/teststl.o test/teststl.cpp
 
 test/testsuite.o: test/testsuite.cpp test/testsuite.h src/errorlogger.h src/settings.h
-	g++ $(CXXFLAGS) -c -o test/testsuite.o test/testsuite.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testsuite.o test/testsuite.cpp
 
 test/testtoken.o: test/testtoken.cpp test/testsuite.h src/errorlogger.h src/settings.h src/token.h
-	g++ $(CXXFLAGS) -c -o test/testtoken.o test/testtoken.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testtoken.o test/testtoken.cpp
 
 test/testtokenize.o: test/testtokenize.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/token.h
-	g++ $(CXXFLAGS) -c -o test/testtokenize.o test/testtokenize.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testtokenize.o test/testtokenize.cpp
 
 test/testunusedprivfunc.o: test/testunusedprivfunc.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
-	g++ $(CXXFLAGS) -c -o test/testunusedprivfunc.o test/testunusedprivfunc.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testunusedprivfunc.o test/testunusedprivfunc.cpp
 
 test/testunusedvar.o: test/testunusedvar.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/token.h src/checkother.h
-	g++ $(CXXFLAGS) -c -o test/testunusedvar.o test/testunusedvar.cpp
+	$(COMPILER) $(CXXFLAGS) -c -o test/testunusedvar.o test/testunusedvar.cpp
 
 src/errorlogger.h:	tools/errmsg
 	tools/errmsg
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 6c5217645..b36541854 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -79,6 +79,7 @@ int main()
 
     // more warnings.. -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op
     fout << "CXXFLAGS=-Wall -Wextra -pedantic -g\n";
+    fout << "COMPILER=g++\n";
     fout << "BIN=${DESTDIR}/usr/bin\n\n";
 
     fout << "\n###### Object Files\n\n";
@@ -99,17 +100,17 @@ int main()
 
     fout << "\n###### Targets\n\n";
     fout << "cppcheck:\t$(OBJECTS)\n";
-    fout << "\tg++ $(CXXFLAGS) -o cppcheck $(OBJECTS)\n\n";
+    fout << "\t$(COMPILER) $(CXXFLAGS) -o cppcheck $(OBJECTS)\n\n";
     fout << "all:\tcppcheck\ttestrunner\ttools\n\n";
     fout << "testrunner:\t$(TESTOBJ)\n";
-    fout << "\tg++ $(CXXFLAGS) -o testrunner $(TESTOBJ)\n\n";
+    fout << "\t$(COMPILER) $(CXXFLAGS) -o testrunner $(TESTOBJ)\n\n";
     fout << "test:\tall\n";
     fout << "\t./testrunner\n\n";
     fout << "tools:\ttools/errmsg\ttools/dmake\n\n";
     fout << "tools/errmsg:\ttools/errmsg.cpp\n";
-    fout << "\tg++ $(CXXFLAGS) -o tools/errmsg tools/errmsg.cpp\n\n";
+    fout << "\t$(COMPILER) $(CXXFLAGS) -o tools/errmsg tools/errmsg.cpp\n\n";
     fout << "tools/dmake:\ttools/dmake.cpp\tsrc/filelister.cpp\tsrc/filelister.h\n";
-    fout << "\tg++ $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp\n\n";
+    fout << "\t$(COMPILER) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp\n\n";
     fout << "clean:\n";
     fout << "\trm -f src/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg\n\n";
     fout << "install:\tcppcheck\n";
@@ -125,7 +126,7 @@ int main()
         getDeps(srcfiles[i], depfiles);
         for (unsigned int dep = 0; dep < depfiles.size(); ++dep)
             fout << " " << depfiles[dep];
-        fout << "\n\tg++ $(CXXFLAGS) -c -o " << objfile(srcfiles[i]) << " " << srcfiles[i] << "\n\n";
+        fout << "\n\t$(COMPILER) $(CXXFLAGS) -c -o " << objfile(srcfiles[i]) << " " << srcfiles[i] << "\n\n";
     }
 
     for (unsigned int i = 0; i < testfiles.size(); ++i)
@@ -135,7 +136,7 @@ int main()
         getDeps(testfiles[i], depfiles);
         for (unsigned int dep = 0; dep < depfiles.size(); ++dep)
             fout << " " << depfiles[dep];
-        fout << "\n\tg++ $(CXXFLAGS) -c -o " << objfile(testfiles[i]) << " " << testfiles[i] << "\n\n";
+        fout << "\n\t$(COMPILER) $(CXXFLAGS) -c -o " << objfile(testfiles[i]) << " " << testfiles[i] << "\n\n";
     }
 
     fout << "src/errorlogger.h:\ttools/errmsg\n";