From 08ce47854756120a3aec0daa9239c31ae5c7daac Mon Sep 17 00:00:00 2001
From: "Fred T. Hamster" <fred@feistymeow.org>
Date: Tue, 10 Feb 2026 08:03:33 -0500
Subject: [PATCH] good state with updated static built apps

buildor_gen_deps is cranking along nicely now.  fixed another bug in it about absolute paths.
regenerated the statically built apps that we hadn't done recently (by excluding the clam_tools).
these all compile and link properly now.
have not actually tested the callstack tracker yet.  that's next.
but it builds now, so it must be correct code, yes?  hahahaha, i amuse myself.
---
 infobase/fortunes.dat                         |  8 ++
 .../applications/bundler/bundle_creator.cpp   |  4 +
 .../applications/bundler/unpacker_stub.cpp    |  4 +
 nucleus/applications/nechung/cgi_nechung.cpp  |  4 +
 nucleus/applications/nechung/nechung.cpp      |  4 +
 .../applications/utilities/await_app_exit.cpp | 73 ++++++++-----------
 nucleus/applications/utilities/dirtree.cpp    |  4 +-
 .../utilities/time_running_app.cpp            | 37 ++++++++++
 .../utilities/time_set_effective_id.cpp       | 37 ++++++++++
 .../tools/simple_utilities/create_guid.cpp    |  2 +
 nucleus/tools/simple_utilities/playsound.cpp  |  2 +
 .../tools/simple_utilities/run_as_service.cpp | 52 ++-----------
 nucleus/tools/simple_utilities/short_path.cpp |  2 +
 nucleus/tools/simple_utilities/sleep_ms.cpp   |  2 +
 .../tools/simple_utilities/zap_process.cpp    |  2 +
 production/check_versions/check_versions.cpp  | 70 ++++++++----------
 scripts/clam/cpp/buildor_gen_deps.sh          | 16 ++--
 17 files changed, 188 insertions(+), 135 deletions(-)

diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat
index a06257fd..1af8cb10 100644
--- a/infobase/fortunes.dat
+++ b/infobase/fortunes.dat
@@ -45993,3 +45993,11 @@ i'm writing a steamy expose of
 the dental profession
 called "mouth wide open".
   -- fred t. hamster
+~
+Q: What did the judge say to the dentist?
+A: Take out the tooth, the whole tooth, and nothing but the tooth.
+~
+Now witness the firepower of this fully armed and operational battle station.
+Fire at will, commander.
+  -- Emperor Sheev Palpatine (Darth Sidious), Star Wars Universe
+
diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp
index 9313883f..65c387f3 100644
--- a/nucleus/applications/bundler/bundle_creator.cpp
+++ b/nucleus/applications/bundler/bundle_creator.cpp
@@ -973,11 +973,15 @@ HOOPLE_MAIN(bundle_creator, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
diff --git a/nucleus/applications/bundler/unpacker_stub.cpp b/nucleus/applications/bundler/unpacker_stub.cpp
index a9de74af..d982ade5 100644
--- a/nucleus/applications/bundler/unpacker_stub.cpp
+++ b/nucleus/applications/bundler/unpacker_stub.cpp
@@ -613,11 +613,15 @@ HOOPLE_MAIN(unpacker_stub, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
diff --git a/nucleus/applications/nechung/cgi_nechung.cpp b/nucleus/applications/nechung/cgi_nechung.cpp
index 46ddbaf9..dabe4d65 100644
--- a/nucleus/applications/nechung/cgi_nechung.cpp
+++ b/nucleus/applications/nechung/cgi_nechung.cpp
@@ -119,10 +119,14 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
diff --git a/nucleus/applications/nechung/nechung.cpp b/nucleus/applications/nechung/nechung.cpp
index 70b33063..b95ba9b1 100644
--- a/nucleus/applications/nechung/nechung.cpp
+++ b/nucleus/applications/nechung/nechung.cpp
@@ -82,10 +82,14 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
diff --git a/nucleus/applications/utilities/await_app_exit.cpp b/nucleus/applications/utilities/await_app_exit.cpp
index ec604ae4..20f98155 100644
--- a/nucleus/applications/utilities/await_app_exit.cpp
+++ b/nucleus/applications/utilities/await_app_exit.cpp
@@ -100,58 +100,45 @@ HOOPLE_MAIN(await_app_exit, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
-  #include <basis/byte_array.cpp>
-  #include <basis/callstack_tracker.cpp>
-  #include <basis/utf_conversion.cpp>
-  #include <basis/definitions.cpp>
-  #include <basis/earth_time.cpp>
-  #include <basis/guards.cpp>
+  #include <algorithms/sorts.cpp>
+  #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
-  #include <basis/log_base.cpp>
-  #include <basis/memory_checker.cpp>
+  #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
-  #include <basis/contracts.h>
-  #include <basis/outcome.cpp>
-  #include <basis/packable.cpp>
-  #include <basis/portable.cpp>
-  #include <basis/trap_new.addin>
-  #include <basis/untrap_new.addin>
-  #include <basis/utility.cpp>
-  #include <basis/version_record.cpp>
-  #include <structures/bit_vector.cpp>
-  #include <structures/byte_hasher.cpp>
-  #include <structures/configurator.cpp>
-  #include <structures/hash_table.h>
-  #include <structures/pointer_hash.h>
-  #include <structures/stack.h>
-  #include <structures/static_memory_gremlin.cpp>
-  #include <structures/string_hash.h>
-  #include <structures/string_hasher.cpp>
-  #include <structures/string_table.cpp>
-  #include <structures/symbol_table.h>
-  #include <structures/table_configurator.cpp>
-  #include <loggers/console_logger.cpp>
-  #include <loggers/file_logger.cpp>
-  #include <loggers/locked_logger.cpp>
-  #include <loggers/null_logger.cpp>
-  #include <loggers/program_wide_logger.cpp>
-  #include <timely/time_stamp.cpp>
-  #include <application/base_application.cpp>
-  #include <application/application_shell.cpp>
+  #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
   #include <filesystem/byte_filer.cpp>
-  #include <application/command_line.cpp>
-  #include <opsystem/critical_events.cpp>
   #include <filesystem/directory.cpp>
   #include <filesystem/filename.cpp>
-  #include <configuration/ini_configurator.cpp>
-  #include <opsystem/ini_parser.cpp>
-  #include <configuration/application_configuration.cpp>
-  #include <application/rendezvous.cpp>
+  #include <loggers/combo_logger.cpp>
+  #include <loggers/console_logger.cpp>
+  #include <loggers/critical_events.cpp>
+  #include <loggers/file_logger.cpp>
+  #include <loggers/program_wide_logger.cpp>
   #include <processes/process_control.cpp>
   #include <processes/process_entry.cpp>
+  #include <structures/bit_vector.cpp>
+  #include <structures/checksums.cpp>
+  #include <structures/object_packers.cpp>
+  #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
   #include <textual/byte_formatter.cpp>
   #include <textual/parser_bits.cpp>
   #include <textual/string_manipulation.cpp>
-  #include <configuration/variable_tokenizer.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_control.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
diff --git a/nucleus/applications/utilities/dirtree.cpp b/nucleus/applications/utilities/dirtree.cpp
index fe139dea..9a06491c 100644
--- a/nucleus/applications/utilities/dirtree.cpp
+++ b/nucleus/applications/utilities/dirtree.cpp
@@ -149,7 +149,9 @@ HOOPLE_MAIN(dirtree, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
@@ -168,10 +170,10 @@ HOOPLE_MAIN(dirtree, )
   #include <filesystem/directory.cpp>
   #include <filesystem/directory_tree.cpp>
   #include <filesystem/file_info.cpp>
-  #include <filesystem/file_time.cpp>
   #include <filesystem/filename.cpp>
   #include <filesystem/filename_list.cpp>
   #include <filesystem/filename_tree.cpp>
+  #include <filesystem/file_time.cpp>
   #include <filesystem/huge_file.cpp>
   #include <loggers/combo_logger.cpp>
   #include <loggers/console_logger.cpp>
diff --git a/nucleus/applications/utilities/time_running_app.cpp b/nucleus/applications/utilities/time_running_app.cpp
index cf8b8141..e67a18b8 100644
--- a/nucleus/applications/utilities/time_running_app.cpp
+++ b/nucleus/applications/utilities/time_running_app.cpp
@@ -89,5 +89,42 @@ HOOPLE_MAIN(time_running_app, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
+  #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
+  #include <basis/astring.cpp>
+  #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
+  #include <basis/mutex.cpp>
+  #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
+  #include <filesystem/byte_filer.cpp>
+  #include <filesystem/directory.cpp>
+  #include <filesystem/filename.cpp>
+  #include <loggers/combo_logger.cpp>
+  #include <loggers/console_logger.cpp>
+  #include <loggers/critical_events.cpp>
+  #include <loggers/file_logger.cpp>
+  #include <loggers/program_wide_logger.cpp>
+  #include <structures/bit_vector.cpp>
+  #include <structures/checksums.cpp>
+  #include <structures/object_packers.cpp>
+  #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
+  #include <textual/byte_formatter.cpp>
+  #include <textual/parser_bits.cpp>
+  #include <textual/string_manipulation.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
diff --git a/nucleus/applications/utilities/time_set_effective_id.cpp b/nucleus/applications/utilities/time_set_effective_id.cpp
index 07dda37e..855af339 100644
--- a/nucleus/applications/utilities/time_set_effective_id.cpp
+++ b/nucleus/applications/utilities/time_set_effective_id.cpp
@@ -82,5 +82,42 @@ HOOPLE_MAIN(time_set_effective_id, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
+  #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
+  #include <basis/astring.cpp>
+  #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
+  #include <basis/mutex.cpp>
+  #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
+  #include <filesystem/byte_filer.cpp>
+  #include <filesystem/directory.cpp>
+  #include <filesystem/filename.cpp>
+  #include <loggers/combo_logger.cpp>
+  #include <loggers/console_logger.cpp>
+  #include <loggers/critical_events.cpp>
+  #include <loggers/file_logger.cpp>
+  #include <loggers/program_wide_logger.cpp>
+  #include <structures/bit_vector.cpp>
+  #include <structures/checksums.cpp>
+  #include <structures/object_packers.cpp>
+  #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
+  #include <textual/byte_formatter.cpp>
+  #include <textual/parser_bits.cpp>
+  #include <textual/string_manipulation.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
diff --git a/nucleus/tools/simple_utilities/create_guid.cpp b/nucleus/tools/simple_utilities/create_guid.cpp
index c473c778..b455f98a 100644
--- a/nucleus/tools/simple_utilities/create_guid.cpp
+++ b/nucleus/tools/simple_utilities/create_guid.cpp
@@ -105,7 +105,9 @@ HOOPLE_MAIN(create_guid, )
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
diff --git a/nucleus/tools/simple_utilities/playsound.cpp b/nucleus/tools/simple_utilities/playsound.cpp
index 76b4b1d4..d1087210 100644
--- a/nucleus/tools/simple_utilities/playsound.cpp
+++ b/nucleus/tools/simple_utilities/playsound.cpp
@@ -65,6 +65,8 @@ out.log(a_sprintf("soundfile %d: %s", i, sound_file.s()), ALWAYS_PRINT);
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
diff --git a/nucleus/tools/simple_utilities/run_as_service.cpp b/nucleus/tools/simple_utilities/run_as_service.cpp
index 1f1edf4a..fb21a28f 100644
--- a/nucleus/tools/simple_utilities/run_as_service.cpp
+++ b/nucleus/tools/simple_utilities/run_as_service.cpp
@@ -61,55 +61,19 @@ The first parameter must be a user name that will be given the\n\
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
-  #include <basis/byte_array.cpp>
-  #include <basis/callstack_tracker.cpp>
-  #include <basis/utf_conversion.cpp>
-  #include <basis/definitions.cpp>
-  #include <basis/earth_time.cpp>
-  #include <basis/guards.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <basis/astring.cpp>
-  #include <basis/log_base.cpp>
-  #include <basis/memory_checker.cpp>
+  #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
-  #include <basis/contracts.h>
-  #include <basis/outcome.cpp>
-  #include <basis/packable.cpp>
-  #include <basis/portable.cpp>
-  #include <basis/trap_new.addin>
-  #include <basis/untrap_new.addin>
-  #include <basis/utility.cpp>
-  #include <basis/version_record.cpp>
-  #include <structures/bit_vector.cpp>
-  #include <structures/byte_hasher.cpp>
-  #include <structures/configurator.cpp>
-  #include <structures/hash_table.h>
-  #include <structures/pointer_hash.h>
-  #include <structures/stack.h>
-  #include <structures/static_memory_gremlin.cpp>
-  #include <structures/string_hash.h>
-  #include <structures/string_hasher.cpp>
-  #include <structures/string_table.cpp>
-  #include <structures/symbol_table.h>
-  #include <structures/table_configurator.cpp>
-  #include <loggers/console_logger.cpp>
-  #include <loggers/file_logger.cpp>
-  #include <loggers/locked_logger.cpp>
-  #include <loggers/null_logger.cpp>
-  #include <loggers/program_wide_logger.cpp>
-  #include <filesystem/byte_filer.cpp>
-  #include <application/command_line.cpp>
-  #include <opsystem/critical_events.cpp>
-  #include <filesystem/directory.cpp>
+  #include <basis/utf_conversion.cpp>
   #include <filesystem/filename.cpp>
-  #include <configuration/ini_configurator.cpp>
-  #include <opsystem/ini_parser.cpp>
-  #include <configuration/application_configuration.cpp>
-  #include <application/rendezvous.cpp>
+  #include <loggers/console_logger.cpp>
   #include <security/nt_security.cpp>
   #include <security/win32_security.cpp>
-  #include <textual/byte_formatter.cpp>
+  #include <structures/object_packers.cpp>
+  #include <structures/static_memory_gremlin.cpp>
   #include <textual/parser_bits.cpp>
-  #include <textual/string_manipulation.cpp>
-  #include <configuration/variable_tokenizer.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
diff --git a/nucleus/tools/simple_utilities/short_path.cpp b/nucleus/tools/simple_utilities/short_path.cpp
index acc899b7..9b616e02 100644
--- a/nucleus/tools/simple_utilities/short_path.cpp
+++ b/nucleus/tools/simple_utilities/short_path.cpp
@@ -50,6 +50,8 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
diff --git a/nucleus/tools/simple_utilities/sleep_ms.cpp b/nucleus/tools/simple_utilities/sleep_ms.cpp
index 352bb08d..986d3a34 100644
--- a/nucleus/tools/simple_utilities/sleep_ms.cpp
+++ b/nucleus/tools/simple_utilities/sleep_ms.cpp
@@ -47,6 +47,8 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
diff --git a/nucleus/tools/simple_utilities/zap_process.cpp b/nucleus/tools/simple_utilities/zap_process.cpp
index a398c0d2..7e6b6feb 100644
--- a/nucleus/tools/simple_utilities/zap_process.cpp
+++ b/nucleus/tools/simple_utilities/zap_process.cpp
@@ -84,7 +84,9 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <algorithms/sorts.cpp>
   #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
   #include <application/command_line.cpp>
   #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
diff --git a/production/check_versions/check_versions.cpp b/production/check_versions/check_versions.cpp
index 340dab58..cf3c5bfa 100644
--- a/production/check_versions/check_versions.cpp
+++ b/production/check_versions/check_versions.cpp
@@ -108,53 +108,41 @@ int main(int formal(argc), char *formal(argv)[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
-  #include <basis/byte_array.cpp>
-  #include <basis/callstack_tracker.cpp>
-  #include <basis/convert_utf.cpp>
-  #include <basis/definitions.cpp>
-  #include <basis/earth_time.cpp>
+  #include <algorithms/sorts.cpp>
+  #include <application/application_shell.cpp>
+  #include <application/callstack_tracker.cpp>
+  #include <application/windoze_helper.cpp>
+  #include <basis/astring.cpp>
+  #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
   #include <basis/guards.cpp>
-  #include <basis/istring.cpp>
-  #include <basis/log_base.cpp>
-  #include <basis/memory_checker.cpp>
   #include <basis/mutex.cpp>
-  #include <basis/object_base.h>
-  #include <basis/outcome.cpp>
-  #include <basis/packable.cpp>
-  #include <basis/portable.cpp>
-  #include <basis/trap_new.addin>
-  #include <basis/untrap_new.addin>
-  #include <basis/utility.cpp>
-  #include <basis/version_checker.cpp>
-  #include <basis/version_record.cpp>
-  #include <data_struct/bit_vector.cpp>
-  #include <data_struct/byte_hasher.cpp>
-  #include <data_struct/configurator.cpp>
-  #include <data_struct/pointer_hash.h>
-  #include <data_struct/stack.h>
-  #include <data_struct/static_memory_gremlin.cpp>
-  #include <data_struct/string_hash.h>
-  #include <data_struct/string_hasher.cpp>
-  #include <data_struct/string_table.cpp>
-  #include <data_struct/symbol_table.h>
-  #include <data_struct/table_configurator.cpp>
+  #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
+  #include <filesystem/byte_filer.cpp>
+  #include <filesystem/directory.cpp>
+  #include <filesystem/filename.cpp>
+  #include <loggers/combo_logger.cpp>
   #include <loggers/console_logger.cpp>
+  #include <loggers/critical_events.cpp>
   #include <loggers/file_logger.cpp>
-  #include <loggers/locked_logger.cpp>
-  #include <loggers/null_logger.cpp>
   #include <loggers/program_wide_logger.cpp>
-  #include <opsystem/byte_filer.cpp>
-  #include <opsystem/command_line.cpp>
-  #include <opsystem/critical_events.cpp>
-  #include <opsystem/directory.cpp>
-  #include <opsystem/filename.cpp>
-  #include <opsystem/ini_config.cpp>
-  #include <opsystem/ini_parser.cpp>
-  #include <opsystem/path_configuration.cpp>
-  #include <opsystem/rendezvous.cpp>
-  #include <textual/byte_format.cpp>
+  #include <structures/bit_vector.cpp>
+  #include <structures/checksums.cpp>
+  #include <structures/object_packers.cpp>
+  #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
+  #include <textual/byte_formatter.cpp>
   #include <textual/parser_bits.cpp>
   #include <textual/string_manipulation.cpp>
-  #include <textual/tokenizer.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
diff --git a/scripts/clam/cpp/buildor_gen_deps.sh b/scripts/clam/cpp/buildor_gen_deps.sh
index 41d461fd..13e1f109 100644
--- a/scripts/clam/cpp/buildor_gen_deps.sh
+++ b/scripts/clam/cpp/buildor_gen_deps.sh
@@ -573,26 +573,30 @@ for curr_parm in $*; do
 
   if [ -f "$curr_parm" ]; then
     echo "scanning file: $curr_parm"
-    # get absolute path of the containing directory.
-    prohibited_directory="$(\pwd "$curr_parm")"
+    prohibited_directory="$(dirname "$curr_parm")"
+    # get the absolute path of the containing directory with our freaky pwd trick.
+    prohibited_directory="$( \cd "$prohibited_directory" && \pwd )"
+echo "for file, containing dir absolute is now: $prohibited_directory"
     # fix our filename to be absolute.
     temp_absolute="$prohibited_directory/$(basename "$curr_parm")"
     curr_parm="$temp_absolute"
-#echo "curr_parm: $curr_parm"
+echo "curr_parm file: $curr_parm"
     find_dependencies "$curr_parm"
   elif [ -d "$curr_parm" ]; then
     echo "scanning folder: $curr_parm"
+    prohibited_directory="$(dirname "$curr_parm")"
     # get absolute path of the containing directory.
-    prohibited_directory="$(\pwd $curr_parm)"
+    prohibited_directory="$( \cd "$prohibited_directory" && \pwd )"
+echo "for dir, containing dir absolute is now: $prohibited_directory"
     # set the directory to that absolute path.
     curr_parm="$prohibited_directory"
-#echo "curr_parm: $curr_parm"
+echo "curr_parm dir: $curr_parm"
     local base="$(basename "$curr_parm")"
     outfile="$(mktemp $TEMPORARIES_PILE/zz_buildor_deps_outfile_${base}.XXXXXX)"
     find "$curr_parm" -iname "*.cpp" >"$outfile"
     while read -r line_found; do
       if [ $? != 0 ]; then break; fi
-#echo "looking at file: $line_found"
+echo "looking at file: $line_found"
       find_dependencies "$line_found"
     done <"$outfile"
     \rm -f "$outfile"
-- 
2.34.1