diff --git a/bin/trick-ify b/bin/trick-ify
index 0871598b3..d5c7d2b7d 100755
--- a/bin/trick-ify
+++ b/bin/trick-ify
@@ -134,9 +134,16 @@ if ($full_build)
         foreach $src (@src_files)
         {
             $file = $src ;
-            $file =~ s/\Q.cpp\E$// ; 
-            $file =~ s/\Q.c$\E$// ; 
-            $cmd = "g++ $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            if($file =~ /\S*(\Q.c\E)$/)
+            {
+                $file =~ s/\Q.c\E$// ;
+                $cmd = "gcc $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            }
+            else
+            {
+                $file =~ s/\Q.cpp\E$// ; 
+                $cmd = "g++ $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            }
             if($debug)
             {
                 print "Building obj file: $cmd\n" ;
diff --git a/test/SIM_trickified_archive/S_define b/test/SIM_trickified_archive/S_define
index f770e2a73..1c86251ed 100644
--- a/test/SIM_trickified_archive/S_define
+++ b/test/SIM_trickified_archive/S_define
@@ -1,6 +1,6 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
@@ -8,7 +8,6 @@ class Sandbox : public Trick::SimObject {
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.c b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.c
new file mode 100644
index 000000000..cf5649184
--- /dev/null
+++ b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp
deleted file mode 100644
index b46af6616..000000000
--- a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Bar.hh"
-
-
-void Bar::add() {}
-void Bar::remove() {}
-void Bar::restart() {}
-
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.h b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.h
new file mode 100644
index 000000000..b8c3677c6
--- /dev/null
+++ b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.hh
deleted file mode 100644
index 5c4972624..000000000
--- a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// @trick_parse{everything}
-
-#include "trick/Event.hh"
-
-/**
- * Induce an `%import sim_services` statement in this class's Python module by inheriting from a
- * Trick class. This allows us to test if `sys.path` contains the correct path to `sim_services.py`
- * (and other modules generated during a sim build) for Trickified projects.
- */
-class Bar : public Trick::Event {
-
-    int  process(long long) {return 0;}
-    void add();
-    void remove();
-    void restart();
-
-};
diff --git a/test/SIM_trickified_object/S_define b/test/SIM_trickified_object/S_define
index f770e2a73..1c86251ed 100644
--- a/test/SIM_trickified_object/S_define
+++ b/test/SIM_trickified_object/S_define
@@ -1,6 +1,6 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
@@ -8,7 +8,6 @@ class Sandbox : public Trick::SimObject {
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.c b/test/SIM_trickified_object/trickified_project/include_bar/Bar.c
new file mode 100644
index 000000000..cf5649184
--- /dev/null
+++ b/test/SIM_trickified_object/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp
deleted file mode 100644
index b46af6616..000000000
--- a/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Bar.hh"
-
-
-void Bar::add() {}
-void Bar::remove() {}
-void Bar::restart() {}
-
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.h b/test/SIM_trickified_object/trickified_project/include_bar/Bar.h
new file mode 100644
index 000000000..b8c3677c6
--- /dev/null
+++ b/test/SIM_trickified_object/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_object/trickified_project/include_bar/Bar.hh
deleted file mode 100644
index 5c4972624..000000000
--- a/test/SIM_trickified_object/trickified_project/include_bar/Bar.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// @trick_parse{everything}
-
-#include "trick/Event.hh"
-
-/**
- * Induce an `%import sim_services` statement in this class's Python module by inheriting from a
- * Trick class. This allows us to test if `sys.path` contains the correct path to `sim_services.py`
- * (and other modules generated during a sim build) for Trickified projects.
- */
-class Bar : public Trick::Event {
-
-    int  process(long long) {return 0;}
-    void add();
-    void remove();
-    void restart();
-
-};
diff --git a/test/SIM_trickified_shared/S_define b/test/SIM_trickified_shared/S_define
index f770e2a73..1c86251ed 100644
--- a/test/SIM_trickified_shared/S_define
+++ b/test/SIM_trickified_shared/S_define
@@ -1,6 +1,6 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
@@ -8,7 +8,6 @@ class Sandbox : public Trick::SimObject {
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.c b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.c
new file mode 100644
index 000000000..cf5649184
--- /dev/null
+++ b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp
deleted file mode 100644
index b46af6616..000000000
--- a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Bar.hh"
-
-
-void Bar::add() {}
-void Bar::remove() {}
-void Bar::restart() {}
-
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.h b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.h
new file mode 100644
index 000000000..b8c3677c6
--- /dev/null
+++ b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.hh
deleted file mode 100644
index 5c4972624..000000000
--- a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// @trick_parse{everything}
-
-#include "trick/Event.hh"
-
-/**
- * Induce an `%import sim_services` statement in this class's Python module by inheriting from a
- * Trick class. This allows us to test if `sys.path` contains the correct path to `sim_services.py`
- * (and other modules generated during a sim build) for Trickified projects.
- */
-class Bar : public Trick::Event {
-
-    int  process(long long) {return 0;}
-    void add();
-    void remove();
-    void restart();
-
-};