From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Mon, 11 Nov 2019 14:11:26 +0000 (+0100)
Subject: :art: Class_Body was Ast
X-Git-Tag: nightly~2111
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=9b9e9d843935c02a63c886a95e86ddb16296de8a;p=gwion.git

:art: Class_Body was Ast
---

diff --git a/ast b/ast
index af63abc5..511f6150 160000
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit af63abc5d9f76ffcf128ee7784068a3a8283f5a8
+Subproject commit 511f61502bebcfc02df1e651d9d742b74072e4ed
diff --git a/include/gwi.h b/include/gwi.h
index 07ac3f2c..6cee9bca 100644
--- a/include/gwi.h
+++ b/include/gwi.h
@@ -5,7 +5,7 @@
 
 struct Gwi_ {
   struct Gwion_* gwion;
-  Class_Body body;
+  Ast body;
   struct ImportCK *ck;
   struct OperCK *oper; // _misc
   loc_t loc;
diff --git a/include/gwion_all.h b/include/gwion_all.h
index 21c56409..f11b0be8 100644
--- a/include/gwion_all.h
+++ b/include/gwion_all.h
@@ -1,6 +1,7 @@
 #ifndef __GWION_ALL
 #include "gwion_ast.h"
 #include "gwion_util.h"
+#include "gwion_env.h"
 #include "arg.h"
 #include "array.h"
 #include "compile.h"
@@ -9,9 +10,7 @@
 #include "driver.h"
 #include "emit.h"
 #include "engine.h"
-#include "env.h"
 #include "escape.h"
-#include "func.h"
 #include "gack.h"
 #include "gwi.h"
 #include "gwion.h"
@@ -20,9 +19,7 @@
 #include "instr.h"
 #include "lang_private.h"
 #include "memoize.h"
-#include "nspc.h"
 #include "object.h"
-#include "oo.h"
 #include "opcode.h"
 #include "operator.h"
 #include "parse.h"
@@ -32,9 +29,7 @@
 #include "switch.h"
 #include "template.h"
 #include "traverse.h"
-#include "type.h"
 #include "ugen.h"
-#include "value.h"
 #include "vararg.h"
 #include "vm.h"
 #endif
diff --git a/include/import/internals.h b/include/import/internals.h
index 09aa34fb..d014f5c6 100644
--- a/include/import/internals.h
+++ b/include/import/internals.h
@@ -6,7 +6,7 @@
 #define ENV_ERR_B(pos, a,...) { env_err(env, pos, (a), ## __VA_ARGS__); return GW_ERROR; }
 #define ENV_ERR_O(pos, a,...) { env_err(env, pos, (a), ## __VA_ARGS__); return NULL; }
 
-ANN void gwi_body(const Gwi, const Class_Body);
+ANN void gwi_body(const Gwi, const Ast);
 
 ANN Exp make_exp(const Gwi gwi, const m_str type, const m_str name);
 
diff --git a/src/import/fdef.c b/src/import/fdef.c
index 221ace4f..ea6d189c 100644
--- a/src/import/fdef.c
+++ b/src/import/fdef.c
@@ -60,7 +60,7 @@ ANEW ANN static Func_Def import_fdef(const Gwi gwi, ImportCK *ck) {
 
 ANN static m_bool section_fdef(const Gwi gwi, const Func_Def fdef) {
   Section* section = new_section_func_def(gwi->gwion->mp, fdef);
-  const Class_Body body = new_class_body(gwi->gwion->mp, section, NULL);
+  const Ast body = new_ast(gwi->gwion->mp, section, NULL);
   gwi_body(gwi, body);
   return GW_OK;
 }
diff --git a/src/import/internals.c b/src/import/internals.c
index 476c2848..8f0f85f8 100644
--- a/src/import/internals.c
+++ b/src/import/internals.c
@@ -10,7 +10,7 @@
 #include "import.h"
 #include "gwi.h"
 
-void gwi_body(const Gwi gwi, const Class_Body body) {
+void gwi_body(const Gwi gwi, const Ast body) {
   const Class_Def cdef = gwi->gwion->env->class_def->e->def;
   if(!cdef->body)
     cdef->body = body;
diff --git a/src/import/item.c b/src/import/item.c
index c623f421..3459da6e 100644
--- a/src/import/item.c
+++ b/src/import/item.c
@@ -22,7 +22,7 @@ ANN static m_int gwi_item_tmpl(const Gwi gwi) {
   const Stmt stmt = new_stmt_exp(mp, ae_stmt_exp, gwi->ck->exp);
   const Stmt_List slist = new_stmt_list(mp, stmt, NULL);
   Section* section = new_section_stmt_list(mp, slist);
-  const Class_Body body = new_class_body(mp, section, NULL);
+  const Ast body = new_ast(mp, section, NULL);
   gwi_body(gwi, body);
   mp_free2(gwi->gwion->mp, sizeof(ImportCK), gwi->ck);
   gwi->ck = NULL;
diff --git a/src/lib/shred.c b/src/lib/shred.c
index 7110732b..9793382b 100644
--- a/src/lib/shred.c
+++ b/src/lib/shred.c
@@ -238,7 +238,7 @@ GWION_IMPORT(shred) {
   gwi_class_xtor(gwi, NULL, shred_dtor);
   gwi->gwion->type[et_shred] = t_shred;
 
-  gwi_item_ini(gwi, "int", "@me");
+  gwi_item_ini(gwi, "@internal", "@me");
   GWI_BB(gwi_item_end(gwi, ae_flag_const, NULL))
 
   gwi_item_ini(gwi, "int", "cancel");
@@ -308,7 +308,7 @@ GWION_IMPORT(shred) {
   gwi_class_xtor(gwi, NULL, fork_dtor);
   gwi->gwion->type[et_fork] = t_fork;
 
-  gwi_item_ini(gwi, "int", "@thread");
+  gwi_item_ini(gwi, "@internal", "@thread");
   GWI_BB((o_fork_thread = gwi_item_end(gwi, ae_flag_const, NULL)))
   gwi_item_ini(gwi, "int", "is_done");
   GWI_BB((o_fork_done = gwi_item_end(gwi, ae_flag_const, NULL)))
@@ -316,7 +316,7 @@ GWION_IMPORT(shred) {
   GWI_BB((o_fork_ev = gwi_item_end(gwi, ae_flag_const, NULL)))
   gwi_item_ini(gwi, "int", "retsize");
   GWI_BB((o_fork_retsize = gwi_item_end(gwi, ae_flag_const, NULL)))
-  gwi_item_ini(gwi, "int", "@orig");
+  gwi_item_ini(gwi, "@internal", "@orig");
   GWI_BB((o_fork_orig = gwi_item_end(gwi, ae_flag_const, NULL)))
   o_fork_retval = t_fork->nspc->info->offset;
   GWI_BB(gwi_union_ini(gwi, NULL, NULL))
diff --git a/src/lib/tuple.c b/src/lib/tuple.c
index 22ab761e..9182190d 100644
--- a/src/lib/tuple.c
+++ b/src/lib/tuple.c
@@ -300,7 +300,7 @@ ANN Type tuple_type(const Env env, const Vector v, const loc_t pos) {
     curr = slist;
   }
   Section * section = new_section_stmt_list(env->gwion->mp, base);
-  Class_Body body = new_class_body(env->gwion->mp, section, NULL);
+  Ast body = new_ast(env->gwion->mp, section, NULL);
   const ID_List ilist = new_id_list(env->gwion->mp, insert_symbol(env->gwion->type[et_tuple]->name),
       loc_cpy(env->gwion->mp, pos));
   Type_Decl *td = new_type_decl(env->gwion->mp, ilist);
diff --git a/src/parse/scan0.c b/src/parse/scan0.c
index 106eba98..92ff1262 100644
--- a/src/parse/scan0.c
+++ b/src/parse/scan0.c
@@ -234,7 +234,7 @@ ANN static void union_tmpl(const Env env, const Union_Def udef) {
   if(tmpl_base(udef->tmpl)) {
     assert(udef->type_xid);
     const Class_Def cdef = new_class_def(env->gwion->mp, udef->flag, udef->type_xid,
-        NULL, (Class_Body)udef->l, loc_cpy(env->gwion->mp, udef->pos));
+        NULL, (Ast)udef->l, loc_cpy(env->gwion->mp, udef->pos));
     udef->type->e->def = cdef;
     cdef->base.tmpl = udef->tmpl;
     cdef->base.type = udef->type;
diff --git a/src/parse/scanx.c b/src/parse/scanx.c
index d9b52969..21232f87 100644
--- a/src/parse/scanx.c
+++ b/src/parse/scanx.c
@@ -6,7 +6,7 @@
 #include "traverse.h"
 #include "parse.h"
 
-ANN static inline m_bool _body(const Env e, Class_Body b, const _exp_func f) {
+ANN static inline m_bool _body(const Env e, Ast b, const _exp_func f) {
   do CHECK_BB(f(e, b->section))
   while((b = b->next));
   return GW_OK;
diff --git a/tests/import/array.c b/tests/import/array.c
index bd19d6c6..f8f342ca 100644
--- a/tests/import/array.c
+++ b/tests/import/array.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/array_in_var_name.c b/tests/import/array_in_var_name.c
index 4ebb96e1..1dc4ff70 100644
--- a/tests/import/array_in_var_name.c
+++ b/tests/import/array_in_var_name.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/array_in_var_name_fail.c b/tests/import/array_in_var_name_fail.c
index 31aabf93..605bdb96 100644
--- a/tests/import/array_in_var_name_fail.c
+++ b/tests/import/array_in_var_name_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/array_incoherent_in_var_name.c b/tests/import/array_incoherent_in_var_name.c
index 466e25c3..3a534285 100644
--- a/tests/import/array_incoherent_in_var_name.c
+++ b/tests/import/array_incoherent_in_var_name.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/array_invalid_in_var_name.c b/tests/import/array_invalid_in_var_name.c
index 5538321d..185f57df 100644
--- a/tests/import/array_invalid_in_var_name.c
+++ b/tests/import/array_invalid_in_var_name.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/basic_module.c b/tests/import/basic_module.c
index 712f2a55..11a37841 100644
--- a/tests/import/basic_module.c
+++ b/tests/import/basic_module.c
@@ -1,8 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
 
 GWMODSTR(basic_module)
diff --git a/tests/import/callback.c b/tests/import/callback.c
index 84a69c25..9d917cb9 100644
--- a/tests/import/callback.c
+++ b/tests/import/callback.c
@@ -1,17 +1,13 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
-#include "func.h"
 #include "gwi.h"
 
 struct ret_info {
diff --git a/tests/import/checker.c b/tests/import/checker.c
index 72756d92..75914355 100644
--- a/tests/import/checker.c
+++ b/tests/import/checker.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/class_template.c b/tests/import/class_template.c
index d48a3330..1bc3adb2 100644
--- a/tests/import/class_template.c
+++ b/tests/import/class_template.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/class_template_fail.c b/tests/import/class_template_fail.c
index 8b205278..ecb9ecc1 100644
--- a/tests/import/class_template_fail.c
+++ b/tests/import/class_template_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/class_template_invalid.c b/tests/import/class_template_invalid.c
index 677304c9..8c7da611 100644
--- a/tests/import/class_template_invalid.c
+++ b/tests/import/class_template_invalid.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/compile_file.c b/tests/import/compile_file.c
index 32e91d27..39a7a194 100644
--- a/tests/import/compile_file.c
+++ b/tests/import/compile_file.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/compile_string.c b/tests/import/compile_string.c
index 3d0cb0ee..d1c522c9 100644
--- a/tests/import/compile_string.c
+++ b/tests/import/compile_string.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/coverage.c b/tests/import/coverage.c
index 7dfbb227..26f374b5 100644
--- a/tests/import/coverage.c
+++ b/tests/import/coverage.c
@@ -1,14 +1,11 @@
 #include "complex.h"
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/driver.c b/tests/import/driver.c
index 06d3cc6f..7f1628e5 100644
--- a/tests/import/driver.c
+++ b/tests/import/driver.c
@@ -2,8 +2,7 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "driver.h"
 #include "gwion.h"
diff --git a/tests/import/empty_union.c b/tests/import/empty_union.c
index bb1a9346..9cf0af19 100644
--- a/tests/import/empty_union.c
+++ b/tests/import/empty_union.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/end_class.c b/tests/import/end_class.c
index 388fa82e..84324621 100644
--- a/tests/import/end_class.c
+++ b/tests/import/end_class.c
@@ -1,12 +1,8 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "absyn.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "object.h"
 #include "instr.h"
diff --git a/tests/import/enum.c b/tests/import/enum.c
index ba9394b7..543f698d 100644
--- a/tests/import/enum.c
+++ b/tests/import/enum.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/enum_fail.c b/tests/import/enum_fail.c
index 8071ad43..f49dde9c 100644
--- a/tests/import/enum_fail.c
+++ b/tests/import/enum_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/enum_fail2.c b/tests/import/enum_fail2.c
index 6f5550b0..2c5131be 100644
--- a/tests/import/enum_fail2.c
+++ b/tests/import/enum_fail2.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/enum_fail3.c b/tests/import/enum_fail3.c
index e74e5f63..28341678 100644
--- a/tests/import/enum_fail3.c
+++ b/tests/import/enum_fail3.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/extend_array.c b/tests/import/extend_array.c
index cebb84a2..a829f59a 100644
--- a/tests/import/extend_array.c
+++ b/tests/import/extend_array.c
@@ -1,15 +1,11 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "instr.h"
-#include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/fail_on_next_arg.c b/tests/import/fail_on_next_arg.c
index e7cb07e4..bce8309b 100644
--- a/tests/import/fail_on_next_arg.c
+++ b/tests/import/fail_on_next_arg.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 GWION_IMPORT(fail_on_next_arg) {
diff --git a/tests/import/fail_on_next_arg2.c b/tests/import/fail_on_next_arg2.c
index b5ff24b4..329b0366 100644
--- a/tests/import/fail_on_next_arg2.c
+++ b/tests/import/fail_on_next_arg2.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 GWION_IMPORT(fail_on_next_arg) {
diff --git a/tests/import/fptr.c b/tests/import/fptr.c
index 3fe02521..b78b9b5c 100644
--- a/tests/import/fptr.c
+++ b/tests/import/fptr.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/fptr_tmpl.c b/tests/import/fptr_tmpl.c
index d142ebb7..4adb3e30 100644
--- a/tests/import/fptr_tmpl.c
+++ b/tests/import/fptr_tmpl.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/fptr_tmpl_fail.c b/tests/import/fptr_tmpl_fail.c
index 13c195fc..2ec528c3 100644
--- a/tests/import/fptr_tmpl_fail.c
+++ b/tests/import/fptr_tmpl_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/func_fail.c b/tests/import/func_fail.c
index 68d34e6a..d38bcd68 100644
--- a/tests/import/func_fail.c
+++ b/tests/import/func_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_fail2.c b/tests/import/func_fail2.c
index ce023ed0..ade63578 100644
--- a/tests/import/func_fail2.c
+++ b/tests/import/func_fail2.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_fail3.c b/tests/import/func_fail3.c
index 56ff79a6..09402e9a 100644
--- a/tests/import/func_fail3.c
+++ b/tests/import/func_fail3.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_fail4.c b/tests/import/func_fail4.c
index 02d0fdb9..06c7f384 100644
--- a/tests/import/func_fail4.c
+++ b/tests/import/func_fail4.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_subscript_not_empty.c b/tests/import/func_subscript_not_empty.c
index bcd6cef3..a9a6afc3 100644
--- a/tests/import/func_subscript_not_empty.c
+++ b/tests/import/func_subscript_not_empty.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_tmpl.c b/tests/import/func_tmpl.c
index be22fbb6..0214bd24 100644
--- a/tests/import/func_tmpl.c
+++ b/tests/import/func_tmpl.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_tmpl_fail.c b/tests/import/func_tmpl_fail.c
index 5790b326..f01dddad 100644
--- a/tests/import/func_tmpl_fail.c
+++ b/tests/import/func_tmpl_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/func_too_many_arg.c b/tests/import/func_too_many_arg.c
index ce2b06cc..6bf4baae 100644
--- a/tests/import/func_too_many_arg.c
+++ b/tests/import/func_too_many_arg.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/get_module.c b/tests/import/get_module.c
index 19b72862..d0ecf040 100644
--- a/tests/import/get_module.c
+++ b/tests/import/get_module.c
@@ -2,11 +2,8 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "type.h"
-#include "value.h"
 #include "object.h"
 #include "driver.h"
 #include "gwion.h"
diff --git a/tests/import/global_func.c b/tests/import/global_func.c
index 26c5dc91..88bae08b 100644
--- a/tests/import/global_func.c
+++ b/tests/import/global_func.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"
diff --git a/tests/import/global_var.c b/tests/import/global_var.c
index 6d9f9e2e..7ec97200 100644
--- a/tests/import/global_var.c
+++ b/tests/import/global_var.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/invalid_arg.c b/tests/import/invalid_arg.c
index 86e80dc1..04a99a34 100644
--- a/tests/import/invalid_arg.c
+++ b/tests/import/invalid_arg.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/invalid_array.c b/tests/import/invalid_array.c
index f0fe091a..92bb664c 100644
--- a/tests/import/invalid_array.c
+++ b/tests/import/invalid_array.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/invalid_func.c b/tests/import/invalid_func.c
index a8c20c5c..a2796a9e 100644
--- a/tests/import/invalid_func.c
+++ b/tests/import/invalid_func.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/invalid_names.c b/tests/import/invalid_names.c
index 54a2f546..6ee7f340 100644
--- a/tests/import/invalid_names.c
+++ b/tests/import/invalid_names.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 GWION_IMPORT(trig) {
diff --git a/tests/import/invalid_type1.c b/tests/import/invalid_type1.c
index 113a14c9..b17e225e 100644
--- a/tests/import/invalid_type1.c
+++ b/tests/import/invalid_type1.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/invalid_type2.c b/tests/import/invalid_type2.c
index aa54c393..3b1f3fd0 100644
--- a/tests/import/invalid_type2.c
+++ b/tests/import/invalid_type2.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/invalid_type3.c b/tests/import/invalid_type3.c
index 76525f67..118a0206 100644
--- a/tests/import/invalid_type3.c
+++ b/tests/import/invalid_type3.c
@@ -1,14 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "absyn.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/mk_type_array.c b/tests/import/mk_type_array.c
index 46ca5571..765ea034 100644
--- a/tests/import/mk_type_array.c
+++ b/tests/import/mk_type_array.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/module.c b/tests/import/module.c
index 6f5324b2..d65ee754 100644
--- a/tests/import/module.c
+++ b/tests/import/module.c
@@ -2,8 +2,7 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "driver.h"
 #include "gwion.h"
diff --git a/tests/import/no_import.c b/tests/import/no_import.c
index 959d35c5..3793a9a6 100644
--- a/tests/import/no_import.c
+++ b/tests/import/no_import.c
@@ -1,12 +1,9 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
diff --git a/tests/import/not_importing.c b/tests/import/not_importing.c
index 836ab3c0..6cda2e41 100644
--- a/tests/import/not_importing.c
+++ b/tests/import/not_importing.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/op_already_imported.c b/tests/import/op_already_imported.c
index faf524fa..1b3eec5e 100644
--- a/tests/import/op_already_imported.c
+++ b/tests/import/op_already_imported.c
@@ -1,15 +1,12 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "instr.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/specialid_emit.c b/tests/import/specialid_emit.c
index 2b4305c3..efcdcd48 100644
--- a/tests/import/specialid_emit.c
+++ b/tests/import/specialid_emit.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "emit.h"
diff --git a/tests/import/static_string.c b/tests/import/static_string.c
index 42e13939..2fb1ac8f 100644
--- a/tests/import/static_string.c
+++ b/tests/import/static_string.c
@@ -1,14 +1,11 @@
 #include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/str2decl.c b/tests/import/str2decl.c
index 9b3b9871..c8d9d9d9 100644
--- a/tests/import/str2decl.c
+++ b/tests/import/str2decl.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 GWION_IMPORT(str2decl) {
diff --git a/tests/import/str2list_fail.c b/tests/import/str2list_fail.c
index d39cc231..dbcc6e7f 100644
--- a/tests/import/str2list_fail.c
+++ b/tests/import/str2list_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/template_arg.c b/tests/import/template_arg.c
index e69eb5d9..ba1a75a4 100644
--- a/tests/import/template_arg.c
+++ b/tests/import/template_arg.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/test.log b/tests/import/test.log
deleted file mode 100644
index 5e4c6f95..00000000
--- a/tests/import/test.log
+++ /dev/null
@@ -1,157 +0,0 @@
-coverage.gw ==219564== Memcheck, a memory error detector
-==219564== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==219564== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==219564== Command: ./../../gwion -p. -m dummy -d dummy coverage.gw
-==219564== Parent PID: 219275
-==219564== 
-==219564== Invalid read of size 8
-==219564==    at 0x145464: path_valid (checker.c:67)
-==219564==    by 0x145774: ck2list (checker.c:172)
-==219564==    by 0x145813: str2decl (checker.c:226)
-==219564==    by 0x12CC24: make_exp (union.c:24)
-==219564==    by 0x12C78F: gwi_item_ini (item.c:18)
-==219564==    by 0x4848958: import (coverage.c:81)
-==219564==    by 0x11DB4E: type_engine_init (engine.c:162)
-==219564==    by 0x117059: gwion_engine (gwion.c:41)
-==219564==    by 0x117059: gwion_ini (gwion.c:84)
-==219564==    by 0x116502: main (main.c:23)
-==219564==  Address 0x0 is not stack'd, malloc'd or (recently) free'd
-==219564== 
-==219564== 
-==219564== Process terminating with default action of signal 11 (SIGSEGV): dumping core
-==219564==  Access not within mapped region at address 0x0
-==219564==    at 0x145464: path_valid (checker.c:67)
-==219564==    by 0x145774: ck2list (checker.c:172)
-==219564==    by 0x145813: str2decl (checker.c:226)
-==219564==    by 0x12CC24: make_exp (union.c:24)
-==219564==    by 0x12C78F: gwi_item_ini (item.c:18)
-==219564==    by 0x4848958: import (coverage.c:81)
-==219564==    by 0x11DB4E: type_engine_init (engine.c:162)
-==219564==    by 0x117059: gwion_engine (gwion.c:41)
-==219564==    by 0x117059: gwion_ini (gwion.c:84)
-==219564==    by 0x116502: main (main.c:23)
-==219564==  If you believe this happened as a result of a stack
-==219564==  overflow in your program's main thread (unlikely but
-==219564==  possible), you can try to increase the size of the
-==219564==  main thread stack using the --main-stacksize= flag.
-==219564==  The main thread stack size used in this run was 8388608.
-==219564== 
-==219564== HEAP SUMMARY:
-==219564==     in use at exit: 9,096,690 bytes in 460 blocks
-==219564==   total heap usage: 893 allocs, 433 frees, 9,197,246 bytes allocated
-==219564== 
-==219564== LEAK SUMMARY:
-==219564==    definitely lost: 0 bytes in 0 blocks
-==219564==    indirectly lost: 0 bytes in 0 blocks
-==219564==      possibly lost: 0 bytes in 0 blocks
-==219564==    still reachable: 9,096,690 bytes in 460 blocks
-==219564==         suppressed: 0 bytes in 0 blocks
-==219564== Rerun with --leak-check=full to see details of leaked memory
-==219564== 
-==219564== For lists of detected and suppressed errors, rerun with: -s
-==219564== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-class_template.gw ==347445== Memcheck, a memory error detector
-==347445== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347445== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347445== Command: ./../../gwion -p. -m dummy -d dummy class_template.gw
-==347445== Parent PID: 347195
-==347445== 
-==347445== 
-==347445== HEAP SUMMARY:
-==347445==     in use at exit: 9,102,463 bytes in 496 blocks
-==347445==   total heap usage: 1,005 allocs, 509 frees, 9,211,355 bytes allocated
-==347445== 
-==347445== LEAK SUMMARY:
-==347445==    definitely lost: 0 bytes in 0 blocks
-==347445==    indirectly lost: 0 bytes in 0 blocks
-==347445==      possibly lost: 0 bytes in 0 blocks
-==347445==    still reachable: 9,102,463 bytes in 496 blocks
-==347445==         suppressed: 0 bytes in 0 blocks
-==347445== Rerun with --leak-check=full to see details of leaked memory
-==347445== 
-==347445== For lists of detected and suppressed errors, rerun with: -s
-==347445== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-coverage.gw ==347621== Memcheck, a memory error detector
-==347621== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347621== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347621== Command: ./../../gwion -p. -m dummy -d dummy coverage.gw
-==347621== Parent PID: 347195
-==347621== 
-==347621== 
-==347621== HEAP SUMMARY:
-==347621==     in use at exit: 9,098,349 bytes in 468 blocks
-==347621==   total heap usage: 916 allocs, 448 frees, 9,204,177 bytes allocated
-==347621== 
-==347621== LEAK SUMMARY:
-==347621==    definitely lost: 0 bytes in 0 blocks
-==347621==    indirectly lost: 0 bytes in 0 blocks
-==347621==      possibly lost: 0 bytes in 0 blocks
-==347621==    still reachable: 9,098,349 bytes in 468 blocks
-==347621==         suppressed: 0 bytes in 0 blocks
-==347621== Rerun with --leak-check=full to see details of leaked memory
-==347621== 
-==347621== For lists of detected and suppressed errors, rerun with: -s
-==347621== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-enum.gw ==347758== Memcheck, a memory error detector
-==347758== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347758== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347758== Command: ./../../gwion -p. -m dummy -d dummy enum.gw
-==347758== Parent PID: 347195
-==347758== 
-==347758== 
-==347758== HEAP SUMMARY:
-==347758==     in use at exit: 9,101,889 bytes in 467 blocks
-==347758==   total heap usage: 920 allocs, 453 frees, 9,211,349 bytes allocated
-==347758== 
-==347758== LEAK SUMMARY:
-==347758==    definitely lost: 0 bytes in 0 blocks
-==347758==    indirectly lost: 0 bytes in 0 blocks
-==347758==      possibly lost: 0 bytes in 0 blocks
-==347758==    still reachable: 9,101,889 bytes in 467 blocks
-==347758==         suppressed: 0 bytes in 0 blocks
-==347758== Rerun with --leak-check=full to see details of leaked memory
-==347758== 
-==347758== For lists of detected and suppressed errors, rerun with: -s
-==347758== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-extend_array.gw ==347895== Memcheck, a memory error detector
-==347895== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347895== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347895== Command: ./../../gwion -p. -m dummy -d dummy extend_array.gw
-==347895== Parent PID: 347195
-==347895== 
-==347895== 
-==347895== HEAP SUMMARY:
-==347895==     in use at exit: 9,092,505 bytes in 463 blocks
-==347895==   total heap usage: 886 allocs, 423 frees, 9,196,621 bytes allocated
-==347895== 
-==347895== LEAK SUMMARY:
-==347895==    definitely lost: 0 bytes in 0 blocks
-==347895==    indirectly lost: 0 bytes in 0 blocks
-==347895==      possibly lost: 0 bytes in 0 blocks
-==347895==    still reachable: 9,092,505 bytes in 463 blocks
-==347895==         suppressed: 0 bytes in 0 blocks
-==347895== Rerun with --leak-check=full to see details of leaked memory
-==347895== 
-==347895== For lists of detected and suppressed errors, rerun with: -s
-==347895== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-fptr.gw ==348011== Memcheck, a memory error detector
-==348011== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==348011== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==348011== Command: ./../../gwion -p. -m dummy -d dummy fptr.gw
-==348011== Parent PID: 347195
-==348011== 
-==348011== 
-==348011== HEAP SUMMARY:
-==348011==     in use at exit: 9,097,889 bytes in 485 blocks
-==348011==   total heap usage: 914 allocs, 429 frees, 9,202,357 bytes allocated
-==348011== 
-==348011== LEAK SUMMARY:
-==348011==    definitely lost: 0 bytes in 0 blocks
-==348011==    indirectly lost: 0 bytes in 0 blocks
-==348011==      possibly lost: 0 bytes in 0 blocks
-==348011==    still reachable: 9,097,889 bytes in 485 blocks
-==348011==         suppressed: 0 bytes in 0 blocks
-==348011== Rerun with --leak-check=full to see details of leaked memory
-==348011== 
-==348011== For lists of detected and suppressed errors, rerun with: -s
-==348011== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/tests/import/trig.c b/tests/import/trig.c
index 04cdf3d0..0ebcf3b8 100644
--- a/tests/import/trig.c
+++ b/tests/import/trig.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 static TICK(trig_tick) {
diff --git a/tests/import/typedef.c b/tests/import/typedef.c
index d820abcf..ffe78fe6 100644
--- a/tests/import/typedef.c
+++ b/tests/import/typedef.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/typedef_fail.c b/tests/import/typedef_fail.c
index a81d793d..e3151146 100644
--- a/tests/import/typedef_fail.c
+++ b/tests/import/typedef_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/typedef_tmpl.c b/tests/import/typedef_tmpl.c
index f4a738dc..1ae96db9 100644
--- a/tests/import/typedef_tmpl.c
+++ b/tests/import/typedef_tmpl.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/ugen_connect.c b/tests/import/ugen_connect.c
index dff5f5ac..1bf34584 100644
--- a/tests/import/ugen_connect.c
+++ b/tests/import/ugen_connect.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
diff --git a/tests/import/union.c b/tests/import/union.c
index b76c3250..9e2fc884 100644
--- a/tests/import/union.c
+++ b/tests/import/union.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_fail_exp.c b/tests/import/union_fail_exp.c
index 32d43199..09d40f77 100644
--- a/tests/import/union_fail_exp.c
+++ b/tests/import/union_fail_exp.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_member.c b/tests/import/union_member.c
index 9007bb46..1d36fa0f 100644
--- a/tests/import/union_member.c
+++ b/tests/import/union_member.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_name.c b/tests/import/union_name.c
index 702356e0..b92ec03f 100644
--- a/tests/import/union_name.c
+++ b/tests/import/union_name.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_tmpl.c b/tests/import/union_tmpl.c
index 800cf551..aa65700d 100644
--- a/tests/import/union_tmpl.c
+++ b/tests/import/union_tmpl.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_tmpl_fail.c b/tests/import/union_tmpl_fail.c
index cf93e12b..57da35a8 100644
--- a/tests/import/union_tmpl_fail.c
+++ b/tests/import/union_tmpl_fail.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_tmpl_fail2.c b/tests/import/union_tmpl_fail2.c
index 7a0bbf18..994dd3ee 100644
--- a/tests/import/union_tmpl_fail2.c
+++ b/tests/import/union_tmpl_fail2.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/union_tmpl_fail3.c b/tests/import/union_tmpl_fail3.c
index 12d25306..f8fa4eb9 100644
--- a/tests/import/union_tmpl_fail3.c
+++ b/tests/import/union_tmpl_fail3.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 
diff --git a/tests/import/variadic.c b/tests/import/variadic.c
index 4cf7fcf3..6b00bdbf 100644
--- a/tests/import/variadic.c
+++ b/tests/import/variadic.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "vararg.h"
diff --git a/tests/import/vm_remove.c b/tests/import/vm_remove.c
index 101333da..a0f17f47 100644
--- a/tests/import/vm_remove.c
+++ b/tests/import/vm_remove.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "instr.h"