nasa · brendan-nasa · Aug 4, 2026 · Aug 4, 2026
diff --git a/docs/documentation/building_a_simulation/Simulation-Definition-File.md b/docs/documentation/building_a_simulation/Simulation-Definition-File.md
@@ -773,7 +773,7 @@ text in bold indicates code which will be unchanged regardless of the parameters
 
 ```C++
 #include "dynamics/v2/dynamics.h"
-#include "sim_services/include/collect_macros.h"
+#include "trick/collect_macros.h"
 
 int derivative_job( DYN_ROT * R ) {
 

diff --git a/docs/documentation/simulation_capabilities/Executive-Scheduler.md b/docs/documentation/simulation_capabilities/Executive-Scheduler.md
@@ -129,7 +129,7 @@ exec_get_mode returns the current mode of the simulation.  See the SIM_MODE defi
 
 ```c
 // C/C++ code
-#include "sim_services/Executive/include/exec_proto.h"
+#include "trick/exec_proto.h"
 exec_freeze()
 ```
 

diff --git a/docs/documentation/simulation_capabilities/Integrator.md b/docs/documentation/simulation_capabilities/Integrator.md
@@ -19,7 +19,7 @@ CLASS:     (integration)
 ...
 */
 #include "ip_state.h"
-#include "sim_services/Integrator/include/integrator_c_intf.h"
+#include "trick/integrator_c_intf.h"
 
 int integration_test( IP_STATE* s)
 {

diff --git a/docs/tutorial/ATutMonteCarlo.md b/docs/tutorial/ATutMonteCarlo.md
@@ -224,7 +224,7 @@ PURPOSE: Monte Carlo optimization functions.
 
 #include "../include/optimization.h"
 #include "../include/cannon.h"
-#include "sim_services/MonteCarlo/include/montecarlo_c_intf.h"
+#include "trick/montecarlo_c_intf.h"
 
 int cannon_slave_post(CANNON *C)
 {

diff --git a/include/trick/compat/sim_services/CheckPointRestart/include/stl_s_define_macro.hh b/include/trick/compat/sim_services/CheckPointRestart/include/stl_s_define_macro.hh
diff --git a/include/trick/compat/sim_services/Clock/include/BC635Clock.hh b/include/trick/compat/sim_services/Clock/include/BC635Clock.hh
diff --git a/include/trick/compat/sim_services/Clock/include/TPROCTEClock.hh b/include/trick/compat/sim_services/Clock/include/TPROCTEClock.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_alloc_deps.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_alloc_deps.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_get_enumerated.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_get_enumerated.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_ref_name_from_address.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_ref_name_from_address.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_test.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_test.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_user_defined_types.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_user_defined_types.hh
diff --git a/include/trick/compat/sim_services/MemoryManager/test/MM_write_checkpoint.hh b/include/trick/compat/sim_services/MemoryManager/test/MM_write_checkpoint.hh
diff --git a/...ude/trick/compat/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh b/...ude/trick/compat/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh
diff --git a/include/trick/compat/sim_services/STL/include/checkpoint_trick_map_stl.hh b/include/trick/compat/sim_services/STL/include/checkpoint_trick_map_stl.hh
diff --git a/include/trick/compat/sim_services/STL/include/checkpoint_trick_pair_stl.hh b/include/trick/compat/sim_services/STL/include/checkpoint_trick_pair_stl.hh
diff --git a/include/trick/compat/sim_services/STL/include/checkpoint_trick_sequence_stl.hh b/include/trick/compat/sim_services/STL/include/checkpoint_trick_sequence_stl.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_deque.hh b/include/trick/compat/sim_services/STL/include/trick_deque.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_list.hh b/include/trick/compat/sim_services/STL/include/trick_list.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_map.hh b/include/trick/compat/sim_services/STL/include/trick_map.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_pair.hh b/include/trick/compat/sim_services/STL/include/trick_pair.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_queue.hh b/include/trick/compat/sim_services/STL/include/trick_queue.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_set.hh b/include/trick/compat/sim_services/STL/include/trick_set.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_stack.hh b/include/trick/compat/sim_services/STL/include/trick_stack.hh
diff --git a/include/trick/compat/sim_services/STL/include/trick_vector.hh b/include/trick/compat/sim_services/STL/include/trick_vector.hh
diff --git a/include/trick/compat/sim_services/Units/doc/units.html b/include/trick/compat/sim_services/Units/doc/units.html
diff --git a/include/trick/compat/sim_services/VariableServer/include/VariableServerReference.hh b/include/trick/compat/sim_services/VariableServer/include/VariableServerReference.hh
diff --git a/include/trick/compat/sim_services/VariableServer/include/VariableServerThread.hh b/include/trick/compat/sim_services/VariableServer/include/VariableServerThread.hh
diff --git a/include/trick/compat/sim_services/VariableServer/include/variable_server.h b/include/trick/compat/sim_services/VariableServer/include/variable_server.h
diff --git a/include/trick/compat/trick_utils/reqs/include/RequirementScribe.hh b/include/trick/compat/trick_utils/reqs/include/RequirementScribe.hh
diff --git a/test/SIM_alloc_test/models/allocation/include/AllocTest.hh b/test/SIM_alloc_test/models/allocation/include/AllocTest.hh
@@ -12,8 +12,9 @@ PURPOSE:
 
 // System include files.
 
+#include "trick/mm_macros.hh"
+
 #include <iostream>
-#include "sim_services/include/mm_macros.hh"
 
 class AllocTest {
     public:

diff --git a/test/SIM_demo_inputfile/models/InputProcessSimObject/include/InputProcessSimObject.hh b/test/SIM_demo_inputfile/models/InputProcessSimObject/include/InputProcessSimObject.hh
@@ -10,11 +10,11 @@ LIBRARY_DEPENDENCIES:
 #ifndef INPUTPROCESSSIMOBJECT_HH
 #define INPUTPROCESSSIMOBJECT_HH
 
-#include <vector>
-#include <string>
-#include <map>
+#include "trick/SimObject.hh"
 
-#include "sim_services/SimObject/include/SimObject.hh"
+#include <map>
+#include <string>
+#include <vector>
 
 namespace Trick {
 

diff --git a/test/SIM_demo_sdefine/S_define b/test/SIM_demo_sdefine/S_define
@@ -10,9 +10,9 @@ LIBRARY DEPENDENCIES:
 
 
 ##include <math.h>
-##include "sim_services/Message/include/message_proto.h"
-##include "sim_services/Integrator/include/Integrator.hh"
-##include "sim_services/Integrator/include/integrator_c_intf.h"
+##include "trick/message_proto.h"
+##include "trick/Integrator.hh"
+##include "trick/integrator_c_intf.h"
 
 /* base ball... get it? :) */
 class ballSimObject : public Trick::SimObject {

diff --git a/test/SIM_dynamic_sim_object/S_define b/test/SIM_dynamic_sim_object/S_define
@@ -8,7 +8,7 @@ LIBRARY DEPENDENCIES:
 
 #include "sim_objects/default_trick_sys.sm"
 
-##include "sim_services/Integrator/include/integrator_c_intf.h"
+##include "trick/integrator_c_intf.h"
 
 class ballSimObject : public Trick::SimObject {
 

diff --git a/test/SIM_leaks/models/Leaker/Leaker.cpp b/test/SIM_leaks/models/Leaker/Leaker.cpp
@@ -3,7 +3,7 @@
 #include <string.h>
 
 /* Model include files. */
-#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
+#include "trick/memorymanager_c_intf.h"
 
 std::vector< int > dv ;
 

diff --git a/test/SIM_segments/models/SegmentedExecutive/include/ExampleSegments.hh b/test/SIM_segments/models/SegmentedExecutive/include/ExampleSegments.hh
@@ -10,7 +10,8 @@ LIBRARY_DEPENDENCIES:
 #define EXAMPLESEGMENTS_HH
 
 #include "SegmentedExecutive/include/Segment.hh"
-#include "sim_services/Integrator/include/IntegLoopScheduler.hh"
+
+#include "trick/IntegLoopScheduler.hh"
 
 class SegmentA : public Trick::Segment {
     public:

diff --git a/test/SIM_segments/models/SegmentedExecutive/include/Segment.hh b/test/SIM_segments/models/SegmentedExecutive/include/Segment.hh
@@ -9,9 +9,10 @@ LIBRARY_DEPENDENCIES:
 #ifndef SEGMENT_HH
 #define SEGMENT_HH
 
-#include <string>
+#include "trick/ScheduledJobQueue.hh"
+
 #include <map>
-#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh"
+#include <string>
 
 namespace Trick {
 

diff --git a/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp b/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp
@@ -1,13 +1,13 @@
+#include "SegmentedExecutive.hh"
+
+#include "trick/command_line_protos.h"
+#include "trick/message_proto.h"
 
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "SegmentedExecutive.hh"
-#include "sim_services/Message/include/message_proto.h"
-#include "sim_services/CommandLineArguments/include/command_line_protos.h"
-
 Trick::SegmentedExecutive * the_phe = NULL ;
 
 Trick::SegmentedExecutive::SegmentedExecutive() : curr_segment(NULL) {

diff --git a/test/SIM_stls/models/STLCheckpoint.cpp b/test/SIM_stls/models/STLCheckpoint.cpp
@@ -1,10 +1,11 @@
-
-#include "sim_services/Message/include/message_proto.h"
 #include "STLCheckpoint.hh"
+
 #include "trick/memorymanager_c_intf.h"
+#include "trick/message_proto.h"
+#include "trick/trick_tests.h"
+
 #include <iostream>
 #include <vector>
-#include "sim_services/UnitTest/include/trick_tests.h"
 /* These 2 constructors add different data to an STLCheckpoint. */
 
 STLCheckpoint::STLCheckpoint() {

diff --git a/test/SIM_test_ip2/models/ip2/include/ip.h b/test/SIM_test_ip2/models/ip2/include/ip.h
@@ -1,4 +1,4 @@
- /*********************************** TRICK HEADER **************************
+/*********************************** TRICK HEADER **************************
 PURPOSE:                     (Test ip)
 REFERENCES:                  (None)
 ASSUMPTIONS AND LIMITATIONS: (Autocreated by trick_ui)
@@ -8,7 +8,7 @@ PROGRAMMERS:                 ((lin) (Thu Feb 27 14:57:16 CST 2003))
 #ifndef IP_H
 #define IP_H
 
-#include "sim_services/include/Flag.h"
+#include "trick/Flag.h"
 
 typedef struct {
 

diff --git a/test/SIM_test_ip2/models/ip2/src/ip_test_init.c b/test/SIM_test_ip2/models/ip2/src/ip_test_init.c
@@ -8,11 +8,13 @@ LIBRARY DEPENDENCY:          (ip.o)
 PROGRAMMERS:                 ((lin) (Thu Feb 27 14:57:16 CST 2003))
 ***************************************************************************/
 
-#include <stdio.h>
 #include "../include/ip.h"
-#include "sim_services/MemoryManager/include/attributes.h"
-#include "sim_services/Executive/include/exec_proto.h"
-#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
+
+#include "trick/attributes.h"
+#include "trick/exec_proto.h"
+#include "trick/memorymanager_c_intf.h"
+
+#include <stdio.h>
 
 extern ATTRIBUTES attrstruct_LinkedList[] ;
 

diff --git a/test/SIM_test_multidt/S_define b/test/SIM_test_multidt/S_define
@@ -10,9 +10,9 @@ LIBRARY DEPENDENCIES:
 
 
 ##include <math.h>
-##include "sim_services/Message/include/message_proto.h"
-##include "sim_services/Integrator/include/Integrator.hh"
-##include "sim_services/Integrator/include/integrator_c_intf.h"
+##include "trick/message_proto.h"
+##include "trick/Integrator.hh"
+##include "trick/integrator_c_intf.h"
 
 /* base ball... get it? :) */
 class ballSimObject : public Trick::SimObject {

diff --git a/test/SIM_test_output_dir/models/dynamic_obj.h b/test/SIM_test_output_dir/models/dynamic_obj.h
@@ -5,7 +5,7 @@ LIBRARY DEPENDENCY:
     )
 **************************************************************************/
 
-#include "sim_services/SimObject/include/SimObject.hh"
+#include "trick/SimObject.hh"
 
 class DynamicObj : public Trick::SimObject {
     // This class should be allocated dynamically

diff --git a/test/SIM_test_sched/models/sched/include/sched.h b/test/SIM_test_sched/models/sched/include/sched.h
@@ -8,8 +8,8 @@ PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 #ifndef SCHED_H
 #define SCHED_H
 
-#include "sim_services/Integrator/include/regula_falsi.h"
-#include "sim_services/Integrator/include/integrator_c_intf.h"
+#include "trick/integrator_c_intf.h"
+#include "trick/regula_falsi.h"
 
 typedef struct { /* SCHEDULE ------------------------------------------------*/
 

diff --git a/test/SIM_test_sched/models/sched/src/sched_amf.c b/test/SIM_test_sched/models/sched/src/sched_amf.c
@@ -8,7 +8,9 @@ PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 *******************************************************************************/
 
 #include "../include/sched.h"
-#include "sim_services/UnitTest/include/trick_tests.h"
+
+#include "trick/trick_tests.h"
+
 #include <stdio.h>
 
 int sched_amf(

diff --git a/test/SIM_test_sched/models/sched/src/sched_integ.c b/test/SIM_test_sched/models/sched/src/sched_integ.c
@@ -7,11 +7,12 @@ LIBRARY DEPENDENCY:          ( sched_integ.o )
 PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) (Trick tutorial) )
 *******************************************************************************/
 
-#include <stdio.h>
-
-#include "sim_services/Integrator/include/integrator_c_intf.h"
 #include "../include/sched.h"
 
+#include "trick/integrator_c_intf.h"
+
+#include <stdio.h>
+
 int sched_integ(  /* RETURN: -- Always return zero */
   SCHEDULE *S )   /* INOUT:  -- Schedule struct */
 {

diff --git a/test/SIM_test_varserv/models/varserv/include/VS.hh b/test/SIM_test_varserv/models/varserv/include/VS.hh
@@ -4,11 +4,12 @@ REFERENCES:                  ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 PROGRAMMERS:                 ( (Lindsay Landry) (L3) (9-12-2013) ) ( (Jackie Deans) (CACI) (11-30-2022) )
 ********************************************************************************/
-#include <wchar.h>
+#include "trick/tc.h"
+#include "trick/tc_proto.h"
+
 #include <string.h>
 #include <string>
-#include "trick_utils/comm/include/tc.h"
-#include "trick_utils/comm/include/tc_proto.h"
+#include <wchar.h>
 
 #ifndef VS_HH
 #define VS_HH

diff --git a/test/SIM_threads/models/threads/src/Thread1.cpp b/test/SIM_threads/models/threads/src/Thread1.cpp
@@ -3,9 +3,11 @@
     (Multi-Threading)
 *****************************************************************************/
 
-#include <iostream>
 #include "../include/Thread1.h"
-#include "sim_services/Clock/include/clock_proto.h"
+
+#include "trick/clock_proto.h"
+
+#include <iostream>
 
 Thread1::Thread1(int in_usec) : m_iBusyUSecs(in_usec)
 {

diff --git a/test/SIM_threads/models/threads/src/Thread2.cpp b/test/SIM_threads/models/threads/src/Thread2.cpp
@@ -3,10 +3,12 @@
     (Multi-Threading)
 *****************************************************************************/
 
+#include "../include/Thread2.h"
+
+#include "trick/GetTimeOfDayClock.hh"
+
 #include <iostream>
 #include <unistd.h>
-#include "../include/Thread2.h"
-#include "sim_services/Clock/include/GetTimeOfDayClock.hh"
 
 Thread2::Thread2()
 {

diff --git a/test/SIM_threads/models/threads/src/Thread3.cpp b/test/SIM_threads/models/threads/src/Thread3.cpp
@@ -3,9 +3,11 @@
     (Multi-Threading)
 *****************************************************************************/
 
-#include <iostream>
 #include "../include/Thread3.h"
-#include "sim_services/Clock/include/GetTimeOfDayClock.hh"
+
+#include "trick/GetTimeOfDayClock.hh"
+
+#include <iostream>
 
 Thread3::Thread3()
 {

diff --git a/trick_sims/Ball/models/ball/L1/src/ball_malf_trigger.c b/trick_sims/Ball/models/ball/L1/src/ball_malf_trigger.c
@@ -12,11 +12,11 @@ LIBRARY DEPENDENCY:
 
      /* GLOBAL DATA STRUCTURE DECLARATIONS */
 #include "ball/L1/include/ball_force.h"
-#include "sim_services/include/exec_proto.h"
 #include "ball/L1/include/ball_proto.h"
 
+#include "trick/exec_proto.h"
 
-     /* ENTRY POINT */
+/* ENTRY POINT */
 int ball_malf_trigger(
                 /* RETURN: -- Always return zero */
   double curr_time )   /* INOUT:  -- Ball ext. force parameters */

diff --git a/trick_sims/Ball/models/ball/L1/src/ball_print.c b/trick_sims/Ball/models/ball/L1/src/ball_print.c
@@ -9,14 +9,16 @@ LIBRARY DEPENDENCY:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-     /* GLOBAL DATA STRUCTURE DECLARATIONS */
-#include <stdio.h>
-#include "ball/L1/include/ball_state.h"
-#include "sim_services/Executive/include/exec_proto.h"
-#include "sim_services/Message/include/message_proto.h"
+/* GLOBAL DATA STRUCTURE DECLARATIONS */
 #include "ball/L1/include/ball_proto.h"
+#include "ball/L1/include/ball_state.h"
+
+#include "trick/exec_proto.h"
+#include "trick/message_proto.h"
 
-     /* ENTRY POINT */
+#include <stdio.h>
+
+/* ENTRY POINT */
 int ball_print( /* RETURN: -- Integration multi-step id */
   BSTATE *S )   /* INOUT:  -- Ball EOM state parameters */
 {
@@ -30,4 +32,3 @@ int ball_print( /* RETURN: -- Integration multi-step id */
 
     return( 0 ) ;
 }
-