diff --git a/cppcheck.cbp b/cppcheck.cbp
index 51fc1ce71..e6b58ffc2 100644
--- a/cppcheck.cbp
+++ b/cppcheck.cbp
@@ -9,7 +9,6 @@
 		<Build>
 			<Target title="cppcheck">
 				<Option output="cppcheck" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,7 +17,6 @@
 			</Target>
 			<Target title="testrunner">
 				<Option output="testrunner" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,6 +28,11 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="cli/cppcheckexecutor.cpp" />
+		<Unit filename="cli/cppcheckexecutor.h" />
+		<Unit filename="cli/main.cpp" />
+		<Unit filename="cli/threadexecutor.cpp" />
+		<Unit filename="cli/threadexecutor.h" />
 		<Unit filename="gui/aboutdialog.cpp" />
 		<Unit filename="gui/aboutdialog.h" />
 		<Unit filename="gui/applicationdialog.cpp" />
@@ -83,8 +86,6 @@
 		<Unit filename="lib/checkmemoryleak.h" />
 		<Unit filename="lib/checkother.cpp" />
 		<Unit filename="lib/checkother.h" />
-		<Unit filename="lib/checksecurity.cpp" />
-		<Unit filename="lib/checksecurity.h" />
 		<Unit filename="lib/checkstl.cpp" />
 		<Unit filename="lib/checkstl.h" />
 		<Unit filename="lib/checkunusedfunctions.cpp" />
@@ -92,21 +93,16 @@
 		<Unit filename="lib/classinfo.h" />
 		<Unit filename="lib/cppcheck.cpp" />
 		<Unit filename="lib/cppcheck.h" />
-		<Unit filename="lib/cppcheckexecutor.cpp" />
-		<Unit filename="lib/cppcheckexecutor.h" />
 		<Unit filename="lib/errorlogger.cpp" />
 		<Unit filename="lib/errorlogger.h" />
 		<Unit filename="lib/filelister.cpp" />
 		<Unit filename="lib/filelister.h" />
-		<Unit filename="cli/main.cpp" />
 		<Unit filename="lib/mathlib.cpp" />
 		<Unit filename="lib/mathlib.h" />
 		<Unit filename="lib/preprocessor.cpp" />
 		<Unit filename="lib/preprocessor.h" />
 		<Unit filename="lib/settings.cpp" />
 		<Unit filename="lib/settings.h" />
-		<Unit filename="lib/threadexecutor.cpp" />
-		<Unit filename="lib/threadexecutor.h" />
 		<Unit filename="lib/token.cpp" />
 		<Unit filename="lib/token.h" />
 		<Unit filename="lib/tokenize.cpp" />