diff --git a/src/script_opt/CPP/bare-embedded-build b/src/script_opt/CPP/bare-embedded-build
index 5001e9923a..af0cf37a9a 100755
--- a/src/script_opt/CPP/bare-embedded-build
+++ b/src/script_opt/CPP/bare-embedded-build
@@ -2,11 +2,8 @@
 
 build=../../../build
 
-echo > CPP-gen-addl.h
-(cd $build
- export -n ZEEK_USE_CPP ZEEK_ADD_CPP
- export ZEEK_HASH_DIR=.
- echo | src/zeek -b -O gen-C++
-)
-mv $build/CPP-gen-addl.h CPP-gen.cc
-(cd $build ; ninja || echo Bare embedded build failed)
+cd $build
+export -n ZEEK_USE_CPP ZEEK_ADD_CPP
+export ZEEK_HASH_DIR=.
+echo | src/zeek -b -O gen-C++
+ninja || echo Bare embedded build failed
diff --git a/src/script_opt/CPP/full-embedded-build b/src/script_opt/CPP/full-embedded-build
index b542086bcc..de4ac500cb 100755
--- a/src/script_opt/CPP/full-embedded-build
+++ b/src/script_opt/CPP/full-embedded-build
@@ -2,11 +2,8 @@
 
 build=../../../build
 
-echo > CPP-gen-addl.h
-(cd $build
- export -n ZEEK_USE_CPP ZEEK_ADD_CPP
- export ZEEK_HASH_DIR=.
- echo | src/zeek -O gen-C++
-)
-mv $build/CPP-gen-addl.h CPP-gen.cc
-(cd $build ; ninja || echo Full embedded build failed)
+cd $build
+export -n ZEEK_USE_CPP ZEEK_ADD_CPP
+export ZEEK_HASH_DIR=.
+echo | src/zeek -O gen-C++
+ninja || echo Full embedded build failed
diff --git a/src/script_opt/CPP/non-embedded-build b/src/script_opt/CPP/non-embedded-build
index 7d8e7b50c5..ec925184e4 100755
--- a/src/script_opt/CPP/non-embedded-build
+++ b/src/script_opt/CPP/non-embedded-build
@@ -1,7 +1,5 @@
 #! /bin/sh
 
-base=../../..
-so=$base/src/script_opt/CPP
-echo > $so/CPP-gen.cc
-cd $base/build
+cd ../../../build
+echo >CPP-gen.cc
 ninja || echo Non-embedded build failed
diff --git a/src/script_opt/CPP/single-full-test.sh b/src/script_opt/CPP/single-full-test.sh
index f4802230ff..84d9b21479 100755
--- a/src/script_opt/CPP/single-full-test.sh
+++ b/src/script_opt/CPP/single-full-test.sh
@@ -4,11 +4,8 @@ echo $1
 
 base=../../..
 test=$base/testing/btest
-so=$base/src/script_opt/CPP
 build=$base/build
-gen=CPP-gen-addl.h
-
-echo >$gen
+gen=CPP-gen.cc
 
 ./non-embedded-build >$build/errs 2>&1 || echo non-embedded build failed
 
@@ -17,7 +14,7 @@ export ZEEK_HASH_DIR=$test ZEEK_GEN_CPP=
 cd $test
 ../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
 grep -c '^namespace' $gen
-mv $gen $so/CPP-gen.cc
+mv $gen $build/
 cd $build
 ninja >& errs || echo build for $1 failed
 
diff --git a/src/script_opt/CPP/single-test.sh b/src/script_opt/CPP/single-test.sh
index a6e56eb07c..6d2a117e67 100755
--- a/src/script_opt/CPP/single-test.sh
+++ b/src/script_opt/CPP/single-test.sh
@@ -4,18 +4,16 @@ echo $1
 
 base=../../..
 test=$base/testing/btest
-so=$base/src/script_opt/CPP
 build=$base/build
-gen=CPP-gen-addl.h
+gen=CPP-gen.cc
 
 export -n ZEEK_USE_CPP
 export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
 cd $test
 cp $build/CPP-hashes.dat .
-echo >$gen
 ../../auxil/btest/btest $1 >cpp-build-$1.out 2>&1
 grep -c '^namespace' $gen
-mv $gen $so
+mv $gen $build
 cd $build
 ninja >& errs || echo build for $1 failed
 
diff --git a/src/script_opt/CPP/update-single-test.sh b/src/script_opt/CPP/update-single-test.sh
index dcdecfbb70..aa521a053e 100755
--- a/src/script_opt/CPP/update-single-test.sh
+++ b/src/script_opt/CPP/update-single-test.sh
@@ -2,18 +2,16 @@
 
 base=../../..
 test=$base/testing/btest
-so=$base/src/script_opt/CPP
 build=$base/build
-gen=CPP-gen-addl.h
+gen=CPP-gen.cc
 
 export -n ZEEK_USE_CPP
 export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
 cd $test
 cp $build/CPP-hashes.dat .
-echo >$gen
 ../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
 grep -c '^namespace' $gen
-mv $gen $so
+mv $gen $build/
 cd $build
 ninja >& errs || echo build for $1 failed