diff --git a/include/trick/files_to_ICG.hh b/include/trick/files_to_ICG.hh
index 0bf71d6e..cf92da51 100644
--- a/include/trick/files_to_ICG.hh
+++ b/include/trick/files_to_ICG.hh
@@ -52,6 +52,8 @@
 #include "trick/RKF78_Integrator.hh"
 #include "trick/RKG4_Integrator.hh"
 
+#include "trick/SimTime.hh"
+
 /* from the er7_utils directory */
 #ifdef USE_ER7_UTILS_INTEGRATORS
 #include "er7_utils/trick/include/files_to_ICG.hh"
diff --git a/libexec/trick/pm/s_source.pm b/libexec/trick/pm/s_source.pm
index 6eac65a4..aed69312 100644
--- a/libexec/trick/pm/s_source.pm
+++ b/libexec/trick/pm/s_source.pm
@@ -20,7 +20,6 @@ sub s_source($) {
 
     # Get Trick version
     my ($version, $thread) = get_trick_version() ;
-    $thread =~ s/\d+\.// ;
 
     #---------------------------
     # Get date
@@ -183,9 +182,9 @@ PURPOSE:
      "void memory_init( void ) {\n\n" ;
 
     print S_SOURCE " " x 4 , "ALLOC_INFO * ai ;\n" ;
-    print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version-$thread, $date\" \) ;\n" ;
+    print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version, $date\" \) ;\n" ;
     print S_SOURCE " " x 4 , "exec_set_build_date\( \"$date\" \) ;\n" ;
-    print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version-$thread\" \) ;\n\n" ;
+    print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version\" \) ;\n\n" ;
 
     print S_SOURCE " " x 4 , "populate_sim_services_class_map\(\) ;\n" ;
     print S_SOURCE " " x 4 , "populate_sim_services_enum_map\(\) ;\n" ;
diff --git a/share/trick/sim_objects/default_trick_sys.sm b/share/trick/sim_objects/default_trick_sys.sm
index c541d048..b7b798fc 100644
--- a/share/trick/sim_objects/default_trick_sys.sm
+++ b/share/trick/sim_objects/default_trick_sys.sm
@@ -93,6 +93,7 @@ a replacement SimObject will create an uncompilable sim.
 ##include "trick/RtiStager.hh"
 ##include "trick/RtiExec.hh"
 ##include "trick/UdUnits.hh"
+##include "trick/SimTime.hh"
 
 // This is a user header block.  Code here is copied without processing to S_source.hh
 %header{
diff --git a/trick_source/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i
index 4bb17c26..889acd54 100644
--- a/trick_source/trick_swig/sim_services.i
+++ b/trick_source/trick_swig/sim_services.i
@@ -99,6 +99,9 @@
 #include "trick/RKF78_Integrator.hh"
 #include "trick/RKG4_Integrator.hh"
 
+#include "trick/SimTime.hh"
+#include "trick/simtime_proto.h"
+
 #include "trick/MSSocket.hh"
 #include "trick/MSSharedMem.hh"
 #include "trick/Master.hh"