--- a/tests/libInit.cc	Fri May 26 08:03:41 2017 +0100
+++ b/tests/libInit.cc	Fri May 26 08:05:28 2017 +0100
@@ -16,26 +16,37 @@
 DLL_EXPORT void _libjv_libgdbs_tests_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-void _libjv_libgdbs_tests_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_libgdbs_tests__DFN", _libjv_libgdbs_tests_InitDefinition, "jv:libgdbs/tests");
-_jv_137libgdbs_137tests_Init(pass,__pRT__,snd);
+extern void _GDBDebuggeesResource_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBDebuggerTestCase_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBInternalPipeStreamTests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBMIParserTests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBSimulatorProcessTests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _jv_137libgdbs_137tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBDebuggerTestsR_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _GDBDebuggerTestsS_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
-__END_PACKAGE__();
+
+
+void _libjv_libgdbs_tests_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libjv_libgdbs_tests__DFN", _libjv_libgdbs_tests_InitDefinition, "jv:libgdbs/tests");
+    _jv_137libgdbs_137tests_Init(pass,__pRT__,snd);
+
+  __END_PACKAGE__();
 }
 
-void _libjv_libgdbs_tests_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_libgdbs_tests", _libjv_libgdbs_tests_Init, "jv:libgdbs/tests");
-_GDBDebuggeesResource_Init(pass,__pRT__,snd);
-_GDBDebuggerTestCase_Init(pass,__pRT__,snd);
-_GDBInternalPipeStreamTests_Init(pass,__pRT__,snd);
-_GDBMIParserTests_Init(pass,__pRT__,snd);
-_GDBSimulatorProcessTests_Init(pass,__pRT__,snd);
-_jv_137libgdbs_137tests_Init(pass,__pRT__,snd);
-_GDBDebuggerTestsR_Init(pass,__pRT__,snd);
-_GDBDebuggerTestsS_Init(pass,__pRT__,snd);
+void _libjv_libgdbs_tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libjv_libgdbs_tests", _libjv_libgdbs_tests_Init, "jv:libgdbs/tests");
+    _GDBDebuggeesResource_Init(pass,__pRT__,snd);
+    _GDBDebuggerTestCase_Init(pass,__pRT__,snd);
+    _GDBInternalPipeStreamTests_Init(pass,__pRT__,snd);
+    _GDBMIParserTests_Init(pass,__pRT__,snd);
+    _GDBSimulatorProcessTests_Init(pass,__pRT__,snd);
+    _jv_137libgdbs_137tests_Init(pass,__pRT__,snd);
+    _GDBDebuggerTestsR_Init(pass,__pRT__,snd);
+    _GDBDebuggerTestsS_Init(pass,__pRT__,snd);
 
 
-__END_PACKAGE__();
+  __END_PACKAGE__();
 }