--- a/libInit.cc	Thu Aug 01 19:13:14 2019 +0100
+++ b/libInit.cc	Wed Jul 08 11:26:45 2020 +0100
@@ -16,31 +16,47 @@
 DLL_EXPORT void _libstx_goodies_cypress_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-void _libstx_goodies_cypress_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_goodies_cypress__DFN", _libstx_goodies_cypress_InitDefinition, "stx:goodies/cypress");
-_stx_137goodies_137cypress_Init(pass,__pRT__,snd);
+extern void _CypressAbstractReaderWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressJSONReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressModel_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _stx_137goodies_137cypress_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressAbstractReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressAbstractWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressClass_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressMethod_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressPackage_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressRepository_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressFileTreeReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _CypressWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
-__END_PACKAGE__();
+extern void _stx_137goodies_137cypress_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+void _libstx_goodies_cypress_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_goodies_cypress__DFN", _libstx_goodies_cypress_InitDefinition, "stx:goodies/cypress");
+    _stx_137goodies_137cypress_Init(pass,__pRT__,snd);
+
+  __END_PACKAGE__();
 }
 
-void _libstx_goodies_cypress_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_goodies_cypress", _libstx_goodies_cypress_Init, "stx:goodies/cypress");
-_CypressAbstractReaderWriter_Init(pass,__pRT__,snd);
-_CypressJSONReader_Init(pass,__pRT__,snd);
-_CypressModel_Init(pass,__pRT__,snd);
-_stx_137goodies_137cypress_Init(pass,__pRT__,snd);
-_CypressAbstractReader_Init(pass,__pRT__,snd);
-_CypressAbstractWriter_Init(pass,__pRT__,snd);
-_CypressClass_Init(pass,__pRT__,snd);
-_CypressMethod_Init(pass,__pRT__,snd);
-_CypressPackage_Init(pass,__pRT__,snd);
-_CypressRepository_Init(pass,__pRT__,snd);
-_CypressFileTreeReader_Init(pass,__pRT__,snd);
-_CypressReader_Init(pass,__pRT__,snd);
-_CypressWriter_Init(pass,__pRT__,snd);
+void _libstx_goodies_cypress_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_goodies_cypress", _libstx_goodies_cypress_Init, "stx:goodies/cypress");
+    _CypressAbstractReaderWriter_Init(pass,__pRT__,snd);
+    _CypressJSONReader_Init(pass,__pRT__,snd);
+    _CypressModel_Init(pass,__pRT__,snd);
+    _stx_137goodies_137cypress_Init(pass,__pRT__,snd);
+    _CypressAbstractReader_Init(pass,__pRT__,snd);
+    _CypressAbstractWriter_Init(pass,__pRT__,snd);
+    _CypressClass_Init(pass,__pRT__,snd);
+    _CypressMethod_Init(pass,__pRT__,snd);
+    _CypressPackage_Init(pass,__pRT__,snd);
+    _CypressRepository_Init(pass,__pRT__,snd);
+    _CypressFileTreeReader_Init(pass,__pRT__,snd);
+    _CypressReader_Init(pass,__pRT__,snd);
+    _CypressWriter_Init(pass,__pRT__,snd);
 
-_stx_137goodies_137cypress_extensions_Init(pass,__pRT__,snd);
-__END_PACKAGE__();
+    _stx_137goodies_137cypress_extensions_Init(pass,__pRT__,snd);
+  __END_PACKAGE__();
 }