diff --git a/run_profile.sh b/run_profile.sh
index 8ea891ff..d478a529 100644
--- a/run_profile.sh
+++ b/run_profile.sh
@@ -1,4 +1,6 @@
-clang++ -pg -O1 -std=c++17 -fno-rtti -stdlib=libc++ -Wall -o pocketpy src/main.cpp
+python3 prebuild.py
+SRC=$(find src/ -name "*.cpp")
+clang++ -pg -O1 -std=c++17 -fno-rtti -stdlib=libc++ -Wfatal-errors -o pocketpy $SRC -Iinclude
 time ./pocketpy benchmarks/fib.py
 mv benchmarks/gmon.out .
 gprof pocketpy gmon.out > gprof.txt
diff --git a/run_profile_test.sh b/run_profile_test.sh
deleted file mode 100644
index 454b3d8e..00000000
--- a/run_profile_test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-clang++ -O2 -std=c++17 -fno-rtti --coverage -stdlib=libc++ -Wall -o pocketpy src/main.cpp
-time ./pocketpy benchmarks/fib.py
-rm -rf .coverage
-mkdir -p .coverage
-llvm-cov-15 gcov main.gc -r -s src/ >> .coverage/coverage.txt
-mv *.gcov .coverage
-rm main.gc*
diff --git a/run_tests.sh b/run_tests.sh
index 2ae38e2b..968e31bc 100644
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -3,7 +3,9 @@ SRC=$(find src/ -name "*.cpp")
 clang++ -std=c++17 -fno-rtti --coverage -O1 -stdlib=libc++ -Wfatal-errors -o pocketpy src2/main.cpp $SRC -Iinclude
 python3 scripts/run_tests.py
 rm -rf .coverage
-mkdir -p .coverage
-llvm-cov-15 gcov main.gc -r -s src/ >> .coverage/coverage.txt
+mkdir .coverage
+UNITS=$(find ./ -name "*.gcno")
+llvm-cov-15 gcov ${UNITS} -r -s include/ -r -s src/ >> .coverage/coverage.txt
 mv *.gcov .coverage
-rm *.gc*
+rm *.gcda
+rm *.gcno