diff --git a/common/repl/nrepl/ReplServer.cpp b/common/repl/nrepl/ReplServer.cpp
index ab56d05cf..267d5fa87 100644
--- a/common/repl/nrepl/ReplServer.cpp
+++ b/common/repl/nrepl/ReplServer.cpp
@@ -16,10 +16,6 @@
 #include "common/log/log.h"
 // clang-format on
 
-// TODO - basically REPL to listen and inject commands into a running REPL
-// - we will need a C++ side client as well which will let us communicate with the repl via for
-// example, ImgUI
-//
 // TODO - The server also needs to eventually return the result of the evaluation
 
 ReplServer::~ReplServer() {
diff --git a/common/type_system/Type.h b/common/type_system/Type.h
index 852764007..539083b0d 100644
--- a/common/type_system/Type.h
+++ b/common/type_system/Type.h
@@ -28,8 +28,12 @@ struct MethodInfo {
   std::string name;
   TypeSpec type;
   std::string defined_in_type;
+  // TODO - this might be redundant, but preventing an unknown breaking change, clean it up later
+  std::string type_name;
   bool no_virtual = false;
+  // TODO - this is no longer used anymore...but was not removed from th4e struct?
   bool overrides_parent = false;
+  // TODO - this is no longer used anymore...but was not removed from th4e struct?
   bool only_overrides_docstring = false;
   std::optional<std::string> docstring;
   std::optional<std::string> overlay_name;
diff --git a/common/type_system/TypeSpec.h b/common/type_system/TypeSpec.h
index c4c5de9d6..5576459d8 100644
--- a/common/type_system/TypeSpec.h
+++ b/common/type_system/TypeSpec.h
@@ -124,10 +124,12 @@ class TypeSpec {
     ASSERT(m_arguments);
     return m_arguments->at(idx);
   }
+
   TypeSpec& get_arg(int idx) {
     ASSERT(m_arguments);
     return m_arguments->at(idx);
   }
+
   const TypeSpec& last_arg() const {
     ASSERT(m_arguments);
     ASSERT(!m_arguments->empty());
diff --git a/common/type_system/TypeSystem.cpp b/common/type_system/TypeSystem.cpp
index 40efe45d9..999db34b8 100644
--- a/common/type_system/TypeSystem.cpp
+++ b/common/type_system/TypeSystem.cpp
@@ -548,6 +548,7 @@ MethodInfo TypeSystem::override_method(Type* type,
                            existing_info.name,
                            existing_info.type,
                            type->get_name(),
+                           type->get_name(),
                            existing_info.no_virtual,
                            false,
                            true,
@@ -607,6 +608,7 @@ MethodInfo TypeSystem::declare_method(Type* type,
                              method_name,
                              ts,
                              type->get_name(),
+                             type->get_name(),
                              no_virtual,
                              true,
                              false,
@@ -645,6 +647,7 @@ MethodInfo TypeSystem::declare_method(Type* type,
                                method_name,
                                ts,
                                type->get_name(),
+                               type->get_name(),
                                no_virtual,
                                false,
                                false,
@@ -678,8 +681,8 @@ MethodInfo TypeSystem::overlay_method(Type* type,
   }
 
   // use the existing ID.
-  return type->add_method({existing_info.id, method_name, ts, type->get_name(), false, true, false,
-                           docstring, std::make_optional(method_overlay_name)});
+  return type->add_method({existing_info.id, method_name, ts, type->get_name(), type->get_name(),
+                           false, true, false, docstring, std::make_optional(method_overlay_name)});
 }
 
 MethodInfo TypeSystem::define_method(const std::string& type_name,
@@ -709,8 +712,10 @@ MethodInfo TypeSystem::define_method(Type* type,
   // look up the method
   MethodInfo existing_info;
   bool got_existing = try_lookup_method(type, method_name, &existing_info);
-
   if (got_existing) {
+    // The lookup will return a parents method, but the type should be equal
+    // to the type in question (it's a child)
+    existing_info.type_name = type->get_name();
     // Update the docstring
     existing_info.docstring = docstring;
     int bad_arg_idx = -99;
@@ -758,7 +763,7 @@ MethodInfo TypeSystem::add_new_method(Type* type,
     return existing;
   } else {
     return type->add_new_method(
-        {0, "new", ts, type->get_name(), false, false, false, docstring, {}});
+        {0, "new", ts, type->get_name(), type->get_name(), false, false, false, docstring, {}});
   }
 }
 
diff --git a/common/type_system/defenum.cpp b/common/type_system/defenum.cpp
index 02f477f64..e59302e90 100644
--- a/common/type_system/defenum.cpp
+++ b/common/type_system/defenum.cpp
@@ -58,10 +58,11 @@ EnumType* parse_defenum(const goos::Object& defenum,
   auto& enum_name_obj = car(iter);
   iter = cdr(iter);
   // check for docstring
+  std::optional<std::string> maybe_docstring;
   if (iter->is_pair() && car(iter).is_string()) {
-    // TODO - docstring - store and use docstring if coming from the compiler
     if (symbol_metadata) {
-      symbol_metadata->docstring = str_util::trim_newline_indents(car(iter).as_string()->data);
+      maybe_docstring = str_util::trim_newline_indents(car(iter).as_string()->data);
+      symbol_metadata->docstring = maybe_docstring.value();
     }
     iter = cdr(iter);
   }
@@ -157,6 +158,7 @@ EnumType* parse_defenum(const goos::Object& defenum,
   if (is_type("integer", base_type, ts)) {
     auto parent = ts->get_type_of_type<ValueType>(base_type.base_type());
     auto new_type = std::make_unique<EnumType>(parent, name, is_bitfield, entries);
+    new_type->m_metadata.docstring = maybe_docstring;
     new_type->set_runtime_type(parent->get_runtime_name());
     return dynamic_cast<EnumType*>(ts->add_type(name, std::move(new_type)));
   } else {
diff --git a/common/util/trie_with_duplicates.h b/common/util/trie_with_duplicates.h
index 4134301bf..66f90567f 100644
--- a/common/util/trie_with_duplicates.h
+++ b/common/util/trie_with_duplicates.h
@@ -7,9 +7,6 @@
 
 // A normal Trie does not allow for duplicate keys, however this one does
 // It allows for insertion and removal
-//
-// Note, keys assume only basic ASCII, which is _fine_ as OpenGOAL itself has this
-// limitation as well.
 template <typename T>
 class TrieWithDuplicates {
  private:
diff --git a/goal_src/jak1/dgos/engine.gd b/goal_src/jak1/dgos/engine.gd
index 7909ac63d..d42ae182e 100644
--- a/goal_src/jak1/dgos/engine.gd
+++ b/goal_src/jak1/dgos/engine.gd
@@ -34,6 +34,7 @@
   "dma-buffer.o"
   "dma-bucket.o"
   "dma-disasm.o"
+  "pc-cheats.o" ;; added
   "pckernel-h.o" ;; added
   "pckernel-impl.o" ;; added
   "pc-debug-common.o" ;; added
diff --git a/goal_src/jak1/dgos/game.gd b/goal_src/jak1/dgos/game.gd
index c85216395..640e81b95 100644
--- a/goal_src/jak1/dgos/game.gd
+++ b/goal_src/jak1/dgos/game.gd
@@ -30,6 +30,7 @@
   "dma-buffer.o"
   "dma-bucket.o"
   "dma-disasm.o"
+  "pc-cheats.o" ;; added
   "pckernel-h.o" ;; added
   "pckernel-impl.o" ;; added
   "pc-debug-common.o" ;; added
diff --git a/goal_src/jak1/engine/anim/aligner-h.gc b/goal_src/jak1/engine/anim/aligner-h.gc
index 4f89115c6..1dc18153d 100644
--- a/goal_src/jak1/engine/anim/aligner-h.gc
+++ b/goal_src/jak1/engine/anim/aligner-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
+(require "kernel/gstate.gc")
 
 ;; name: aligner-h.gc
 ;; name in dgo: aligner-h
diff --git a/goal_src/jak1/engine/anim/aligner.gc b/goal_src/jak1/engine/anim/aligner.gc
index 1f214b2bd..3e32d206c 100644
--- a/goal_src/jak1/engine/anim/aligner.gc
+++ b/goal_src/jak1/engine/anim/aligner.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/anim/aligner-h.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: aligner.gc
 ;; name in dgo: aligner
diff --git a/goal_src/jak1/engine/anim/joint-exploder.gc b/goal_src/jak1/engine/anim/joint-exploder.gc
index 1c2876843..b1c793f46 100644
--- a/goal_src/jak1/engine/anim/joint-exploder.gc
+++ b/goal_src/jak1/engine/anim/joint-exploder.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/collide/collide-cache.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: joint-exploder.gc
 ;; name in dgo: joint-exploder
diff --git a/goal_src/jak1/engine/anim/joint-h.gc b/goal_src/jak1/engine/anim/joint-h.gc
index 39974bdba..c611d0853 100644
--- a/goal_src/jak1/engine/anim/joint-h.gc
+++ b/goal_src/jak1/engine/anim/joint-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: joint-h.gc
 ;; name in dgo: joint-h
diff --git a/goal_src/jak1/engine/anim/joint-mod-h.gc b/goal_src/jak1/engine/anim/joint-mod-h.gc
index d3428a971..2b01f7bae 100644
--- a/goal_src/jak1/engine/anim/joint-mod-h.gc
+++ b/goal_src/jak1/engine/anim/joint-mod-h.gc
@@ -1,5 +1,16 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/geometry/geometry.gc")
+(require "engine/game/main-h.gc")
+(require "engine/debug/debug-h.gc")
+(require "engine/math/transformq-h.gc")
+(require "engine/math/vector.gc")
+(require "engine/game/fact-h.gc")
+(require "engine/anim/joint-h.gc")
+(require "engine/anim/mspace-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: joint-mod-h.gc
 ;; name in dgo: joint-mod-h
diff --git a/goal_src/jak1/engine/anim/joint.gc b/goal_src/jak1/engine/anim/joint.gc
index 39b2a6d18..a8a298205 100644
--- a/goal_src/jak1/engine/anim/joint.gc
+++ b/goal_src/jak1/engine/anim/joint.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "engine/gfx/background/subdivide-h.gc")
+(require "engine/math/transformq.gc")
+(require "engine/anim/joint-h.gc")
+(require "engine/data/art-h.gc")
+(require "engine/anim/mspace-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: joint.gc
 ;; name in dgo: joint
diff --git a/goal_src/jak1/engine/anim/mspace-h.gc b/goal_src/jak1/engine/anim/mspace-h.gc
index 11db00e89..bf7189d6b 100644
--- a/goal_src/jak1/engine/anim/mspace-h.gc
+++ b/goal_src/jak1/engine/anim/mspace-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: mspace-h.gc
 ;; name in dgo: mspace-h
diff --git a/goal_src/jak1/engine/camera/cam-combiner.gc b/goal_src/jak1/engine/camera/cam-combiner.gc
index a26ffff3c..939a8ca73 100644
--- a/goal_src/jak1/engine/camera/cam-combiner.gc
+++ b/goal_src/jak1/engine/camera/cam-combiner.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/camera/camera.gc")
 
 ;; name: cam-combiner.gc
 ;; name in dgo: cam-combiner
diff --git a/goal_src/jak1/engine/camera/cam-debug-h.gc b/goal_src/jak1/engine/camera/cam-debug-h.gc
index 828493b82..74cd2b5a8 100644
--- a/goal_src/jak1/engine/camera/cam-debug-h.gc
+++ b/goal_src/jak1/engine/camera/cam-debug-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: cam-debug-h.gc
 ;; name in dgo: cam-debug-h
diff --git a/goal_src/jak1/engine/camera/cam-debug.gc b/goal_src/jak1/engine/camera/cam-debug.gc
index 7db28f69c..4d721788e 100644
--- a/goal_src/jak1/engine/camera/cam-debug.gc
+++ b/goal_src/jak1/engine/camera/cam-debug.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/pat-h.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/math/euler.gc")
+(require "engine/geometry/bounding-box-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/collide/collide-mesh-h.gc")
+(require "engine/camera/camera.gc")
 
 ;; name: cam-debug.gc
 ;; name in dgo: cam-debug
diff --git a/goal_src/jak1/engine/camera/cam-interface-h.gc b/goal_src/jak1/engine/camera/cam-interface-h.gc
index da89505e8..fa298ae75 100644
--- a/goal_src/jak1/engine/camera/cam-interface-h.gc
+++ b/goal_src/jak1/engine/camera/cam-interface-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/camera-h.gc")
+(require "engine/math/matrix-h.gc")
 
 ;; name: cam-interface-h.gc
 ;; name in dgo: cam-interface-h
diff --git a/goal_src/jak1/engine/camera/cam-interface.gc b/goal_src/jak1/engine/camera/cam-interface.gc
index 2ba06297f..38a111d2c 100644
--- a/goal_src/jak1/engine/camera/cam-interface.gc
+++ b/goal_src/jak1/engine/camera/cam-interface.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/cam-interface-h.gc")
+(require "engine/math/quaternion.gc")
+(require "kernel/gstate.gc")
+(require "engine/gfx/math-camera-h.gc")
+(require "engine/entity/entity-h.gc")
+(require "engine/math/transformq-h.gc")
 
 ;; name: cam-interface.gc
 ;; name in dgo: cam-interface
diff --git a/goal_src/jak1/engine/camera/cam-layout.gc b/goal_src/jak1/engine/camera/cam-layout.gc
index cf5f3b154..cf003b626 100644
--- a/goal_src/jak1/engine/camera/cam-layout.gc
+++ b/goal_src/jak1/engine/camera/cam-layout.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ps2/pad.gc")
+(require "engine/geometry/vol-h.gc")
+(require "engine/camera/camera.gc")
 
 ;; name: cam-layout.gc
 ;; name in dgo: cam-layout
diff --git a/goal_src/jak1/engine/camera/cam-master.gc b/goal_src/jak1/engine/camera/cam-master.gc
index ad36bf8c7..5e3aa07d2 100644
--- a/goal_src/jak1/engine/camera/cam-master.gc
+++ b/goal_src/jak1/engine/camera/cam-master.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/projectiles-h.gc")
+(require "engine/physics/dynamics-h.gc")
+(require "engine/gfx/mood/weather-part.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/collide/collide-mesh-h.gc")
+(require "engine/camera/camera.gc")
 
 ;; name: cam-master.gc
 ;; name in dgo: cam-master
diff --git a/goal_src/jak1/engine/camera/cam-start.gc b/goal_src/jak1/engine/camera/cam-start.gc
index 68ca0cc81..f85fde398 100644
--- a/goal_src/jak1/engine/camera/cam-start.gc
+++ b/goal_src/jak1/engine/camera/cam-start.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/cam-combiner.gc")
 
 ;; name: cam-start.gc
 ;; name in dgo: cam-start
diff --git a/goal_src/jak1/engine/camera/cam-states-dbg.gc b/goal_src/jak1/engine/camera/cam-states-dbg.gc
index 4731506a7..7e0351a96 100644
--- a/goal_src/jak1/engine/camera/cam-states-dbg.gc
+++ b/goal_src/jak1/engine/camera/cam-states-dbg.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/camera.gc")
+(require "pc/pckernel-impl.gc")
 
 ;; name: cam-states-dbg.gc
 ;; name in dgo: cam-states-dbg
diff --git a/goal_src/jak1/engine/camera/cam-states.gc b/goal_src/jak1/engine/camera/cam-states.gc
index 24db45f1f..deb33c197 100644
--- a/goal_src/jak1/engine/camera/cam-states.gc
+++ b/goal_src/jak1/engine/camera/cam-states.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/collide/collide-mesh-h.gc")
+(require "engine/camera/camera.gc")
+(require "engine/nav/navigate-h.gc")
+(require "engine/collide/collide-cache-h.gc")
+(require "engine/anim/joint-h.gc")
+(require "engine/debug/debug.gc")
 
 ;; name: cam-states.gc
 ;; name in dgo: cam-states
diff --git a/goal_src/jak1/engine/camera/cam-update-h.gc b/goal_src/jak1/engine/camera/cam-update-h.gc
index c256ff4f9..cf765dd2d 100644
--- a/goal_src/jak1/engine/camera/cam-update-h.gc
+++ b/goal_src/jak1/engine/camera/cam-update-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/matrix.gc")
+(require "engine/util/smush-control-h.gc")
 
 ;; name: cam-update-h.gc
 ;; name in dgo: cam-update-h
diff --git a/goal_src/jak1/engine/camera/cam-update.gc b/goal_src/jak1/engine/camera/cam-update.gc
index 7e847e4bd..828088361 100644
--- a/goal_src/jak1/engine/camera/cam-update.gc
+++ b/goal_src/jak1/engine/camera/cam-update.gc
@@ -1,5 +1,16 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/level/bsp-h.gc")
+(require "engine/gfx/math-camera.gc")
+(require "engine/load/decomp.gc")
+(require "engine/gfx/shrub/shrubbery-h.gc")
+(require "engine/physics/dynamics-h.gc")
+(require "engine/math/vector.gc")
+(require "engine/gfx/background/wind.gc")
+(require "engine/math/quaternion.gc")
 
 ;; name: cam-update.gc
 ;; name in dgo: cam-update
diff --git a/goal_src/jak1/engine/camera/camera-h.gc b/goal_src/jak1/engine/camera/camera-h.gc
index 7b9a3e095..eca37c472 100644
--- a/goal_src/jak1/engine/camera/camera-h.gc
+++ b/goal_src/jak1/engine/camera/camera-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/hw/display-h.gc")
 
 ;; name: camera-h.gc
 ;; name in dgo: camera-h
diff --git a/goal_src/jak1/engine/camera/camera.gc b/goal_src/jak1/engine/camera/camera.gc
index 636ed71ce..b77ac6580 100644
--- a/goal_src/jak1/engine/camera/camera.gc
+++ b/goal_src/jak1/engine/camera/camera.gc
@@ -1,5 +1,17 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/engine/engines.gc")
+(require "engine/entity/res.gc")
+(require "engine/camera/cam-debug-h.gc")
+(require "engine/geometry/geometry.gc")
+(require "engine/game/main-h.gc")
+(require "engine/util/smush-control-h.gc")
+(require "engine/entity/entity-h.gc")
+(require "engine/math/vector.gc")
+(require "kernel/gstate.gc")
+(require "engine/camera/cam-interface-h.gc")
 
 ;; name: camera.gc
 ;; name in dgo: camera
diff --git a/goal_src/jak1/engine/camera/pov-camera-h.gc b/goal_src/jak1/engine/camera/pov-camera-h.gc
index ae355597c..62e01fa94 100644
--- a/goal_src/jak1/engine/camera/pov-camera-h.gc
+++ b/goal_src/jak1/engine/camera/pov-camera-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: pov-camera-h.gc
 ;; name in dgo: pov-camera-h
diff --git a/goal_src/jak1/engine/camera/pov-camera.gc b/goal_src/jak1/engine/camera/pov-camera.gc
index f9a26a3d1..e6b2b7816 100644
--- a/goal_src/jak1/engine/camera/pov-camera.gc
+++ b/goal_src/jak1/engine/camera/pov-camera.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/common-obs/water.gc")
 
 ;; name: pov-camera.gc
 ;; name in dgo: pov-camera
diff --git a/goal_src/jak1/engine/collide/collide-cache-h.gc b/goal_src/jak1/engine/collide/collide-cache-h.gc
index 9062ddbd6..22a7f387e 100644
--- a/goal_src/jak1/engine/collide/collide-cache-h.gc
+++ b/goal_src/jak1/engine/collide/collide-cache-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: collide-cache-h.gc
 ;; name in dgo: collide-cache-h
diff --git a/goal_src/jak1/engine/collide/collide-cache.gc b/goal_src/jak1/engine/collide/collide-cache.gc
index d6ec472d0..d8f72095b 100644
--- a/goal_src/jak1/engine/collide/collide-cache.gc
+++ b/goal_src/jak1/engine/collide/collide-cache.gc
@@ -1,5 +1,17 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/subdivide.gc")
+(require "engine/collide/collide-func.gc")
+(require "examples/debug-collide.gc")
+(require "engine/collide/collide-probe.gc")
+(require "engine/geometry/bounding-box.gc")
+(require "engine/collide/collide-mesh-h.gc")
+(require "engine/collide/main-collide.gc")
+(require "engine/common-obs/water-h.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/debug/debug.gc")
 
 ;; name: collide-cache.gc
 ;; name in dgo: collide-cache
diff --git a/goal_src/jak1/engine/collide/collide-edge-grab-h.gc b/goal_src/jak1/engine/collide/collide-edge-grab-h.gc
index 7946310dd..641f5fd3c 100644
--- a/goal_src/jak1/engine/collide/collide-edge-grab-h.gc
+++ b/goal_src/jak1/engine/collide/collide-edge-grab-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/geometry/bounding-box-h.gc")
 
 ;; name: collide-edge-grab-h.gc
 ;; name in dgo: collide-edge-grab-h
diff --git a/goal_src/jak1/engine/collide/collide-edge-grab.gc b/goal_src/jak1/engine/collide/collide-edge-grab.gc
index 468f60ecf..c4b14c8cd 100644
--- a/goal_src/jak1/engine/collide/collide-edge-grab.gc
+++ b/goal_src/jak1/engine/collide/collide-edge-grab.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/surface-h.gc")
+(require "engine/collide/collide-edge-grab-h.gc")
+(require "kernel/gstate.gc")
+(require "engine/collide/collide-cache-h.gc")
+(require "engine/target/target-h.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/debug/debug.gc")
 
 ;; name: collide-edge-grab.gc
 ;; name in dgo: collide-edge-grab
diff --git a/goal_src/jak1/engine/collide/collide-frag-h.gc b/goal_src/jak1/engine/collide/collide-frag-h.gc
index e598a06ef..58f93e313 100644
--- a/goal_src/jak1/engine/collide/collide-frag-h.gc
+++ b/goal_src/jak1/engine/collide/collide-frag-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: collide-frag-h.gc
 ;; name in dgo: collide-frag-h
diff --git a/goal_src/jak1/engine/collide/collide-frag.gc b/goal_src/jak1/engine/collide/collide-frag.gc
index 185cd3128..9be5f15ab 100644
--- a/goal_src/jak1/engine/collide/collide-frag.gc
+++ b/goal_src/jak1/engine/collide/collide-frag.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/bsp.gc")
+(require "engine/collide/collide-frag-h.gc")
 
 ;; name: collide-frag.gc
 ;; name in dgo: collide-frag
diff --git a/goal_src/jak1/engine/collide/collide-func-h.gc b/goal_src/jak1/engine/collide/collide-func-h.gc
index 307f9b6b7..0da23a751 100644
--- a/goal_src/jak1/engine/collide/collide-func-h.gc
+++ b/goal_src/jak1/engine/collide/collide-func-h.gc
@@ -1,6 +1,6 @@
 ;;-*-Lisp-*-
 (in-package goal)
-
+(bundles "ENGINE.CGO" "GAME.CGO")
 ;; name: collide-func-h.gc
 ;; name in dgo: collide-func-h
 ;; dgos: GAME, ENGINE
diff --git a/goal_src/jak1/engine/collide/collide-func.gc b/goal_src/jak1/engine/collide/collide-func.gc
index fd414b0ee..e8da2c2ae 100644
--- a/goal_src/jak1/engine/collide/collide-func.gc
+++ b/goal_src/jak1/engine/collide/collide-func.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector.gc")
+(require "kernel/gkernel-h.gc")
 
 ;; name: collide-func.gc
 ;; name in dgo: collide-func
diff --git a/goal_src/jak1/engine/collide/collide-h.gc b/goal_src/jak1/engine/collide/collide-h.gc
index 676f0559b..235cf56d8 100644
--- a/goal_src/jak1/engine/collide/collide-h.gc
+++ b/goal_src/jak1/engine/collide/collide-h.gc
@@ -1,6 +1,6 @@
 ;;-*-Lisp-*-
 (in-package goal)
-
+(bundles "ENGINE.CGO" "GAME.CGO")
 ;; name: collide-h.gc
 ;; name in dgo: collide-h
 ;; dgos: GAME, ENGINE
diff --git a/goal_src/jak1/engine/collide/collide-mesh-h.gc b/goal_src/jak1/engine/collide/collide-mesh-h.gc
index 2ce76f04d..1fd597a0a 100644
--- a/goal_src/jak1/engine/collide/collide-mesh-h.gc
+++ b/goal_src/jak1/engine/collide/collide-mesh-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: collide-mesh-h.gc
 ;; name in dgo: collide-mesh-h
diff --git a/goal_src/jak1/engine/collide/collide-mesh.gc b/goal_src/jak1/engine/collide/collide-mesh.gc
index f18ac8318..b655bb99e 100644
--- a/goal_src/jak1/engine/collide/collide-mesh.gc
+++ b/goal_src/jak1/engine/collide/collide-mesh.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/pat-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/collide/collide-mesh-h.gc")
 
 ;; name: collide-mesh.gc
 ;; name in dgo: collide-mesh
diff --git a/goal_src/jak1/engine/collide/collide-probe.gc b/goal_src/jak1/engine/collide/collide-probe.gc
index ba859ccb7..32a7a37e2 100644
--- a/goal_src/jak1/engine/collide/collide-probe.gc
+++ b/goal_src/jak1/engine/collide/collide-probe.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/level-h.gc")
+(require "kernel/gkernel.gc")
+(require "engine/collide/collide-cache-h.gc")
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/collide/collide-frag-h.gc")
+(require "engine/draw/draw-node-h.gc")
 
 ;; name: collide-probe.gc
 ;; name in dgo: collide-probe
diff --git a/goal_src/jak1/engine/collide/collide-shape-h.gc b/goal_src/jak1/engine/collide/collide-shape-h.gc
index c0717b324..a1ead9129 100644
--- a/goal_src/jak1/engine/collide/collide-shape-h.gc
+++ b/goal_src/jak1/engine/collide/collide-shape-h.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/pat-h.gc")
+(require "engine/math/quaternion.gc")
+(require "kernel/gkernel-h.gc")
+(require "engine/math/transformq-h.gc")
+(require "engine/game/game-h.gc")
+(require "engine/engine/connect.gc")
 
 ;; name: collide-shape-h.gc
 ;; name in dgo: collide-shape-h
diff --git a/goal_src/jak1/engine/collide/collide-shape-rider.gc b/goal_src/jak1/engine/collide/collide-shape-rider.gc
index 6cf91303b..40a9218ae 100644
--- a/goal_src/jak1/engine/collide/collide-shape-rider.gc
+++ b/goal_src/jak1/engine/collide/collide-shape-rider.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-shape.gc")
 
 ;; name: collide-shape-rider.gc
 ;; name in dgo: collide-shape-rider
diff --git a/goal_src/jak1/engine/collide/collide-shape.gc b/goal_src/jak1/engine/collide/collide-shape.gc
index 709abd376..c522dafbf 100644
--- a/goal_src/jak1/engine/collide/collide-shape.gc
+++ b/goal_src/jak1/engine/collide/collide-shape.gc
@@ -1,5 +1,17 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/camera-h.gc")
+(require "engine/geometry/cylinder.gc")
+(require "engine/collide/collide-target-h.gc")
+(require "engine/math/transformq.gc")
+(require "engine/collide/collide-probe.gc")
+(require "engine/collide/collide-mesh.gc")
+(require "engine/collide/collide-edge-grab.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/gfx/background/subdivide-h.gc")
+(require "engine/collide/collide-touch.gc")
 
 ;; name: collide-shape.gc
 ;; name in dgo: collide-shape
diff --git a/goal_src/jak1/engine/collide/collide-target-h.gc b/goal_src/jak1/engine/collide/collide-target-h.gc
index 6c33fa0d3..74ea1da5a 100644
--- a/goal_src/jak1/engine/collide/collide-target-h.gc
+++ b/goal_src/jak1/engine/collide/collide-target-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: collide-target-h.gc
 ;; name in dgo: collide-target-h
diff --git a/goal_src/jak1/engine/collide/collide-touch-h.gc b/goal_src/jak1/engine/collide/collide-touch-h.gc
index b2f5159c1..a3a99eacc 100644
--- a/goal_src/jak1/engine/collide/collide-touch-h.gc
+++ b/goal_src/jak1/engine/collide/collide-touch-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: collide-touch-h.gc
 ;; name in dgo: collide-touch-h
diff --git a/goal_src/jak1/engine/collide/collide-touch.gc b/goal_src/jak1/engine/collide/collide-touch.gc
index f4207dff2..b40e68ce5 100644
--- a/goal_src/jak1/engine/collide/collide-touch.gc
+++ b/goal_src/jak1/engine/collide/collide-touch.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-touch-h.gc")
+(require "kernel/gstate.gc")
+(require "engine/target/target-h.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/collide/collide-mesh-h.gc")
 
 ;; name: collide-touch.gc
 ;; name in dgo: collide-touch
diff --git a/goal_src/jak1/engine/collide/collide.gc b/goal_src/jak1/engine/collide/collide.gc
index 9689eda26..deea39d0b 100644
--- a/goal_src/jak1/engine/collide/collide.gc
+++ b/goal_src/jak1/engine/collide/collide.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: collide.gc
 ;; name in dgo: collide
diff --git a/goal_src/jak1/engine/collide/main-collide.gc b/goal_src/jak1/engine/collide/main-collide.gc
index f677d2955..47cde0991 100644
--- a/goal_src/jak1/engine/collide/main-collide.gc
+++ b/goal_src/jak1/engine/collide/main-collide.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/ps2/vu1-macros.gc")
+(require "engine/geometry/bounding-box-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: main-collide.gc
 ;; name in dgo: main-collide
diff --git a/goal_src/jak1/engine/collide/pat-h.gc b/goal_src/jak1/engine/collide/pat-h.gc
index a0acccee6..e03154cad 100644
--- a/goal_src/jak1/engine/collide/pat-h.gc
+++ b/goal_src/jak1/engine/collide/pat-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/math.gc")
 
 ;; name: pat-h.gc
 ;; name in dgo: pat-h
diff --git a/goal_src/jak1/engine/collide/surface-h.gc b/goal_src/jak1/engine/collide/surface-h.gc
index f55bb8d69..0d1e46084 100644
--- a/goal_src/jak1/engine/collide/surface-h.gc
+++ b/goal_src/jak1/engine/collide/surface-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: surface-h.gc
 ;; name in dgo: surface-h
diff --git a/goal_src/jak1/engine/common-obs/babak.gc b/goal_src/jak1/engine/common-obs/babak.gc
index fbd3476ee..8b6e332b4 100644
--- a/goal_src/jak1/engine/common-obs/babak.gc
+++ b/goal_src/jak1/engine/common-obs/babak.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: babak.gc
 ;; name in dgo: babak
diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc
index 8a7f27c1e..d5e673ed6 100644
--- a/goal_src/jak1/engine/common-obs/basebutton.gc
+++ b/goal_src/jak1/engine/common-obs/basebutton.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/target/logic-target.gc")
 
 ;; name: basebutton.gc
 ;; name in dgo: basebutton
diff --git a/goal_src/jak1/engine/common-obs/baseplat.gc b/goal_src/jak1/engine/common-obs/baseplat.gc
index 2747402ac..80a08799e 100644
--- a/goal_src/jak1/engine/common-obs/baseplat.gc
+++ b/goal_src/jak1/engine/common-obs/baseplat.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/game/projectiles.gc")
 
 ;; name: baseplat.gc
 ;; name in dgo: baseplat
diff --git a/goal_src/jak1/engine/common-obs/collectables-part.gc b/goal_src/jak1/engine/common-obs/collectables-part.gc
index 9ac81ddd9..b1bde8eed 100644
--- a/goal_src/jak1/engine/common-obs/collectables-part.gc
+++ b/goal_src/jak1/engine/common-obs/collectables-part.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/anim/joint-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/math/vector.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: collectables-part.gc
 ;; name in dgo: collectables-part
diff --git a/goal_src/jak1/engine/common-obs/collectables.gc b/goal_src/jak1/engine/common-obs/collectables.gc
index adaa264f0..9740cca0f 100644
--- a/goal_src/jak1/engine/common-obs/collectables.gc
+++ b/goal_src/jak1/engine/common-obs/collectables.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/physics/trajectory.gc")
+(require "engine/collide/collide-cache.gc")
+(require "pc/pckernel.gc")
+(require "engine/common-obs/collectables-part.gc")
+(require "engine/entity/entity.gc")
 
 ;; name: collectables.gc
 ;; name in dgo: collectables
diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc
index 9e271df14..f3cf77d86 100644
--- a/goal_src/jak1/engine/common-obs/crates.gc
+++ b/goal_src/jak1/engine/common-obs/crates.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/collectables.gc")
 
 ;; name: crates.gc
 ;; name in dgo: crates
diff --git a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc
index 6a6c5be06..3dffa441c 100644
--- a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc
+++ b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/water-anim.gc")
 
 ;; name: dark-eco-pool.gc
 ;; name in dgo: dark-eco-pool
diff --git a/goal_src/jak1/engine/common-obs/generic-obs-h.gc b/goal_src/jak1/engine/common-obs/generic-obs-h.gc
index 67e8486ce..003e34434 100644
--- a/goal_src/jak1/engine/common-obs/generic-obs-h.gc
+++ b/goal_src/jak1/engine/common-obs/generic-obs-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: generic-obs-h.gc
 ;; name in dgo: generic-obs-h
diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc
index 81276b50c..b39ed7ccc 100644
--- a/goal_src/jak1/engine/common-obs/generic-obs.gc
+++ b/goal_src/jak1/engine/common-obs/generic-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/nav/navigate-h.gc")
+(require "pc/util/pc-anim-util.gc")
+(require "engine/level/level.gc")
+(require "engine/camera/camera.gc")
 
 ;; name: generic-obs.gc
 ;; name in dgo: generic-obs
diff --git a/goal_src/jak1/engine/common-obs/nav-enemy-h.gc b/goal_src/jak1/engine/common-obs/nav-enemy-h.gc
index 07b584575..9e7da76eb 100644
--- a/goal_src/jak1/engine/common-obs/nav-enemy-h.gc
+++ b/goal_src/jak1/engine/common-obs/nav-enemy-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: nav-enemy-h.gc
 ;; name in dgo: nav-enemy-h
diff --git a/goal_src/jak1/engine/common-obs/nav-enemy.gc b/goal_src/jak1/engine/common-obs/nav-enemy.gc
index bf191469f..539bcf31d 100644
--- a/goal_src/jak1/engine/common-obs/nav-enemy.gc
+++ b/goal_src/jak1/engine/common-obs/nav-enemy.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/nav/navigate.gc")
+(require "engine/common-obs/process-taskable.gc")
+(require "engine/anim/aligner.gc")
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/nav-enemy-h.gc")
 
 ;; name: nav-enemy.gc
 ;; name in dgo: nav-enemy
diff --git a/goal_src/jak1/engine/common-obs/orb-cache.gc b/goal_src/jak1/engine/common-obs/orb-cache.gc
index 74ba7f726..f86dca24e 100644
--- a/goal_src/jak1/engine/common-obs/orb-cache.gc
+++ b/goal_src/jak1/engine/common-obs/orb-cache.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/collectables.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: orb-cache.gc
 ;; name in dgo: orb-cache
diff --git a/goal_src/jak1/engine/common-obs/plat-button.gc b/goal_src/jak1/engine/common-obs/plat-button.gc
index cc6898a15..7037f2403 100644
--- a/goal_src/jak1/engine/common-obs/plat-button.gc
+++ b/goal_src/jak1/engine/common-obs/plat-button.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/geometry/path.gc")
 
 ;; name: plat-button.gc
 ;; name in dgo: plat-button
diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc
index c70b97f5e..6df65cd3a 100644
--- a/goal_src/jak1/engine/common-obs/plat-eco.gc
+++ b/goal_src/jak1/engine/common-obs/plat-eco.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/plat.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: plat-eco.gc
 ;; name in dgo: plat-eco
diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc
index 972087ee7..b4e83f6f2 100644
--- a/goal_src/jak1/engine/common-obs/plat.gc
+++ b/goal_src/jak1/engine/common-obs/plat.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/geometry/path.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: plat.gc
 ;; name in dgo: plat
diff --git a/goal_src/jak1/engine/common-obs/process-drawable-h.gc b/goal_src/jak1/engine/common-obs/process-drawable-h.gc
index 1eabf45db..bcdbd6ffe 100644
--- a/goal_src/jak1/engine/common-obs/process-drawable-h.gc
+++ b/goal_src/jak1/engine/common-obs/process-drawable-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/anim/joint-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: process-drawable-h.gc
 ;; name in dgo: process-drawable-h
diff --git a/goal_src/jak1/engine/common-obs/process-drawable.gc b/goal_src/jak1/engine/common-obs/process-drawable.gc
index b6e77c702..43c18175e 100644
--- a/goal_src/jak1/engine/common-obs/process-drawable.gc
+++ b/goal_src/jak1/engine/common-obs/process-drawable.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/engine/engines.gc")
+(require "engine/gfx/merc/merc-blend-shape.gc")
+(require "engine/game/game-info.gc")
+(require "engine/gfx/foreground/eye-h.gc")
+(require "engine/gfx/shadow/shadow-cpu-h.gc")
+(require "engine/collide/collide-shape-rider.gc")
+(require "engine/load/loader.gc")
 
 ;; name: process-drawable.gc
 ;; name in dgo: process-drawable
diff --git a/goal_src/jak1/engine/common-obs/process-taskable.gc b/goal_src/jak1/engine/common-obs/process-taskable.gc
index c858eabb1..f4610a38a 100644
--- a/goal_src/jak1/engine/common-obs/process-taskable.gc
+++ b/goal_src/jak1/engine/common-obs/process-taskable.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/geometry/path-h.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/game/main.gc")
 
 ;; name: process-taskable.gc
 ;; name in dgo: process-taskable
diff --git a/goal_src/jak1/engine/common-obs/rigid-body-h.gc b/goal_src/jak1/engine/common-obs/rigid-body-h.gc
index ef78ebe61..fdd0bb60e 100644
--- a/goal_src/jak1/engine/common-obs/rigid-body-h.gc
+++ b/goal_src/jak1/engine/common-obs/rigid-body-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: rigid-body-h.gc
 ;; name in dgo: rigid-body-h
diff --git a/goal_src/jak1/engine/common-obs/rigid-body.gc b/goal_src/jak1/engine/common-obs/rigid-body.gc
index d182b2ec1..e12ad5cca 100644
--- a/goal_src/jak1/engine/common-obs/rigid-body.gc
+++ b/goal_src/jak1/engine/common-obs/rigid-body.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "engine/common-obs/rigid-body-h.gc")
 
 ;; name: rigid-body.gc
 ;; name in dgo: rigid-body
diff --git a/goal_src/jak1/engine/common-obs/ropebridge.gc b/goal_src/jak1/engine/common-obs/ropebridge.gc
index 0a7d2451f..d5888a1f9 100644
--- a/goal_src/jak1/engine/common-obs/ropebridge.gc
+++ b/goal_src/jak1/engine/common-obs/ropebridge.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: ropebridge.gc
 ;; name in dgo: ropebridge
diff --git a/goal_src/jak1/engine/common-obs/sharkey.gc b/goal_src/jak1/engine/common-obs/sharkey.gc
index 4cc4a83ec..d64b3026c 100644
--- a/goal_src/jak1/engine/common-obs/sharkey.gc
+++ b/goal_src/jak1/engine/common-obs/sharkey.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/nav-enemy.gc")
+(require "engine/common-obs/water.gc")
 
 ;; name: sharkey.gc
 ;; name in dgo: sharkey
diff --git a/goal_src/jak1/engine/common-obs/ticky.gc b/goal_src/jak1/engine/common-obs/ticky.gc
index ebe21566b..7b12c4c40 100644
--- a/goal_src/jak1/engine/common-obs/ticky.gc
+++ b/goal_src/jak1/engine/common-obs/ticky.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/sound/gsound.gc")
 
 ;; name: ticky.gc
 ;; name in dgo: ticky
diff --git a/goal_src/jak1/engine/common-obs/tippy.gc b/goal_src/jak1/engine/common-obs/tippy.gc
index 6d926cd62..d9bb05c6e 100644
--- a/goal_src/jak1/engine/common-obs/tippy.gc
+++ b/goal_src/jak1/engine/common-obs/tippy.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/math/quaternion.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: tippy.gc
 ;; name in dgo: tippy
diff --git a/goal_src/jak1/engine/common-obs/voicebox.gc b/goal_src/jak1/engine/common-obs/voicebox.gc
index c73ea89c2..c34890c4b 100644
--- a/goal_src/jak1/engine/common-obs/voicebox.gc
+++ b/goal_src/jak1/engine/common-obs/voicebox.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/camera.gc")
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/game/settings.gc")
 
 ;; name: voicebox.gc
 ;; name in dgo: voicebox
diff --git a/goal_src/jak1/engine/common-obs/water-anim.gc b/goal_src/jak1/engine/common-obs/water-anim.gc
index bc2b49427..cb8d99983 100644
--- a/goal_src/jak1/engine/common-obs/water-anim.gc
+++ b/goal_src/jak1/engine/common-obs/water-anim.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/gfx/foreground/ripple.gc")
+(require "engine/common-obs/water-h.gc")
 
 ;; name: water-anim.gc
 ;; name in dgo: water-anim
diff --git a/goal_src/jak1/engine/common-obs/water-h.gc b/goal_src/jak1/engine/common-obs/water-h.gc
index 5de090a3e..f93d0508d 100644
--- a/goal_src/jak1/engine/common-obs/water-h.gc
+++ b/goal_src/jak1/engine/common-obs/water-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/main-h.gc")
+(require "engine/game/game-h.gc")
+(require "kernel/gkernel-h.gc")
 
 ;; name: water-h.gc
 ;; name in dgo: water-h
diff --git a/goal_src/jak1/engine/common-obs/water.gc b/goal_src/jak1/engine/common-obs/water.gc
index ac34e4a7b..ffceb88a9 100644
--- a/goal_src/jak1/engine/common-obs/water.gc
+++ b/goal_src/jak1/engine/common-obs/water.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/effect-control.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/gfx/foreground/ripple.gc")
+(require "engine/common-obs/water-h.gc")
+(require "engine/geometry/vol.gc")
 
 ;; name: water.gc
 ;; name in dgo: water
diff --git a/goal_src/jak1/engine/data/art-h.gc b/goal_src/jak1/engine/data/art-h.gc
index 74c1f9e06..ef9fae9b4 100644
--- a/goal_src/jak1/engine/data/art-h.gc
+++ b/goal_src/jak1/engine/data/art-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: art-h.gc
 ;; name in dgo: art-h
diff --git a/goal_src/jak1/engine/debug/anim-tester.gc b/goal_src/jak1/engine/debug/anim-tester.gc
index 8efe7761d..1428e8052 100644
--- a/goal_src/jak1/engine/debug/anim-tester.gc
+++ b/goal_src/jak1/engine/debug/anim-tester.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/util/glist-h.gc")
+(require "engine/anim/aligner.gc")
 
 ;; name: anim-tester.gc
 ;; name in dgo: anim-tester
diff --git a/goal_src/jak1/engine/debug/assert-h.gc b/goal_src/jak1/engine/debug/assert-h.gc
index 5c6caab79..d3a2a17ea 100644
--- a/goal_src/jak1/engine/debug/assert-h.gc
+++ b/goal_src/jak1/engine/debug/assert-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: assert-h.gc
 ;; name in dgo: assert-h
diff --git a/goal_src/jak1/engine/debug/assert.gc b/goal_src/jak1/engine/debug/assert.gc
index ade04714d..ce1992f83 100644
--- a/goal_src/jak1/engine/debug/assert.gc
+++ b/goal_src/jak1/engine/debug/assert.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/debug/assert-h.gc")
 
 ;; name: assert.gc
 ;; name in dgo: assert
diff --git a/goal_src/jak1/engine/debug/debug-h.gc b/goal_src/jak1/engine/debug/debug-h.gc
index db3b0b7b6..54843f0b4 100644
--- a/goal_src/jak1/engine/debug/debug-h.gc
+++ b/goal_src/jak1/engine/debug/debug-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: debug-h.gc
 ;; name in dgo: debug-h
diff --git a/goal_src/jak1/engine/debug/debug-sphere.gc b/goal_src/jak1/engine/debug/debug-sphere.gc
index c9f8ddaa9..13e0bc868 100644
--- a/goal_src/jak1/engine/debug/debug-sphere.gc
+++ b/goal_src/jak1/engine/debug/debug-sphere.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/debug/debug-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: debug-sphere.gc
 ;; name in dgo: debug-sphere
diff --git a/goal_src/jak1/engine/debug/debug.gc b/goal_src/jak1/engine/debug/debug.gc
index 651616736..93723b63d 100644
--- a/goal_src/jak1/engine/debug/debug.gc
+++ b/goal_src/jak1/engine/debug/debug.gc
@@ -1,5 +1,15 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/draw/drawable-group-h.gc")
+(require "engine/gfx/math-camera.gc")
+(require "engine/debug/debug-sphere.gc")
+(require "engine/camera/cam-debug-h.gc")
+(require "engine/geometry/geometry.gc")
+(require "engine/gfx/lights-h.gc")
+(require "engine/math/vector.gc")
 
 ;; name: debug.gc
 ;; name in dgo: debug
diff --git a/goal_src/jak1/engine/debug/default-menu.gc b/goal_src/jak1/engine/debug/default-menu.gc
index bcfdc40ea..96853471b 100644
--- a/goal_src/jak1/engine/debug/default-menu.gc
+++ b/goal_src/jak1/engine/debug/default-menu.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/cam-update.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/draw/drawable.gc")
+(require "engine/math/euler.gc")
+(require "engine/entity/entity.gc")
+(require "engine/debug/memory-usage.gc")
+(require "engine/debug/menu.gc")
 
 ;; name: default-menu.gc
 ;; name in dgo: default-menu
diff --git a/goal_src/jak1/engine/debug/memory-usage-h.gc b/goal_src/jak1/engine/debug/memory-usage-h.gc
index 4ebb91d7d..d6790e176 100644
--- a/goal_src/jak1/engine/debug/memory-usage-h.gc
+++ b/goal_src/jak1/engine/debug/memory-usage-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: memory-usage-h.gc
 ;; name in dgo: memory-usage-h
diff --git a/goal_src/jak1/engine/debug/memory-usage.gc b/goal_src/jak1/engine/debug/memory-usage.gc
index 646fb53ce..ac14bf264 100644
--- a/goal_src/jak1/engine/debug/memory-usage.gc
+++ b/goal_src/jak1/engine/debug/memory-usage.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/level.gc")
 
 ;; name: memory-usage.gc
 ;; name in dgo: memory-usage
diff --git a/goal_src/jak1/engine/debug/menu.gc b/goal_src/jak1/engine/debug/menu.gc
index 64b690594..82a797a28 100644
--- a/goal_src/jak1/engine/debug/menu.gc
+++ b/goal_src/jak1/engine/debug/menu.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/font.gc")
 
 ;; name: menu.gc
 ;; name in dgo: menu
diff --git a/goal_src/jak1/engine/debug/part-tester.gc b/goal_src/jak1/engine/debug/part-tester.gc
index 85453d288..84c807f7c 100644
--- a/goal_src/jak1/engine/debug/part-tester.gc
+++ b/goal_src/jak1/engine/debug/part-tester.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/debug/debug.gc")
 
 ;; name: part-tester.gc
 ;; name in dgo: part-tester
diff --git a/goal_src/jak1/engine/debug/stats-h.gc b/goal_src/jak1/engine/debug/stats-h.gc
index 0dd519a2e..d1916682c 100644
--- a/goal_src/jak1/engine/debug/stats-h.gc
+++ b/goal_src/jak1/engine/debug/stats-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: stats-h.gc
 ;; name in dgo: stats-h
diff --git a/goal_src/jak1/engine/debug/viewer.gc b/goal_src/jak1/engine/debug/viewer.gc
index 86e8b3dc2..0d1febb15 100644
--- a/goal_src/jak1/engine/debug/viewer.gc
+++ b/goal_src/jak1/engine/debug/viewer.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/anim/aligner.gc")
+(require "engine/entity/entity.gc")
 
 ;; name: viewer.gc
 ;; name in dgo: viewer
diff --git a/goal_src/jak1/engine/dma/dma-bucket.gc b/goal_src/jak1/engine/dma/dma-bucket.gc
index da0462204..3514474f6 100644
--- a/goal_src/jak1/engine/dma/dma-bucket.gc
+++ b/goal_src/jak1/engine/dma/dma-bucket.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
 
 ;; name: dma-bucket.gc
 ;; name in dgo: dma-bucket
diff --git a/goal_src/jak1/engine/dma/dma-buffer.gc b/goal_src/jak1/engine/dma/dma-buffer.gc
index d6cdc619c..aa68769c1 100644
--- a/goal_src/jak1/engine/dma/dma-buffer.gc
+++ b/goal_src/jak1/engine/dma/dma-buffer.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma.gc")
 
 ;; name: dma-buffer.gc
 ;; name in dgo: dma-buffer
@@ -268,65 +271,6 @@
   (dma-send-chain chan (the-as uint (-> buf data)))
   )
 
-(defmacro dma-buffer-add-gs-set-flusha (buf &rest reg-list)
-  "Add a gif cnt dma packet to a dma-buffer for setting GS registers. Up to 16 can be set at once.
-   The packet runs the flusha command which waits for GIF transfer to end and VU1 microprogram to stop.
-   reg-list is a list of pairs where the car is the register name and the cadr is the value to be set for that register."
-
-  (let ((reg-count (length reg-list))
-        (qwc (+ (length reg-list) 1))
-        (reg-names (apply first reg-list))
-        (reg-datas (apply second reg-list))
-        )
-    `(begin
-      ;; dma tag
-      (dma-buffer-add-cnt-vif2 ,buf ,qwc
-                              (new 'static 'vif-tag :cmd (vif-cmd flusha))
-                              (new 'static 'vif-tag :cmd (vif-cmd direct) :imm ,qwc)
-                              )
-
-      ;; gif tag for editing gs regs
-      (dma-buffer-add-gif-tag ,buf (new 'static 'gif-tag64 :nloop 1 :eop 1 :nreg ,reg-count)
-                                   (gs-reg-list a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d)
-                                   )
-
-      ;; gs regs
-      (dma-buffer-add-uint64 ,buf
-          ,@(apply2 (lambda (x) x) (lambda (x) `(gs-reg64 ,x)) reg-datas reg-names)
-          )
-      )
-    )
-  )
-
-(defmacro dma-buffer-add-gs-set (buf &rest reg-list)
-  "Add a gif cnt dma packet to a dma-buffer for setting GS registers. Up to 16 can be set at once.
-   reg-list is a list of pairs where the car is the register name and the cadr is the value to be set for that register."
-
-  (let ((reg-count (length reg-list))
-        (qwc (+ (length reg-list) 1))
-        (reg-names (apply first reg-list))
-        (reg-datas (apply second reg-list))
-        )
-    `(begin
-      ;; dma tag
-      (dma-buffer-add-cnt-vif2 ,buf ,qwc
-                              (new 'static 'vif-tag :cmd (vif-cmd nop))
-                              (new 'static 'vif-tag :cmd (vif-cmd direct) :imm ,qwc)
-                              )
-
-      ;; gif tag for editing gs regs
-      (dma-buffer-add-gif-tag ,buf (new 'static 'gif-tag64 :nloop 1 :eop 1 :nreg ,reg-count)
-                                   (gs-reg-list a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d)
-                                   )
-
-      ;; gs regs
-      (dma-buffer-add-uint64 ,buf
-          ,@(apply2 (lambda (x) x) (lambda (x) `(gs-reg64 ,x)) reg-datas reg-names)
-          )
-      )
-    )
-  )
-
 (defmacro with-cnt-vif-block (bindings &rest body)
   "Start a cnt w/ vif direct to gif dma packet setup for the dma-buffer in bindings.
    With this, you can transfer data through PATH2 without having to setup the tag yourself.
diff --git a/goal_src/jak1/engine/dma/dma-disasm.gc b/goal_src/jak1/engine/dma/dma-disasm.gc
index 2d5d571de..50745b03d 100644
--- a/goal_src/jak1/engine/dma/dma-disasm.gc
+++ b/goal_src/jak1/engine/dma/dma-disasm.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
 
 ;; name: dma-disasm.gc
 ;; name in dgo: dma-disasm
diff --git a/goal_src/jak1/engine/dma/dma-h.gc b/goal_src/jak1/engine/dma/dma-h.gc
index bb17e5523..09f808cfc 100644
--- a/goal_src/jak1/engine/dma/dma-h.gc
+++ b/goal_src/jak1/engine/dma/dma-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: dma-h.gc
 ;; name in dgo: dma-h
diff --git a/goal_src/jak1/engine/dma/dma.gc b/goal_src/jak1/engine/dma/dma.gc
index f4111c876..fcbfaba89 100644
--- a/goal_src/jak1/engine/dma/dma.gc
+++ b/goal_src/jak1/engine/dma/dma.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-h.gc")
+(require "engine/ps2/vif-h.gc")
 
 ;; name: dma.gc
 ;; name in dgo: dma
diff --git a/goal_src/jak1/engine/draw/draw-node-h.gc b/goal_src/jak1/engine/draw/draw-node-h.gc
index bca2b7e4e..2062b1588 100644
--- a/goal_src/jak1/engine/draw/draw-node-h.gc
+++ b/goal_src/jak1/engine/draw/draw-node-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: draw-node-h.gc
 ;; name in dgo: draw-node-h
diff --git a/goal_src/jak1/engine/draw/draw-node.gc b/goal_src/jak1/engine/draw/draw-node.gc
index 037fecfe7..dd3fa4188 100644
--- a/goal_src/jak1/engine/draw/draw-node.gc
+++ b/goal_src/jak1/engine/draw/draw-node.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/bsp.gc")
+(require "engine/draw/draw-node-h.gc")
 
 ;; name: draw-node.gc
 ;; name in dgo: draw-node
diff --git a/goal_src/jak1/engine/draw/drawable-actor-h.gc b/goal_src/jak1/engine/draw/drawable-actor-h.gc
index 2239cdcdb..553697f32 100644
--- a/goal_src/jak1/engine/draw/drawable-actor-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-actor-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: drawable-actor-h.gc
 ;; name in dgo: drawable-actor-h
diff --git a/goal_src/jak1/engine/draw/drawable-ambient-h.gc b/goal_src/jak1/engine/draw/drawable-ambient-h.gc
index a2f7a0288..0dba1e81b 100644
--- a/goal_src/jak1/engine/draw/drawable-ambient-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-ambient-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: drawable-ambient-h.gc
 ;; name in dgo: drawable-ambient-h
diff --git a/goal_src/jak1/engine/draw/drawable-group-h.gc b/goal_src/jak1/engine/draw/drawable-group-h.gc
index d090b2bd8..04cab0e29 100644
--- a/goal_src/jak1/engine/draw/drawable-group-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-group-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
 
 ;; name: drawable-group-h.gc
 ;; name in dgo: drawable-group-h
diff --git a/goal_src/jak1/engine/draw/drawable-group.gc b/goal_src/jak1/engine/draw/drawable-group.gc
index 609ba0c29..5844e4400 100644
--- a/goal_src/jak1/engine/draw/drawable-group.gc
+++ b/goal_src/jak1/engine/draw/drawable-group.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable.gc")
 
 ;; name: drawable-group.gc
 ;; name in dgo: drawable-group
diff --git a/goal_src/jak1/engine/draw/drawable-h.gc b/goal_src/jak1/engine/draw/drawable-h.gc
index a55d8195b..eb1c8354d 100644
--- a/goal_src/jak1/engine/draw/drawable-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
 
 ;; name: drawable-h.gc
 ;; name in dgo: drawable-h
diff --git a/goal_src/jak1/engine/draw/drawable-inline-array-h.gc b/goal_src/jak1/engine/draw/drawable-inline-array-h.gc
index 51b743e8e..0983f1cfa 100644
--- a/goal_src/jak1/engine/draw/drawable-inline-array-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-inline-array-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
 
 ;; name: drawable-inline-array-h.gc
 ;; name in dgo: drawable-inline-array-h
diff --git a/goal_src/jak1/engine/draw/drawable-inline-array.gc b/goal_src/jak1/engine/draw/drawable-inline-array.gc
index a85fa0162..7ca14c37c 100644
--- a/goal_src/jak1/engine/draw/drawable-inline-array.gc
+++ b/goal_src/jak1/engine/draw/drawable-inline-array.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: drawable-inline-array.gc
 ;; name in dgo: drawable-inline-array
diff --git a/goal_src/jak1/engine/draw/drawable-tree-h.gc b/goal_src/jak1/engine/draw/drawable-tree-h.gc
index dc175b661..b7963497e 100644
--- a/goal_src/jak1/engine/draw/drawable-tree-h.gc
+++ b/goal_src/jak1/engine/draw/drawable-tree-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-group-h.gc")
 
 ;; name: drawable-tree-h.gc
 ;; name in dgo: drawable-tree-h
diff --git a/goal_src/jak1/engine/draw/drawable-tree.gc b/goal_src/jak1/engine/draw/drawable-tree.gc
index aac915808..0ad503d95 100644
--- a/goal_src/jak1/engine/draw/drawable-tree.gc
+++ b/goal_src/jak1/engine/draw/drawable-tree.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/bsp.gc")
+(require "engine/draw/draw-node-h.gc")
 
 ;; name: drawable-tree.gc
 ;; name in dgo: drawable-tree
diff --git a/goal_src/jak1/engine/draw/drawable.gc b/goal_src/jak1/engine/draw/drawable.gc
index b3a38c5e7..98f83c2df 100644
--- a/goal_src/jak1/engine/draw/drawable.gc
+++ b/goal_src/jak1/engine/draw/drawable.gc
@@ -1,5 +1,15 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/engine/engines.gc")
+(require "engine/gfx/tie/tie-methods.gc")
+(require "engine/level/load-boundary.gc")
+(require "engine/gfx/mood/time-of-day.gc")
+(require "engine/gfx/shadow/shadow-cpu.gc")
+(require "engine/gfx/generic/generic.gc")
+(require "engine/collide/collide-shape.gc")
+(require "engine/gfx/generic/generic-merc.gc")
 
 ;; name: drawable.gc
 ;; name in dgo: drawable
diff --git a/goal_src/jak1/engine/engine/connect.gc b/goal_src/jak1/engine/engine/connect.gc
index a0d28f0e7..8679f9f79 100644
--- a/goal_src/jak1/engine/engine/connect.gc
+++ b/goal_src/jak1/engine/engine/connect.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
 
 ;; name: connect.gc
 ;; name in dgo: connect
diff --git a/goal_src/jak1/engine/engine/engines.gc b/goal_src/jak1/engine/engine/engines.gc
index 9a016c076..91ae57795 100644
--- a/goal_src/jak1/engine/engine/engines.gc
+++ b/goal_src/jak1/engine/engine/engines.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
+(require "engine/engine/connect.gc")
 
 ;; name: engines.gc
 ;; name in dgo: engines
diff --git a/goal_src/jak1/engine/entity/actor-link-h.gc b/goal_src/jak1/engine/entity/actor-link-h.gc
index 266b6d063..a63d41edd 100644
--- a/goal_src/jak1/engine/entity/actor-link-h.gc
+++ b/goal_src/jak1/engine/entity/actor-link-h.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "kernel/gstate.gc")
+(require "engine/entity/entity-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: actor-link-h.gc
 ;; name in dgo: actor-link-h
diff --git a/goal_src/jak1/engine/entity/ambient.gc b/goal_src/jak1/engine/entity/ambient.gc
index daf32a014..1bdac6c99 100644
--- a/goal_src/jak1/engine/entity/ambient.gc
+++ b/goal_src/jak1/engine/entity/ambient.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/bsp.gc")
+(require "engine/ui/text.gc")
+(require "engine/game/task/hint-control.gc")
+(require "engine/game/settings.gc")
 
 ;; name: ambient.gc
 ;; name in dgo: ambient
diff --git a/goal_src/jak1/engine/entity/entity-h.gc b/goal_src/jak1/engine/entity/entity-h.gc
index f473e0b49..3d725cdbd 100644
--- a/goal_src/jak1/engine/entity/entity-h.gc
+++ b/goal_src/jak1/engine/entity/entity-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res-h.gc")
+(require "kernel/gcommon.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: entity-h.gc
 ;; name in dgo: entity-h
diff --git a/goal_src/jak1/engine/entity/entity-table.gc b/goal_src/jak1/engine/entity/entity-table.gc
index 5c20df498..47fd50065 100644
--- a/goal_src/jak1/engine/entity/entity-table.gc
+++ b/goal_src/jak1/engine/entity/entity-table.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/entity-h.gc")
 
 ;; name: entity-table.gc
 ;; name in dgo: entity-table
diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc
index 4dde7a86b..a3cb33073 100644
--- a/goal_src/jak1/engine/entity/entity.gc
+++ b/goal_src/jak1/engine/entity/entity.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/actor-link-h.gc")
+(require "engine/entity/ambient.gc")
+(require "engine/level/level.gc")
+(require "engine/draw/drawable-actor-h.gc")
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/entity/entity-table.gc")
 
 ;; name: entity.gc
 ;; name in dgo: entity
diff --git a/goal_src/jak1/engine/entity/relocate.gc b/goal_src/jak1/engine/entity/relocate.gc
index 761677c17..2fb3340b5 100644
--- a/goal_src/jak1/engine/entity/relocate.gc
+++ b/goal_src/jak1/engine/entity/relocate.gc
@@ -1,5 +1,17 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/anim/aligner-h.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/geometry/vol-h.gc")
+(require "engine/camera/camera-h.gc")
+(require "engine/geometry/path-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/nav/navigate-h.gc")
+(require "engine/data/art-h.gc")
+(require "engine/common-obs/water-h.gc")
 
 ;; name: relocate.gc
 ;; name in dgo: relocate
diff --git a/goal_src/jak1/engine/entity/res-h.gc b/goal_src/jak1/engine/entity/res-h.gc
index 55dce89d2..fb68560f0 100644
--- a/goal_src/jak1/engine/entity/res-h.gc
+++ b/goal_src/jak1/engine/entity/res-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: res-h.gc
 ;; name in dgo: res-h
diff --git a/goal_src/jak1/engine/entity/res.gc b/goal_src/jak1/engine/entity/res.gc
index cb91db446..4db9d0d37 100644
--- a/goal_src/jak1/engine/entity/res.gc
+++ b/goal_src/jak1/engine/entity/res.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/geometry/geometry-h.gc")
+(require "engine/entity/res-h.gc")
+(require "engine/gfx/texture/texture.gc")
 
 ;; name: res.gc
 ;; name in dgo: res
diff --git a/goal_src/jak1/engine/game/effect-control-h.gc b/goal_src/jak1/engine/game/effect-control-h.gc
index b259eb6a7..f77761352 100644
--- a/goal_src/jak1/engine/game/effect-control-h.gc
+++ b/goal_src/jak1/engine/game/effect-control-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: effect-control-h.gc
 ;; name in dgo: effect-control-h
diff --git a/goal_src/jak1/engine/game/effect-control.gc b/goal_src/jak1/engine/game/effect-control.gc
index fbbd96e18..0a6987891 100644
--- a/goal_src/jak1/engine/game/effect-control.gc
+++ b/goal_src/jak1/engine/game/effect-control.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/merc/merc-death.gc")
+(require "engine/common-obs/process-drawable-h.gc")
 
 ;; name: effect-control.gc
 ;; name in dgo: effect-control
diff --git a/goal_src/jak1/engine/game/fact-h.gc b/goal_src/jak1/engine/game/fact-h.gc
index f3e5fc71e..56d4daf97 100644
--- a/goal_src/jak1/engine/game/fact-h.gc
+++ b/goal_src/jak1/engine/game/fact-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "kernel/gstate.gc")
+(require "engine/draw/drawable-h.gc")
 
 ;; name: fact-h.gc
 ;; name in dgo: fact-h
diff --git a/goal_src/jak1/engine/game/game-h.gc b/goal_src/jak1/engine/game/game-h.gc
index a59e24f74..b11b40d64 100644
--- a/goal_src/jak1/engine/game/game-h.gc
+++ b/goal_src/jak1/engine/game/game-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: game-h.gc
 ;; name in dgo: game-h
diff --git a/goal_src/jak1/engine/game/game-info-h.gc b/goal_src/jak1/engine/game/game-info-h.gc
index fc493a69f..1d99cacb8 100644
--- a/goal_src/jak1/engine/game/game-info-h.gc
+++ b/goal_src/jak1/engine/game/game-info-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/util/types-h.gc")
 
 ;; name: game-info-h.gc
 ;; name in dgo: game-info-h
diff --git a/goal_src/jak1/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc
index c4bdd6a66..d4add774d 100644
--- a/goal_src/jak1/engine/game/game-info.gc
+++ b/goal_src/jak1/engine/game/game-info.gc
@@ -1,5 +1,18 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "pc/features/speedruns-h.gc")
+(require "engine/game/task/hint-control-h.gc")
+(require "engine/game/task/task-control-h.gc")
+(require "engine/ui/hud-h.gc")
+(require "engine/game/fact-h.gc")
+(require "engine/camera/cam-interface-h.gc")
+(require "engine/target/target-h.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/game/game-info-h.gc")
 
 ;; name: game-info.gc
 ;; name in dgo: game-info
diff --git a/goal_src/jak1/engine/game/game-save.gc b/goal_src/jak1/engine/game/game-save.gc
index d3a889634..1f4ddd085 100644
--- a/goal_src/jak1/engine/game/game-save.gc
+++ b/goal_src/jak1/engine/game/game-save.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-info.gc")
+(require "engine/ui/text-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/ps2/memcard-h.gc")
+(require "engine/load/loader.gc")
 
 ;; name: game-save.gc
 ;; name in dgo: game-save
diff --git a/goal_src/jak1/engine/game/main-h.gc b/goal_src/jak1/engine/game/main-h.gc
index 2904e2398..5d919a147 100644
--- a/goal_src/jak1/engine/game/main-h.gc
+++ b/goal_src/jak1/engine/game/main-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: main-h.gc
 ;; name in dgo: main-h
diff --git a/goal_src/jak1/engine/game/main.gc b/goal_src/jak1/engine/game/main.gc
index bcddabfa0..e2e6300c1 100644
--- a/goal_src/jak1/engine/game/main.gc
+++ b/goal_src/jak1/engine/game/main.gc
@@ -1,5 +1,15 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/ambient.gc")
+(require "pc/debug/pc-debug-methods.gc")
+(require "engine/draw/drawable.gc")
+(require "engine/gfx/depth-cue.gc")
+(require "engine/camera/cam-interface.gc")
+(require "engine/camera/cam-update.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "pc/pckernel.gc")
 
 ;; name: main.gc
 ;; name in dgo: main
diff --git a/goal_src/jak1/engine/game/powerups.gc b/goal_src/jak1/engine/game/powerups.gc
index 84bc6b7dd..330d45dde 100644
--- a/goal_src/jak1/engine/game/powerups.gc
+++ b/goal_src/jak1/engine/game/powerups.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/mood/weather-part.gc")
+(require "engine/common-obs/water.gc")
+(require "engine/target/target-util.gc")
 
 ;; name: powerups.gc
 ;; name in dgo: powerups
diff --git a/goal_src/jak1/engine/game/projectiles-h.gc b/goal_src/jak1/engine/game/projectiles-h.gc
index b41e4cd95..d957f088d 100644
--- a/goal_src/jak1/engine/game/projectiles-h.gc
+++ b/goal_src/jak1/engine/game/projectiles-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: projectiles-h.gc
 ;; name in dgo: projectiles-h
diff --git a/goal_src/jak1/engine/game/projectiles.gc b/goal_src/jak1/engine/game/projectiles.gc
index 9827c5e06..fcbee89b2 100644
--- a/goal_src/jak1/engine/game/projectiles.gc
+++ b/goal_src/jak1/engine/game/projectiles.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/projectiles-h.gc")
+(require "engine/common-obs/water-h.gc")
+(require "engine/target/target-util.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: projectiles.gc
 ;; name in dgo: projectiles
diff --git a/goal_src/jak1/engine/game/settings-h.gc b/goal_src/jak1/engine/game/settings-h.gc
index 5bb88502a..b371f3f67 100644
--- a/goal_src/jak1/engine/game/settings-h.gc
+++ b/goal_src/jak1/engine/game/settings-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
+(require "engine/engine/connect.gc")
 
 ;; name: settings-h.gc
 ;; name in dgo: settings-h
diff --git a/goal_src/jak1/engine/game/settings.gc b/goal_src/jak1/engine/game/settings.gc
index 15177de7e..120251b42 100644
--- a/goal_src/jak1/engine/game/settings.gc
+++ b/goal_src/jak1/engine/game/settings.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ps2/pad.gc")
+(require "engine/gfx/ocean/ocean-h.gc")
 
 ;; name: settings.gc
 ;; name in dgo: settings
diff --git a/goal_src/jak1/engine/game/task/game-task-h.gc b/goal_src/jak1/engine/game/task/game-task-h.gc
index a13126121..17b2955a3 100644
--- a/goal_src/jak1/engine/game/task/game-task-h.gc
+++ b/goal_src/jak1/engine/game/task/game-task-h.gc
@@ -1,5 +1,7 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
 
 ;; name: game-task-h.gc
 ;; name in dgo: game-task-h
diff --git a/goal_src/jak1/engine/game/task/hint-control-h.gc b/goal_src/jak1/engine/game/task/hint-control-h.gc
index 2c1bc596f..b332f9493 100644
--- a/goal_src/jak1/engine/game/task/hint-control-h.gc
+++ b/goal_src/jak1/engine/game/task/hint-control-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: hint-control-h.gc
 ;; name in dgo: hint-control-h
diff --git a/goal_src/jak1/engine/game/task/hint-control.gc b/goal_src/jak1/engine/game/task/hint-control.gc
index 4b59e4a23..bf2bf0009 100644
--- a/goal_src/jak1/engine/game/task/hint-control.gc
+++ b/goal_src/jak1/engine/game/task/hint-control.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/task/game-task-h.gc")
+(require "engine/game/game-info.gc")
+(require "engine/draw/drawable-ambient-h.gc")
+(require "engine/ui/text-h.gc")
 
 ;; name: hint-control.gc
 ;; name in dgo: hint-control
diff --git a/goal_src/jak1/engine/game/task/task-control-h.gc b/goal_src/jak1/engine/game/task/task-control-h.gc
index d7df66eab..1f2fdd73d 100644
--- a/goal_src/jak1/engine/game/task/task-control-h.gc
+++ b/goal_src/jak1/engine/game/task/task-control-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: task-control-h.gc
 ;; name in dgo: task-control-h
diff --git a/goal_src/jak1/engine/game/task/task-control.gc b/goal_src/jak1/engine/game/task/task-control.gc
index 8e27361dc..ac0d10ab6 100644
--- a/goal_src/jak1/engine/game/task/task-control.gc
+++ b/goal_src/jak1/engine/game/task/task-control.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-info.gc")
+(require "engine/game/task/game-task-h.gc")
 
 ;; name: task-control.gc
 ;; name in dgo: task-control
diff --git a/goal_src/jak1/engine/geometry/bounding-box-h.gc b/goal_src/jak1/engine/geometry/bounding-box-h.gc
index 47e2f76b9..6286fa1b0 100644
--- a/goal_src/jak1/engine/geometry/bounding-box-h.gc
+++ b/goal_src/jak1/engine/geometry/bounding-box-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: bounding-box-h.gc
 ;; name in dgo: bounding-box-h
diff --git a/goal_src/jak1/engine/geometry/bounding-box.gc b/goal_src/jak1/engine/geometry/bounding-box.gc
index cff6a25a7..243d9f22b 100644
--- a/goal_src/jak1/engine/geometry/bounding-box.gc
+++ b/goal_src/jak1/engine/geometry/bounding-box.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/geometry/bounding-box-h.gc")
 
 ;; name: bounding-box.gc
 ;; name in dgo: bounding-box
diff --git a/goal_src/jak1/engine/geometry/cylinder.gc b/goal_src/jak1/engine/geometry/cylinder.gc
index 246ca2fee..9347bf9d1 100644
--- a/goal_src/jak1/engine/geometry/cylinder.gc
+++ b/goal_src/jak1/engine/geometry/cylinder.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-func.gc")
+(require "engine/camera/cam-debug-h.gc")
+(require "engine/math/matrix.gc")
 
 ;; name: cylinder.gc
 ;; name in dgo: cylinder
diff --git a/goal_src/jak1/engine/geometry/geometry-h.gc b/goal_src/jak1/engine/geometry/geometry-h.gc
index 172d54219..d65a39ce3 100644
--- a/goal_src/jak1/engine/geometry/geometry-h.gc
+++ b/goal_src/jak1/engine/geometry/geometry-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: geometry-h.gc
 ;; name in dgo: geometry-h
diff --git a/goal_src/jak1/engine/geometry/geometry.gc b/goal_src/jak1/engine/geometry/geometry.gc
index ed89f62e3..191e81f5d 100644
--- a/goal_src/jak1/engine/geometry/geometry.gc
+++ b/goal_src/jak1/engine/geometry/geometry.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/geometry/geometry-h.gc")
+(require "engine/math/quaternion.gc")
+(require "engine/gfx/font.gc")
 
 ;; name: geometry.gc
 ;; name in dgo: geometry
diff --git a/goal_src/jak1/engine/geometry/path-h.gc b/goal_src/jak1/engine/geometry/path-h.gc
index 5344e0e6b..73fe95a4e 100644
--- a/goal_src/jak1/engine/geometry/path-h.gc
+++ b/goal_src/jak1/engine/geometry/path-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
+(require "engine/game/main-h.gc")
+(require "engine/entity/actor-link-h.gc")
 
 ;; name: path-h.gc
 ;; name in dgo: path-h
diff --git a/goal_src/jak1/engine/geometry/path.gc b/goal_src/jak1/engine/geometry/path.gc
index 41f142818..6081403bc 100644
--- a/goal_src/jak1/engine/geometry/path.gc
+++ b/goal_src/jak1/engine/geometry/path.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/geometry/path-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/debug/assert.gc")
 
 ;; name: path.gc
 ;; name in dgo: path
diff --git a/goal_src/jak1/engine/geometry/vol-h.gc b/goal_src/jak1/engine/geometry/vol-h.gc
index 72010dc21..1c58fe3a6 100644
--- a/goal_src/jak1/engine/geometry/vol-h.gc
+++ b/goal_src/jak1/engine/geometry/vol-h.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "kernel/gstate.gc")
+(require "engine/draw/drawable-h.gc")
+(require "engine/game/main-h.gc")
+(require "engine/entity/entity-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: vol-h.gc
 ;; name in dgo: vol-h
diff --git a/goal_src/jak1/engine/geometry/vol.gc b/goal_src/jak1/engine/geometry/vol.gc
index 840f49a47..14e2288f2 100644
--- a/goal_src/jak1/engine/geometry/vol.gc
+++ b/goal_src/jak1/engine/geometry/vol.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/debug/debug-h.gc")
+(require "engine/geometry/vol-h.gc")
+(require "engine/geometry/cylinder.gc")
 
 ;; name: vol.gc
 ;; name in dgo: vol
diff --git a/goal_src/jak1/engine/gfx/background/background-h.gc b/goal_src/jak1/engine/gfx/background/background-h.gc
index 59e49ecae..befa5cd82 100644
--- a/goal_src/jak1/engine/gfx/background/background-h.gc
+++ b/goal_src/jak1/engine/gfx/background/background-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: background-h.gc
 ;; name in dgo: background-h
diff --git a/goal_src/jak1/engine/gfx/background/background.gc b/goal_src/jak1/engine/gfx/background/background.gc
index 19f71624a..c0fdf00b2 100644
--- a/goal_src/jak1/engine/gfx/background/background.gc
+++ b/goal_src/jak1/engine/gfx/background/background.gc
@@ -1,5 +1,16 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/tie/generic-tie-h.gc")
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/gfx/background/background-h.gc")
+(require "engine/gfx/tfrag/tfrag-h.gc")
+(require "engine/gfx/background/subdivide-h.gc")
+(require "engine/gfx/shrub/shrubbery-h.gc")
+(require "engine/ps2/vu1-macros.gc")
 
 ;; name: background.gc
 ;; name in dgo: background
diff --git a/goal_src/jak1/engine/gfx/background/prototype-h.gc b/goal_src/jak1/engine/gfx/background/prototype-h.gc
index 72118e853..2cf7eb9bf 100644
--- a/goal_src/jak1/engine/gfx/background/prototype-h.gc
+++ b/goal_src/jak1/engine/gfx/background/prototype-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
 
 ;; name: prototype-h.gc
 ;; name in dgo: prototype-h
diff --git a/goal_src/jak1/engine/gfx/background/prototype.gc b/goal_src/jak1/engine/gfx/background/prototype.gc
index be81fb581..134aa2140 100644
--- a/goal_src/jak1/engine/gfx/background/prototype.gc
+++ b/goal_src/jak1/engine/gfx/background/prototype.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-frag.gc")
+(require "engine/draw/drawable.gc")
 
 ;; name: prototype.gc
 ;; name in dgo: prototype
diff --git a/goal_src/jak1/engine/gfx/background/subdivide-h.gc b/goal_src/jak1/engine/gfx/background/subdivide-h.gc
index c6fe7c506..ff9497ff8 100644
--- a/goal_src/jak1/engine/gfx/background/subdivide-h.gc
+++ b/goal_src/jak1/engine/gfx/background/subdivide-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/bsp-h.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: subdivide-h.gc
 ;; name in dgo: subdivide-h
diff --git a/goal_src/jak1/engine/gfx/background/subdivide.gc b/goal_src/jak1/engine/gfx/background/subdivide.gc
index 8a012bffe..561e2850f 100644
--- a/goal_src/jak1/engine/gfx/background/subdivide.gc
+++ b/goal_src/jak1/engine/gfx/background/subdivide.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/tfrag/tfrag-h.gc")
+(require "engine/debug/stats-h.gc")
+(require "engine/gfx/background/subdivide-h.gc")
 
 ;; name: subdivide.gc
 ;; name in dgo: subdivide
diff --git a/goal_src/jak1/engine/gfx/background/wind-h.gc b/goal_src/jak1/engine/gfx/background/wind-h.gc
index cfdb40a9d..73e1ee5c3 100644
--- a/goal_src/jak1/engine/gfx/background/wind-h.gc
+++ b/goal_src/jak1/engine/gfx/background/wind-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: wind-h.gc
 ;; name in dgo: wind-h
diff --git a/goal_src/jak1/engine/gfx/background/wind.gc b/goal_src/jak1/engine/gfx/background/wind.gc
index 9e0884023..bd7920290 100644
--- a/goal_src/jak1/engine/gfx/background/wind.gc
+++ b/goal_src/jak1/engine/gfx/background/wind.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/wind-h.gc")
+(require "engine/gfx/hw/display-h.gc")
 
 ;; name: wind.gc
 ;; name in dgo: wind
diff --git a/goal_src/jak1/engine/gfx/depth-cue-h.gc b/goal_src/jak1/engine/gfx/depth-cue-h.gc
index c7748f614..a6d99ed2c 100644
--- a/goal_src/jak1/engine/gfx/depth-cue-h.gc
+++ b/goal_src/jak1/engine/gfx/depth-cue-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: depth-cue-h.gc
 ;; name in dgo: depth-cue-h
diff --git a/goal_src/jak1/engine/gfx/depth-cue.gc b/goal_src/jak1/engine/gfx/depth-cue.gc
index 302bfd6d0..e555b9980 100644
--- a/goal_src/jak1/engine/gfx/depth-cue.gc
+++ b/goal_src/jak1/engine/gfx/depth-cue.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/depth-cue-h.gc")
 
 ;; name: depth-cue.gc
 ;; name in dgo: depth-cue
diff --git a/goal_src/jak1/engine/gfx/font-h.gc b/goal_src/jak1/engine/gfx/font-h.gc
index ed24198e5..9539dbb24 100644
--- a/goal_src/jak1/engine/gfx/font-h.gc
+++ b/goal_src/jak1/engine/gfx/font-h.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/math/matrix-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/math-camera-h.gc")
+(require "engine/gfx/hw/gs.gc")
 
 ;; name: font-h.gc
 ;; name in dgo: font-h
diff --git a/goal_src/jak1/engine/gfx/font.gc b/goal_src/jak1/engine/gfx/font.gc
index 6e4c5a6b9..d02a8ee92 100644
--- a/goal_src/jak1/engine/gfx/font.gc
+++ b/goal_src/jak1/engine/gfx/font.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/font-h.gc")
+(require "engine/ps2/vu1-macros.gc")
 
 ;; name: font.gc
 ;; name in dgo: font
diff --git a/goal_src/jak1/engine/gfx/foreground/bones-h.gc b/goal_src/jak1/engine/gfx/foreground/bones-h.gc
index d5d03793f..e44a8add4 100644
--- a/goal_src/jak1/engine/gfx/foreground/bones-h.gc
+++ b/goal_src/jak1/engine/gfx/foreground/bones-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/shadow/shadow-cpu-h.gc")
 
 ;; name: bones-h.gc
 ;; name in dgo: bones-h
diff --git a/goal_src/jak1/engine/gfx/foreground/bones.gc b/goal_src/jak1/engine/gfx/foreground/bones.gc
index 6c36dc9f0..937a2a00d 100644
--- a/goal_src/jak1/engine/gfx/foreground/bones.gc
+++ b/goal_src/jak1/engine/gfx/foreground/bones.gc
@@ -1,5 +1,18 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/subdivide.gc")
+(require "engine/gfx/foreground/bones-h.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/gfx/font.gc")
+(require "engine/gfx/merc/generic-merc-h.gc")
+(require "engine/gfx/lights-h.gc")
+(require "engine/gfx/merc/merc.gc")
+(require "kernel/gstate.gc")
+(require "engine/gfx/foreground/ripple.gc")
+(require "engine/anim/mspace-h.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: bones.gc
 ;; name in dgo: bones
diff --git a/goal_src/jak1/engine/gfx/foreground/eye-h.gc b/goal_src/jak1/engine/gfx/foreground/eye-h.gc
index d3301bd5f..d2b6387b6 100644
--- a/goal_src/jak1/engine/gfx/foreground/eye-h.gc
+++ b/goal_src/jak1/engine/gfx/foreground/eye-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
 
 ;; name: eye-h.gc
 ;; name in dgo: eye-h
diff --git a/goal_src/jak1/engine/gfx/foreground/eye.gc b/goal_src/jak1/engine/gfx/foreground/eye.gc
index 45d0b4248..a3b803ded 100644
--- a/goal_src/jak1/engine/gfx/foreground/eye.gc
+++ b/goal_src/jak1/engine/gfx/foreground/eye.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/foreground/eye-h.gc")
+(require "engine/ps2/vu1-macros.gc")
+(require "engine/math/vector.gc")
 
 ;; name: eye.gc
 ;; name in dgo: eye
diff --git a/goal_src/jak1/engine/gfx/foreground/ripple.gc b/goal_src/jak1/engine/gfx/foreground/ripple.gc
index 5e0a3fd69..4404e577b 100644
--- a/goal_src/jak1/engine/gfx/foreground/ripple.gc
+++ b/goal_src/jak1/engine/gfx/foreground/ripple.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/math/quaternion.gc")
+(require "engine/gfx/merc/merc-h.gc")
+(require "kernel/gkernel-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: ripple.gc
 ;; name in dgo: ripple
diff --git a/goal_src/jak1/engine/gfx/generic/generic-effect.gc b/goal_src/jak1/engine/gfx/generic/generic-effect.gc
index b11f10998..a23dea4ef 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-effect.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-effect.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/lights-h.gc")
+(require "engine/gfx/generic/generic-vu0.gc")
+(require "engine/gfx/texture/texture.gc")
+(require "engine/gfx/background/subdivide-h.gc")
+(require "engine/gfx/generic/generic-h.gc")
 
 ;; name: generic-effect.gc
 ;; name in dgo: generic-effect
diff --git a/goal_src/jak1/engine/gfx/generic/generic-h.gc b/goal_src/jak1/engine/gfx/generic/generic-h.gc
index 532ab3056..b099f5fe0 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-h.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: generic-h.gc
 ;; name in dgo: generic-h
diff --git a/goal_src/jak1/engine/gfx/generic/generic-merc.gc b/goal_src/jak1/engine/gfx/generic/generic-merc.gc
index 6138d4181..f3ee428ca 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-merc.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-merc.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/lights.gc")
+(require "engine/gfx/generic/generic-effect.gc")
+(require "engine/gfx/foreground/bones.gc")
 
 ;; name: generic-merc.gc
 ;; name in dgo: generic-merc
diff --git a/goal_src/jak1/engine/gfx/generic/generic-tie.gc b/goal_src/jak1/engine/gfx/generic/generic-tie.gc
index 471da2539..efd31d5f2 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-tie.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-tie.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/subdivide.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/gfx/lights.gc")
+(require "engine/gfx/generic/generic-effect.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: generic-tie.gc
 ;; name in dgo: generic-tie
diff --git a/goal_src/jak1/engine/gfx/generic/generic-vu0.gc b/goal_src/jak1/engine/gfx/generic/generic-vu0.gc
index 655117d45..08e6553c4 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-vu0.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-vu0.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: generic-vu0.gc
 ;; name in dgo: generic-vu0
diff --git a/goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc b/goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc
index e6643edb1..11a7c7480 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: generic-vu1-h.gc
 ;; name in dgo: generic-vu1-h
diff --git a/goal_src/jak1/engine/gfx/generic/generic-vu1.gc b/goal_src/jak1/engine/gfx/generic/generic-vu1.gc
index 21a68b51c..e1fee0a19 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-vu1.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-vu1.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/generic/generic-vu1-h.gc")
+(require "engine/gfx/vu1-user-h.gc")
+(require "engine/gfx/math-camera-h.gc")
+(require "engine/gfx/hw/gs.gc")
 
 ;; name: generic-vu1.gc
 ;; name in dgo: generic-vu1
diff --git a/goal_src/jak1/engine/gfx/generic/generic-work-h.gc b/goal_src/jak1/engine/gfx/generic/generic-work-h.gc
index b9154ad13..5eaae834f 100644
--- a/goal_src/jak1/engine/gfx/generic/generic-work-h.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic-work-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: generic-work-h.gc
 ;; name in dgo: generic-work-h
diff --git a/goal_src/jak1/engine/gfx/generic/generic.gc b/goal_src/jak1/engine/gfx/generic/generic.gc
index 3304ea7f3..71c7d48f4 100644
--- a/goal_src/jak1/engine/gfx/generic/generic.gc
+++ b/goal_src/jak1/engine/gfx/generic/generic.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/level-h.gc")
+(require "engine/dma/dma-bucket.gc")
+(require "engine/gfx/lights.gc")
 
 ;; name: generic.gc
 ;; name in dgo: generic
diff --git a/goal_src/jak1/engine/gfx/hw/display-h.gc b/goal_src/jak1/engine/gfx/hw/display-h.gc
index 017f04cde..04bad5d98 100644
--- a/goal_src/jak1/engine/gfx/hw/display-h.gc
+++ b/goal_src/jak1/engine/gfx/hw/display-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/gs.gc")
+(require "engine/ps2/timer-h.gc")
 
 ;; name: display-h.gc
 ;; name in dgo: display-h
diff --git a/goal_src/jak1/engine/gfx/hw/display.gc b/goal_src/jak1/engine/gfx/hw/display.gc
index 36ed4cfdb..580eae68f 100644
--- a/goal_src/jak1/engine/gfx/hw/display.gc
+++ b/goal_src/jak1/engine/gfx/hw/display.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "pc/pckernel-impl.gc")
+(require "engine/ps2/timer.gc")
 
 ;; name: display.gc
 ;; name in dgo: display
diff --git a/goal_src/jak1/engine/gfx/hw/gs.gc b/goal_src/jak1/engine/gfx/hw/gs.gc
index 972ebbaf6..b101f60a4 100644
--- a/goal_src/jak1/engine/gfx/hw/gs.gc
+++ b/goal_src/jak1/engine/gfx/hw/gs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
+(require "engine/gfx/hw/video-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: gs.gc
 ;; name in dgo: gs
@@ -751,6 +756,65 @@
     )
   )
 
+(defmacro dma-buffer-add-gs-set-flusha (buf &rest reg-list)
+  "Add a gif cnt dma packet to a dma-buffer for setting GS registers. Up to 16 can be set at once.
+   The packet runs the flusha command which waits for GIF transfer to end and VU1 microprogram to stop.
+   reg-list is a list of pairs where the car is the register name and the cadr is the value to be set for that register."
+
+  (let ((reg-count (length reg-list))
+        (qwc (+ (length reg-list) 1))
+        (reg-names (apply first reg-list))
+        (reg-datas (apply second reg-list))
+        )
+    `(begin
+      ;; dma tag
+      (dma-buffer-add-cnt-vif2 ,buf ,qwc
+                              (new 'static 'vif-tag :cmd (vif-cmd flusha))
+                              (new 'static 'vif-tag :cmd (vif-cmd direct) :imm ,qwc)
+                              )
+
+      ;; gif tag for editing gs regs
+      (dma-buffer-add-gif-tag ,buf (new 'static 'gif-tag64 :nloop 1 :eop 1 :nreg ,reg-count)
+                                   (gs-reg-list a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d)
+                                   )
+
+      ;; gs regs
+      (dma-buffer-add-uint64 ,buf
+          ,@(apply2 (lambda (x) x) (lambda (x) `(gs-reg64 ,x)) reg-datas reg-names)
+          )
+      )
+    )
+  )
+
+(defmacro dma-buffer-add-gs-set (buf &rest reg-list)
+  "Add a gif cnt dma packet to a dma-buffer for setting GS registers. Up to 16 can be set at once.
+   reg-list is a list of pairs where the car is the register name and the cadr is the value to be set for that register."
+
+  (let ((reg-count (length reg-list))
+        (qwc (+ (length reg-list) 1))
+        (reg-names (apply first reg-list))
+        (reg-datas (apply second reg-list))
+        )
+    `(begin
+      ;; dma tag
+      (dma-buffer-add-cnt-vif2 ,buf ,qwc
+                              (new 'static 'vif-tag :cmd (vif-cmd nop))
+                              (new 'static 'vif-tag :cmd (vif-cmd direct) :imm ,qwc)
+                              )
+
+      ;; gif tag for editing gs regs
+      (dma-buffer-add-gif-tag ,buf (new 'static 'gif-tag64 :nloop 1 :eop 1 :nreg ,reg-count)
+                                   (gs-reg-list a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d a+d)
+                                   )
+
+      ;; gs regs
+      (dma-buffer-add-uint64 ,buf
+          ,@(apply2 (lambda (x) x) (lambda (x) `(gs-reg64 ,x)) reg-datas reg-names)
+          )
+      )
+    )
+  )
+
 (deftype gs-gif-tag (structure)
   ((qword uint128   :offset-assert 0) ;; is "qword" and inline? in game
    (tag   gif-tag64      :offset 0)
diff --git a/goal_src/jak1/engine/gfx/hw/video-h.gc b/goal_src/jak1/engine/gfx/hw/video-h.gc
index 3d2cc525f..72e9ccc48 100644
--- a/goal_src/jak1/engine/gfx/hw/video-h.gc
+++ b/goal_src/jak1/engine/gfx/hw/video-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: video-h.gc
 ;; name in dgo: video-h
diff --git a/goal_src/jak1/engine/gfx/hw/video.gc b/goal_src/jak1/engine/gfx/hw/video.gc
index 36db2f05b..c21d174f0 100644
--- a/goal_src/jak1/engine/gfx/hw/video.gc
+++ b/goal_src/jak1/engine/gfx/hw/video.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/shadow/shadow-cpu.gc")
 
 ;; name: video.gc
 ;; name in dgo: video
diff --git a/goal_src/jak1/engine/gfx/lights-h.gc b/goal_src/jak1/engine/gfx/lights-h.gc
index ea6a7c9e5..109239395 100644
--- a/goal_src/jak1/engine/gfx/lights-h.gc
+++ b/goal_src/jak1/engine/gfx/lights-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: lights-h.gc
 ;; name in dgo: lights-h
diff --git a/goal_src/jak1/engine/gfx/lights.gc b/goal_src/jak1/engine/gfx/lights.gc
index 945386ab0..b6a9cdd4a 100644
--- a/goal_src/jak1/engine/gfx/lights.gc
+++ b/goal_src/jak1/engine/gfx/lights.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/lights-h.gc")
+(require "engine/gfx/foreground/bones-h.gc")
+(require "engine/geometry/geometry.gc")
+(require "engine/math/vector.gc")
 
 ;; name: lights.gc
 ;; name in dgo: lights
diff --git a/goal_src/jak1/engine/gfx/math-camera-h.gc b/goal_src/jak1/engine/gfx/math-camera-h.gc
index a8c59ce41..c4df535e5 100644
--- a/goal_src/jak1/engine/gfx/math-camera-h.gc
+++ b/goal_src/jak1/engine/gfx/math-camera-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: math-camera-h.gc
 ;; name in dgo: math-camera-h
diff --git a/goal_src/jak1/engine/gfx/math-camera.gc b/goal_src/jak1/engine/gfx/math-camera.gc
index 96b4e7d04..6470334a9 100644
--- a/goal_src/jak1/engine/gfx/math-camera.gc
+++ b/goal_src/jak1/engine/gfx/math-camera.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/quaternion-h.gc")
+(require "pc/pckernel-impl.gc")
+(require "engine/ps2/vu1-macros.gc")
+(require "engine/math/trigonometry.gc")
+(require "engine/math/transform-h.gc")
 
 ;; name: math-camera.gc
 ;; name in dgo: math-camera
diff --git a/goal_src/jak1/engine/gfx/merc/generic-merc-h.gc b/goal_src/jak1/engine/gfx/merc/generic-merc-h.gc
index 27c8d7dcc..1ca2ee3f8 100644
--- a/goal_src/jak1/engine/gfx/merc/generic-merc-h.gc
+++ b/goal_src/jak1/engine/gfx/merc/generic-merc-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
 
 ;; name: generic-merc-h.gc
 ;; name in dgo: generic-merc-h
diff --git a/goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc b/goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc
index 9701b012a..446449e81 100644
--- a/goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc
+++ b/goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/gfx/merc/merc-h.gc")
+(require "kernel/gkernel-h.gc")
+(require "kernel/gstring-h.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: merc-blend-shape.gc
 ;; name in dgo: merc-blend-shape
diff --git a/goal_src/jak1/engine/gfx/merc/merc-death.gc b/goal_src/jak1/engine/gfx/merc/merc-death.gc
index 2bedf3fe6..960a2875f 100644
--- a/goal_src/jak1/engine/gfx/merc/merc-death.gc
+++ b/goal_src/jak1/engine/gfx/merc/merc-death.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
 
 ;; name: merc-death.gc
 ;; name in dgo: merc-death
diff --git a/goal_src/jak1/engine/gfx/merc/merc-h.gc b/goal_src/jak1/engine/gfx/merc/merc-h.gc
index 5a5fa6eaf..02e2307fd 100644
--- a/goal_src/jak1/engine/gfx/merc/merc-h.gc
+++ b/goal_src/jak1/engine/gfx/merc/merc-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/data/art-h.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: merc-h.gc
 ;; name in dgo: merc-h
diff --git a/goal_src/jak1/engine/gfx/merc/merc-vu1.gc b/goal_src/jak1/engine/gfx/merc/merc-vu1.gc
index 9b04410b9..c2d74ec5c 100644
--- a/goal_src/jak1/engine/gfx/merc/merc-vu1.gc
+++ b/goal_src/jak1/engine/gfx/merc/merc-vu1.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: merc-vu1.gc
 ;; name in dgo: merc-vu1
diff --git a/goal_src/jak1/engine/gfx/merc/merc.gc b/goal_src/jak1/engine/gfx/merc/merc.gc
index d74194b47..1a040213e 100644
--- a/goal_src/jak1/engine/gfx/merc/merc.gc
+++ b/goal_src/jak1/engine/gfx/merc/merc.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "engine/gfx/merc/merc-h.gc")
+(require "engine/gfx/merc/merc-vu1.gc")
+(require "engine/gfx/foreground/eye-h.gc")
 
 ;; name: merc.gc
 ;; name in dgo: merc
diff --git a/goal_src/jak1/engine/gfx/mood/mood-h.gc b/goal_src/jak1/engine/gfx/mood/mood-h.gc
index 3d8b87f0c..2e61f7327 100644
--- a/goal_src/jak1/engine/gfx/mood/mood-h.gc
+++ b/goal_src/jak1/engine/gfx/mood/mood-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: mood-h.gc
 ;; name in dgo: mood-h
diff --git a/goal_src/jak1/engine/gfx/mood/mood-tables.gc b/goal_src/jak1/engine/gfx/mood/mood-tables.gc
index d616bf641..995dd0c11 100644
--- a/goal_src/jak1/engine/gfx/mood/mood-tables.gc
+++ b/goal_src/jak1/engine/gfx/mood/mood-tables.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/lights-h.gc")
+(require "engine/gfx/ocean/ocean-tables.gc")
+(require "engine/math/matrix.gc")
+(require "engine/gfx/sky/sky-h.gc")
+(require "engine/math/vector.gc")
+(require "engine/gfx/mood/mood-h.gc")
 
 ;; name: mood-tables.gc
 ;; name in dgo: mood-tables
diff --git a/goal_src/jak1/engine/gfx/mood/mood.gc b/goal_src/jak1/engine/gfx/mood/mood.gc
index e60018bd1..790aaf12a 100644
--- a/goal_src/jak1/engine/gfx/mood/mood.gc
+++ b/goal_src/jak1/engine/gfx/mood/mood.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-info.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/gfx/foreground/bones-h.gc")
+(require "engine/gfx/mood/mood-tables.gc")
 
 ;; name: mood.gc
 ;; name in dgo: mood
diff --git a/goal_src/jak1/engine/gfx/mood/time-of-day-h.gc b/goal_src/jak1/engine/gfx/mood/time-of-day-h.gc
index 75629fc28..903a17166 100644
--- a/goal_src/jak1/engine/gfx/mood/time-of-day-h.gc
+++ b/goal_src/jak1/engine/gfx/mood/time-of-day-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: time-of-day-h.gc
 ;; name in dgo: time-of-day-h
diff --git a/goal_src/jak1/engine/gfx/mood/time-of-day.gc b/goal_src/jak1/engine/gfx/mood/time-of-day.gc
index fe1d167c3..1e31dc4e4 100644
--- a/goal_src/jak1/engine/gfx/mood/time-of-day.gc
+++ b/goal_src/jak1/engine/gfx/mood/time-of-day.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/gfx/mood/mood.gc")
 
 ;; name: time-of-day.gc
 ;; name in dgo: time-of-day
diff --git a/goal_src/jak1/engine/gfx/mood/weather-part.gc b/goal_src/jak1/engine/gfx/mood/weather-part.gc
index babb811d8..869e5f99d 100644
--- a/goal_src/jak1/engine/gfx/mood/weather-part.gc
+++ b/goal_src/jak1/engine/gfx/mood/weather-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/cam-interface-h.gc")
+(require "engine/gfx/sky/sky-h.gc")
+(require "engine/target/target-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
 
 ;; name: weather-part.gc
 ;; name in dgo: weather-part
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-frames.gc b/goal_src/jak1/engine/gfx/ocean/ocean-frames.gc
index b6121cc4b..09e360e13 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-frames.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-frames.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: ocean-frames.gc
 ;; name in dgo: ocean-frames
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-h.gc b/goal_src/jak1/engine/gfx/ocean/ocean-h.gc
index aae532856..ec1c0dd38 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-h.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: ocean-h.gc
 ;; name in dgo: ocean-h
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
index faef014b4..31b614efc 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean.gc")
+(require "kernel/gstate.gc")
+(require "engine/debug/debug.gc")
+(require "engine/gfx/ocean/ocean-trans-tables.gc")
 
 ;; name: ocean-mid.gc
 ;; name in dgo: ocean-mid
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-near.gc b/goal_src/jak1/engine/gfx/ocean/ocean-near.gc
index d179872e1..c8eeae95b 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-near.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-near.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-transition.gc")
 
 ;; name: ocean-near.gc
 ;; name in dgo: ocean-near
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-tables.gc b/goal_src/jak1/engine/gfx/ocean/ocean-tables.gc
index fa7cc511b..22cd9fba3 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-tables.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-tables.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-h.gc")
+(require "engine/math/vector-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: ocean-tables.gc
 ;; name in dgo: ocean-tables
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-texture.gc b/goal_src/jak1/engine/gfx/ocean/ocean-texture.gc
index 932842099..01613fbcd 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-texture.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-texture.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-h.gc")
+(require "engine/gfx/hw/display.gc")
 
 ;; name: ocean-texture.gc
 ;; name in dgo: ocean-texture
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc b/goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc
index a6c0f0540..f88dc9550 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+
 
 ;; og:ignore-from-loc
 
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-transition.gc b/goal_src/jak1/engine/gfx/ocean/ocean-transition.gc
index bb82f1bec..87533cc73 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-transition.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-transition.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-mid.gc")
+(require "engine/collide/collide-frag-h.gc")
 
 ;; name: ocean-transition.gc
 ;; name in dgo: ocean-transition
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc b/goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc
index 471ebf3ad..f3bff6980 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-h.gc")
+(require "kernel/gkernel-h.gc")
+(require "engine/math/vector-h.gc")
 
 ;; name: ocean-vu0.gc
 ;; name in dgo: ocean-vu0
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean.gc b/goal_src/jak1/engine/gfx/ocean/ocean.gc
index ea4a537d1..31fdd27cf 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/ocean/ocean-tables.gc")
+(require "engine/gfx/background/subdivide-h.gc")
+(require "engine/gfx/sky/sky-tng.gc")
+(require "engine/camera/cam-interface-h.gc")
 
 ;; name: ocean.gc
 ;; name in dgo: ocean
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
index 8fbbf3851..7eb279b76 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/data/art-h.gc")
 
 ;; name: shadow-cpu-h.gc
 ;; name in dgo: shadow-cpu-h
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc b/goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc
index 21b921fd1..febceb5b4 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/foreground/bones-h.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/gfx/shadow/shadow-vu1-h.gc")
+(require "engine/collide/collide-mesh-h.gc")
+(require "engine/gfx/generic/generic-h.gc")
+(require "engine/collide/pat-h.gc")
 
 ;; name: shadow-cpu.gc
 ;; name in dgo: shadow-cpu
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-h.gc
index 2067fc74f..1064d91c1 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-h.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: shadow-h.gc
 ;; name in dgo: shadow-h
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc
index 7227b72a6..d8e59be62 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: shadow-vu1-h.gc
 ;; name in dgo: shadow-vu1-h
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc b/goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc
index b60b6d4ce..9262f0788 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/shadow/shadow-cpu.gc")
 
 ;; name: shadow-vu1.gc
 ;; name in dgo: shadow-vu1
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow.gc b/goal_src/jak1/engine/gfx/shadow/shadow.gc
index 1ceaa5cb5..95d942beb 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/physics/dynamics-h.gc")
+(require "engine/collide/collide-cache.gc")
+(require "engine/gfx/shadow/shadow-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: shadow.gc
 ;; name in dgo: shadow
diff --git a/goal_src/jak1/engine/gfx/shrub/shrub-work.gc b/goal_src/jak1/engine/gfx/shrub/shrub-work.gc
index 17e7b593d..77b9a125e 100644
--- a/goal_src/jak1/engine/gfx/shrub/shrub-work.gc
+++ b/goal_src/jak1/engine/gfx/shrub/shrub-work.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
+(require "engine/gfx/shrub/shrubbery-h.gc")
+(require "engine/math/matrix-h.gc")
+(require "engine/gfx/math-camera-h.gc")
 
 ;; name: shrub-work.gc
 ;; name in dgo: shrub-work
diff --git a/goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc b/goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc
index 52bb6706e..fe2758548 100644
--- a/goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc
+++ b/goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/background/prototype-h.gc")
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: shrubbery-h.gc
 ;; name in dgo: shrubbery-h
diff --git a/goal_src/jak1/engine/gfx/shrub/shrubbery.gc b/goal_src/jak1/engine/gfx/shrub/shrubbery.gc
index d4ccd4441..ce734bf29 100644
--- a/goal_src/jak1/engine/gfx/shrub/shrubbery.gc
+++ b/goal_src/jak1/engine/gfx/shrub/shrubbery.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/subdivide.gc")
+(require "engine/anim/joint.gc")
+(require "engine/draw/draw-node-h.gc")
+(require "engine/gfx/background/background.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: shrubbery.gc
 ;; name in dgo: shrubbery
diff --git a/goal_src/jak1/engine/gfx/sky/sky-h.gc b/goal_src/jak1/engine/gfx/sky/sky-h.gc
index 2578765bd..d034a5427 100644
--- a/goal_src/jak1/engine/gfx/sky/sky-h.gc
+++ b/goal_src/jak1/engine/gfx/sky/sky-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/trigonometry.gc")
 
 ;; name: sky-h.gc
 ;; name in dgo: sky-h
diff --git a/goal_src/jak1/engine/gfx/sky/sky-tng.gc b/goal_src/jak1/engine/gfx/sky/sky-tng.gc
index d116e5630..f17c3eebc 100644
--- a/goal_src/jak1/engine/gfx/sky/sky-tng.gc
+++ b/goal_src/jak1/engine/gfx/sky/sky-tng.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/ps2/vu1-macros.gc")
+(require "engine/math/vector.gc")
+(require "engine/gfx/sky/sky.gc")
 
 ;; name: sky-tng.gc
 ;; name in dgo: sky-tng
diff --git a/goal_src/jak1/engine/gfx/sky/sky-utils.gc b/goal_src/jak1/engine/gfx/sky/sky-utils.gc
index cb4bc9c6e..8e227f0ca 100644
--- a/goal_src/jak1/engine/gfx/sky/sky-utils.gc
+++ b/goal_src/jak1/engine/gfx/sky/sky-utils.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sky/sky-h.gc")
 
 ;; name: sky-utils.gc
 ;; name in dgo: sky-utils
diff --git a/goal_src/jak1/engine/gfx/sky/sky.gc b/goal_src/jak1/engine/gfx/sky/sky.gc
index 9be44270e..ac7713612 100644
--- a/goal_src/jak1/engine/gfx/sky/sky.gc
+++ b/goal_src/jak1/engine/gfx/sky/sky.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/lights-h.gc")
+(require "engine/gfx/sky/sky-utils.gc")
 
 ;; name: sky.gc
 ;; name in dgo: sky
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-h.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-h.gc
index df9801cd4..6ffed228a 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-h.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: sparticle-h.gc
 ;; name in dgo: sparticle-h
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
index cb422f555..c099909aa 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: sparticle-launcher-h.gc
 ;; name in dgo: sparticle-launcher-h
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
index a4d4d6642..1cc3a75d5 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/mood/time-of-day-h.gc")
+(require "engine/draw/drawable-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/sprite/sprite.gc")
+(require "kernel/gstate.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: sparticle-launcher.gc
 ;; name in dgo: sparticle-launcher
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc
index e1b9b84c3..0beb758bf 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
 
 ;; name: sparticle.gc
 ;; name in dgo: sparticle
diff --git a/goal_src/jak1/engine/gfx/sprite/sprite-distort.gc b/goal_src/jak1/engine/gfx/sprite/sprite-distort.gc
index d4e5da478..4cb05bdd6 100644
--- a/goal_src/jak1/engine/gfx/sprite/sprite-distort.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sprite-distort.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sprite.gc")
+(require "engine/gfx/math-camera.gc")
 
 ;; name: sprite-distort.gc
 ;; name in dgo: sprite-distort
diff --git a/goal_src/jak1/engine/gfx/sprite/sprite-h.gc b/goal_src/jak1/engine/gfx/sprite/sprite-h.gc
index bcfdb9307..3b61e2d26 100644
--- a/goal_src/jak1/engine/gfx/sprite/sprite-h.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sprite-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: sprite-h.gc
 ;; name in dgo: sprite-h
diff --git a/goal_src/jak1/engine/gfx/sprite/sprite.gc b/goal_src/jak1/engine/gfx/sprite/sprite.gc
index 0c88f120d..c759224c3 100644
--- a/goal_src/jak1/engine/gfx/sprite/sprite.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sprite.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/sprite/sprite-h.gc")
+(require "engine/gfx/shadow/shadow-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/math/quaternion-h.gc")
+(require "pc/pckernel-impl.gc")
 
 ;; name: sprite.gc
 ;; name in dgo: sprite
diff --git a/goal_src/jak1/engine/gfx/texture/texture-h.gc b/goal_src/jak1/engine/gfx/texture/texture-h.gc
index b46d4b7c4..c0a9d0690 100644
--- a/goal_src/jak1/engine/gfx/texture/texture-h.gc
+++ b/goal_src/jak1/engine/gfx/texture/texture-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: texture-h.gc
 ;; name in dgo: texture-h
diff --git a/goal_src/jak1/engine/gfx/texture/texture-upload.gc b/goal_src/jak1/engine/gfx/texture/texture-upload.gc
index 56c1941a1..02385b514 100644
--- a/goal_src/jak1/engine/gfx/texture/texture-upload.gc
+++ b/goal_src/jak1/engine/gfx/texture/texture-upload.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "GAME.CGO")
+
+(require "engine/gfx/generic/generic-effect.gc")
 
 ;; name: texture-upload.gc
 ;; name in dgo: texture-upload
diff --git a/goal_src/jak1/engine/gfx/texture/texture.gc b/goal_src/jak1/engine/gfx/texture/texture.gc
index 88da44341..e5edba37d 100644
--- a/goal_src/jak1/engine/gfx/texture/texture.gc
+++ b/goal_src/jak1/engine/gfx/texture/texture.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/font-h.gc")
+(require "kernel/gkernel.gc")
+(require "engine/dma/dma-bucket.gc")
+(require "engine/debug/memory-usage-h.gc")
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/level/level-h.gc")
+(require "engine/load/file-io.gc")
 
 ;; name: texture.gc
 ;; name in dgo: texture
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc
index 06e432600..7db5397c7 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: tfrag-h.gc
 ;; name in dgo: tfrag-h
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
index d9cd79a4d..fc23c2293 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/debug/debug-h.gc")
+(require "engine/level/bsp.gc")
+(require "engine/gfx/tfrag/tfrag.gc")
+(require "engine/gfx/background/background.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: tfrag-methods.gc
 ;; name in dgo: tfrag-methods
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
index ffff10fa4..0156d2393 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/tfrag/tfrag-h.gc")
+(require "engine/math/matrix-h.gc")
+(require "engine/camera/cam-debug-h.gc")
 
 ;; name: tfrag-near.gc
 ;; name in dgo: tfrag-near
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
index 154477007..31bba3eac 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/dma/dma-buffer.gc")
+(require "engine/math/vector-h.gc")
+(require "engine/gfx/tfrag/tfrag-h.gc")
+(require "kernel/gkernel.gc")
 
 ;; name: tfrag-work.gc
 ;; name in dgo: tfrag-work
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
index 37df66d09..eea19e2e0 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/subdivide.gc")
+(require "engine/anim/joint.gc")
+(require "engine/gfx/background/background-h.gc")
+(require "engine/gfx/tfrag/tfrag-near.gc")
 
 ;; name: tfrag.gc
 ;; name in dgo: tfrag
diff --git a/goal_src/jak1/engine/gfx/tie/generic-tie-h.gc b/goal_src/jak1/engine/gfx/tie/generic-tie-h.gc
index a610ba5d0..2ce54171d 100644
--- a/goal_src/jak1/engine/gfx/tie/generic-tie-h.gc
+++ b/goal_src/jak1/engine/gfx/tie/generic-tie-h.gc
@@ -1,6 +1,9 @@
 
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: generic-tie-h.gc
 ;; name in dgo: generic-tie-h
diff --git a/goal_src/jak1/engine/gfx/tie/tie-h.gc b/goal_src/jak1/engine/gfx/tie/tie-h.gc
index ecb951554..5cef4813d 100644
--- a/goal_src/jak1/engine/gfx/tie/tie-h.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/background/prototype-h.gc")
+(require "engine/draw/drawable-tree-h.gc")
+(require "engine/draw/drawable-inline-array-h.gc")
 
 ;; name: tie-h.gc
 ;; name in dgo: tie-h
diff --git a/goal_src/jak1/engine/gfx/tie/tie-methods.gc b/goal_src/jak1/engine/gfx/tie/tie-methods.gc
index 3f165f683..7caa480ff 100644
--- a/goal_src/jak1/engine/gfx/tie/tie-methods.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie-methods.gc
@@ -1,5 +1,18 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/tie/tie.gc")
+(require "engine/gfx/background/wind-h.gc")
+(require "engine/level/bsp.gc")
+(require "kernel/gstate.gc")
+(require "engine/draw/draw-node-h.gc")
+(require "engine/gfx/generic/generic-h.gc")
+(require "engine/gfx/background/background.gc")
+(require "engine/camera/cam-interface-h.gc")
+(require "engine/collide/collide-shape-h.gc")
+(require "engine/gfx/tie/tie-work.gc")
+(require "engine/gfx/background/subdivide.gc")
 
 ;; name: tie-methods.gc
 ;; name in dgo: tie-methods
diff --git a/goal_src/jak1/engine/gfx/tie/tie-near.gc b/goal_src/jak1/engine/gfx/tie/tie-near.gc
index 32d0e04e7..3ddf6061d 100644
--- a/goal_src/jak1/engine/gfx/tie/tie-near.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie-near.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/matrix.gc")
+(require "engine/game/main-h.gc")
+(require "engine/gfx/math-camera-h.gc")
+(require "engine/gfx/hw/gs.gc")
 
 ;; name: tie-near.gc
 ;; name in dgo: tie-near
diff --git a/goal_src/jak1/engine/gfx/tie/tie-work.gc b/goal_src/jak1/engine/gfx/tie/tie-work.gc
index 7f8f13369..1b82de76f 100644
--- a/goal_src/jak1/engine/gfx/tie/tie-work.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie-work.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/dma/dma-buffer.gc")
+(require "engine/math/vector-h.gc")
 
 ;; name: tie-work.gc
 ;; name in dgo: tie-work
diff --git a/goal_src/jak1/engine/gfx/tie/tie.gc b/goal_src/jak1/engine/gfx/tie/tie.gc
index b906d9ae8..d73c8bfd1 100644
--- a/goal_src/jak1/engine/gfx/tie/tie.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/main-h.gc")
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/anim/joint.gc")
 
 ;; name: tie.gc
 ;; name in dgo: tie
diff --git a/goal_src/jak1/engine/gfx/vu1-user-h.gc b/goal_src/jak1/engine/gfx/vu1-user-h.gc
index 34dc66926..d919d79fa 100644
--- a/goal_src/jak1/engine/gfx/vu1-user-h.gc
+++ b/goal_src/jak1/engine/gfx/vu1-user-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: vu1-user-h.gc
 ;; name in dgo: vu1-user-h
diff --git a/goal_src/jak1/engine/level/bsp-h.gc b/goal_src/jak1/engine/level/bsp-h.gc
index b2dd5e974..b7d6c15e3 100644
--- a/goal_src/jak1/engine/level/bsp-h.gc
+++ b/goal_src/jak1/engine/level/bsp-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-h.gc")
 
 ;; name: bsp-h.gc
 ;; name in dgo: bsp-h
diff --git a/goal_src/jak1/engine/level/bsp.gc b/goal_src/jak1/engine/level/bsp.gc
index 535f85543..cd97d41ed 100644
--- a/goal_src/jak1/engine/level/bsp.gc
+++ b/goal_src/jak1/engine/level/bsp.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display.gc")
+(require "engine/anim/joint.gc")
+(require "engine/geometry/cylinder.gc")
+(require "engine/draw/drawable-ambient-h.gc")
+(require "engine/collide/collide-cache-h.gc")
 
 ;; name: bsp.gc
 ;; name in dgo: bsp
diff --git a/goal_src/jak1/engine/level/level-h.gc b/goal_src/jak1/engine/level/level-h.gc
index f97219aa3..91a9efef6 100644
--- a/goal_src/jak1/engine/level/level-h.gc
+++ b/goal_src/jak1/engine/level/level-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/vu1-user-h.gc")
+(require "engine/dma/dma-h.gc")
 
 ;; name: level-h.gc
 ;; name in dgo: level-h
diff --git a/goal_src/jak1/engine/level/level-info.gc b/goal_src/jak1/engine/level/level-info.gc
index 5864764e7..52b857cb3 100644
--- a/goal_src/jak1/engine/level/level-info.gc
+++ b/goal_src/jak1/engine/level/level-info.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/quaternion-h.gc")
+(require "engine/math/vector-h.gc")
+(require "engine/level/level-h.gc")
+(require "engine/game/game-info-h.gc")
 
 ;; name: level-info.gc
 ;; name in dgo: level-info
diff --git a/goal_src/jak1/engine/level/level.gc b/goal_src/jak1/engine/level/level.gc
index c5ea0f1d7..eed08cd85 100644
--- a/goal_src/jak1/engine/level/level.gc
+++ b/goal_src/jak1/engine/level/level.gc
@@ -1,5 +1,16 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/engine/engines.gc")
+(require "engine/level/load-boundary.gc")
+(require "engine/gfx/tie/tie-h.gc")
+(require "engine/gfx/mood/mood-h.gc")
+(require "engine/level/level-info.gc")
+(require "engine/level/bsp.gc")
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/load/ramdisk.gc")
+(require "engine/gfx/tfrag/tfrag.gc")
 
 ;; name: level.gc
 ;; name in dgo: level
diff --git a/goal_src/jak1/engine/level/load-boundary-data.gc b/goal_src/jak1/engine/level/load-boundary-data.gc
index b497cfd2b..c98bbdf21 100644
--- a/goal_src/jak1/engine/level/load-boundary-data.gc
+++ b/goal_src/jak1/engine/level/load-boundary-data.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/level/load-boundary.gc")
 
 ;; name: load-boundary-data.gc
 ;; name in dgo: load-boundary-data
diff --git a/goal_src/jak1/engine/level/load-boundary-h.gc b/goal_src/jak1/engine/level/load-boundary-h.gc
index 3d8fa52df..007acb299 100644
--- a/goal_src/jak1/engine/level/load-boundary-h.gc
+++ b/goal_src/jak1/engine/level/load-boundary-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/game/game-info-h.gc")
 
 ;; name: load-boundary-h.gc
 ;; name in dgo: load-boundary-h
diff --git a/goal_src/jak1/engine/level/load-boundary.gc b/goal_src/jak1/engine/level/load-boundary.gc
index b0c8017ad..77c46459f 100644
--- a/goal_src/jak1/engine/level/load-boundary.gc
+++ b/goal_src/jak1/engine/level/load-boundary.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-ambient-h.gc")
+(require "engine/game/game-save.gc")
+(require "engine/level/load-boundary-h.gc")
+(require "engine/gfx/sky/sky-tng.gc")
+(require "engine/game/settings.gc")
 
 ;; name: load-boundary.gc
 ;; name in dgo: load-boundary
@@ -849,6 +856,14 @@
   (let ((gp-0 (new 'stack 'file-stream *temp-string* 'write)))
     (format gp-0 ";-*-Lisp-*-~%")
     (format gp-0 "(in-package goal)~%~%")
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/draw/drawable-ambient-h.gc")
+(require "engine/game/game-save.gc")
+(require "engine/level/load-boundary-h.gc")
+(require "engine/gfx/sky/sky-tng.gc")
+(require "engine/game/settings.gc")
+
     (format gp-0 ";; reset boundary in editor~%")
     (format gp-0 "(set! (-> *lb-editor-parms* boundary) #f)~%~%")
     (format gp-0 ";; reset all existing load boundaries~%")
diff --git a/goal_src/jak1/engine/load/decomp-h.gc b/goal_src/jak1/engine/load/decomp-h.gc
index 7a25e80f2..dcabb4e0a 100644
--- a/goal_src/jak1/engine/load/decomp-h.gc
+++ b/goal_src/jak1/engine/load/decomp-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: decomp-h.gc
 ;; name in dgo: decomp-h
diff --git a/goal_src/jak1/engine/load/decomp.gc b/goal_src/jak1/engine/load/decomp.gc
index f98ca3cb0..e6cf26677 100644
--- a/goal_src/jak1/engine/load/decomp.gc
+++ b/goal_src/jak1/engine/load/decomp.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ps2/pad.gc")
+(require "engine/draw/drawable-ambient-h.gc")
+(require "engine/gfx/font.gc")
+(require "engine/load/ramdisk.gc")
 
 ;; name: decomp.gc
 ;; name in dgo: decomp
diff --git a/goal_src/jak1/engine/load/file-io.gc b/goal_src/jak1/engine/load/file-io.gc
index 4944ec750..9b14a9594 100644
--- a/goal_src/jak1/engine/load/file-io.gc
+++ b/goal_src/jak1/engine/load/file-io.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gstring.gc")
 
 ;; name: file-io.gc
 ;; name in dgo: file-io
diff --git a/goal_src/jak1/engine/load/load-dgo.gc b/goal_src/jak1/engine/load/load-dgo.gc
index 466e093d5..e42d2c705 100644
--- a/goal_src/jak1/engine/load/load-dgo.gc
+++ b/goal_src/jak1/engine/load/load-dgo.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "kernel/gstring.gc")
+(require "engine/ps2/rpc-h.gc")
+(require "engine/sound/gsound-h.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: load-dgo.gc
 ;; name in dgo: load-dgo
diff --git a/goal_src/jak1/engine/load/loader-h.gc b/goal_src/jak1/engine/load/loader-h.gc
index 454200945..31efbb0cd 100644
--- a/goal_src/jak1/engine/load/loader-h.gc
+++ b/goal_src/jak1/engine/load/loader-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
 
 ;; name: loader-h.gc
 ;; name in dgo: loader-h
diff --git a/goal_src/jak1/engine/load/loader.gc b/goal_src/jak1/engine/load/loader.gc
index 8eee9fc22..a2d4a86e2 100644
--- a/goal_src/jak1/engine/load/loader.gc
+++ b/goal_src/jak1/engine/load/loader.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/load/loader-h.gc")
+(require "engine/anim/joint.gc")
+(require "engine/load/load-dgo.gc")
+(require "engine/sound/gsound.gc")
+(require "engine/game/task/hint-control-h.gc")
+(require "engine/common-obs/process-drawable-h.gc")
+(require "engine/game/game-info-h.gc")
 
 ;; name: loader.gc
 ;; name in dgo: loader
diff --git a/goal_src/jak1/engine/load/ramdisk.gc b/goal_src/jak1/engine/load/ramdisk.gc
index 1a3125314..a2316d2b4 100644
--- a/goal_src/jak1/engine/load/ramdisk.gc
+++ b/goal_src/jak1/engine/load/ramdisk.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ps2/rpc-h.gc")
 
 ;; name: ramdisk.gc
 ;; name in dgo: ramdisk
diff --git a/goal_src/jak1/engine/math/euler-h.gc b/goal_src/jak1/engine/math/euler-h.gc
index 62f3c2dac..f205ab196 100644
--- a/goal_src/jak1/engine/math/euler-h.gc
+++ b/goal_src/jak1/engine/math/euler-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: euler-h.gc
 ;; name in dgo: euler-h
diff --git a/goal_src/jak1/engine/math/euler.gc b/goal_src/jak1/engine/math/euler.gc
index 3f3e7b383..0eb92f658 100644
--- a/goal_src/jak1/engine/math/euler.gc
+++ b/goal_src/jak1/engine/math/euler.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/quaternion.gc")
+(require "engine/math/euler-h.gc")
 
 ;; name: euler.gc
 ;; name in dgo: euler
diff --git a/goal_src/jak1/engine/math/math.gc b/goal_src/jak1/engine/math/math.gc
index 824082700..38832bdc6 100644
--- a/goal_src/jak1/engine/math/math.gc
+++ b/goal_src/jak1/engine/math/math.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: math.gc
 ;; name in dgo: math
diff --git a/goal_src/jak1/engine/math/matrix-h.gc b/goal_src/jak1/engine/math/matrix-h.gc
index 141e4c659..9c9505461 100644
--- a/goal_src/jak1/engine/math/matrix-h.gc
+++ b/goal_src/jak1/engine/math/matrix-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: matrix-h.gc
 ;; name in dgo: matrix-h
diff --git a/goal_src/jak1/engine/math/matrix.gc b/goal_src/jak1/engine/math/matrix.gc
index 78e417e22..cbf76c65b 100644
--- a/goal_src/jak1/engine/math/matrix.gc
+++ b/goal_src/jak1/engine/math/matrix.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/math/matrix-h.gc")
 
 ;; name: matrix.gc
 ;; name in dgo: matrix
diff --git a/goal_src/jak1/engine/math/quaternion-h.gc b/goal_src/jak1/engine/math/quaternion-h.gc
index 5ea16c2ed..41b178b6a 100644
--- a/goal_src/jak1/engine/math/quaternion-h.gc
+++ b/goal_src/jak1/engine/math/quaternion-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: quaternion-h.gc
 ;; name in dgo: quaternion-h
diff --git a/goal_src/jak1/engine/math/quaternion.gc b/goal_src/jak1/engine/math/quaternion.gc
index dd3a5cb9c..122171a6f 100644
--- a/goal_src/jak1/engine/math/quaternion.gc
+++ b/goal_src/jak1/engine/math/quaternion.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/quaternion-h.gc")
+(require "engine/math/matrix.gc")
 
 ;; name: quaternion.gc
 ;; name in dgo: quaternion
diff --git a/goal_src/jak1/engine/math/transform-h.gc b/goal_src/jak1/engine/math/transform-h.gc
index 3e010699b..7218d758b 100644
--- a/goal_src/jak1/engine/math/transform-h.gc
+++ b/goal_src/jak1/engine/math/transform-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: transform-h.gc
 ;; name in dgo: transform-h
diff --git a/goal_src/jak1/engine/math/transform.gc b/goal_src/jak1/engine/math/transform.gc
index f2321848c..39c0a93ad 100644
--- a/goal_src/jak1/engine/math/transform.gc
+++ b/goal_src/jak1/engine/math/transform.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/matrix.gc")
+(require "engine/math/transform-h.gc")
 
 ;; name: transform.gc
 ;; name in dgo: transform
diff --git a/goal_src/jak1/engine/math/transformq-h.gc b/goal_src/jak1/engine/math/transformq-h.gc
index 2f1c19713..6b33f9853 100644
--- a/goal_src/jak1/engine/math/transformq-h.gc
+++ b/goal_src/jak1/engine/math/transformq-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/quaternion-h.gc")
+(require "engine/math/vector-h.gc")
+(require "engine/math/transform-h.gc")
 
 ;; name: transformq-h.gc
 ;; name in dgo: transformq-h
diff --git a/goal_src/jak1/engine/math/transformq.gc b/goal_src/jak1/engine/math/transformq.gc
index fd4622e2c..0cb9415b1 100644
--- a/goal_src/jak1/engine/math/transformq.gc
+++ b/goal_src/jak1/engine/math/transformq.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/physics/dynamics-h.gc")
+(require "engine/geometry/geometry.gc")
+(require "engine/math/transformq-h.gc")
 
 ;; name: transformq.gc
 ;; name in dgo: transformq
diff --git a/goal_src/jak1/engine/math/trigonometry-h.gc b/goal_src/jak1/engine/math/trigonometry-h.gc
index 366c0e44b..725abafc8 100644
--- a/goal_src/jak1/engine/math/trigonometry-h.gc
+++ b/goal_src/jak1/engine/math/trigonometry-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: trigonometry-h.gc
 ;; name in dgo: trigonometry-h
diff --git a/goal_src/jak1/engine/math/trigonometry.gc b/goal_src/jak1/engine/math/trigonometry.gc
index dc1ac4566..f4a8da176 100644
--- a/goal_src/jak1/engine/math/trigonometry.gc
+++ b/goal_src/jak1/engine/math/trigonometry.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: trigonometry.gc
 ;; name in dgo: trigonometry
diff --git a/goal_src/jak1/engine/math/vector-h.gc b/goal_src/jak1/engine/math/vector-h.gc
index ffb57c34a..11435f8b2 100644
--- a/goal_src/jak1/engine/math/vector-h.gc
+++ b/goal_src/jak1/engine/math/vector-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: vector-h.gc
 ;; name in dgo: vector-h
diff --git a/goal_src/jak1/engine/math/vector.gc b/goal_src/jak1/engine/math/vector.gc
index f27fd1edd..9ad4a993b 100644
--- a/goal_src/jak1/engine/math/vector.gc
+++ b/goal_src/jak1/engine/math/vector.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/math/trigonometry.gc")
 
 ;; name: vector.gc
 ;; name in dgo: vector
diff --git a/goal_src/jak1/engine/nav/navigate-h.gc b/goal_src/jak1/engine/nav/navigate-h.gc
index 6e578b976..d5a61d9c3 100644
--- a/goal_src/jak1/engine/nav/navigate-h.gc
+++ b/goal_src/jak1/engine/nav/navigate-h.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/actor-link-h.gc")
+(require "engine/draw/drawable-h.gc")
+(require "engine/game/main-h.gc")
+(require "engine/collide/collide-shape-h.gc")
 
 ;; name: navigate-h.gc
 ;; name in dgo: navigate-h
diff --git a/goal_src/jak1/engine/nav/navigate.gc b/goal_src/jak1/engine/nav/navigate.gc
index bbd112056..84fac49be 100644
--- a/goal_src/jak1/engine/nav/navigate.gc
+++ b/goal_src/jak1/engine/nav/navigate.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-func.gc")
+(require "engine/nav/navigate-h.gc")
+(require "engine/math/transformq.gc")
+(require "engine/debug/debug.gc")
 
 ;; name: navigate.gc
 ;; name in dgo: navigate
diff --git a/goal_src/jak1/engine/physics/dynamics-h.gc b/goal_src/jak1/engine/physics/dynamics-h.gc
index 3015dd6f9..a3410ac07 100644
--- a/goal_src/jak1/engine/physics/dynamics-h.gc
+++ b/goal_src/jak1/engine/physics/dynamics-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: dynamics-h.gc
 ;; name in dgo: dynamics-h
diff --git a/goal_src/jak1/engine/physics/gravity-h.gc b/goal_src/jak1/engine/physics/gravity-h.gc
index 65c769455..19bd9a622 100644
--- a/goal_src/jak1/engine/physics/gravity-h.gc
+++ b/goal_src/jak1/engine/physics/gravity-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/util/types-h.gc")
 
 ;; name: gravity-h.gc
 ;; name in dgo: gravity-h
diff --git a/goal_src/jak1/engine/physics/trajectory-h.gc b/goal_src/jak1/engine/physics/trajectory-h.gc
index 556d98229..42dc2c9a3 100644
--- a/goal_src/jak1/engine/physics/trajectory-h.gc
+++ b/goal_src/jak1/engine/physics/trajectory-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: trajectory-h.gc
 ;; name in dgo: trajectory-h
diff --git a/goal_src/jak1/engine/physics/trajectory.gc b/goal_src/jak1/engine/physics/trajectory.gc
index 0b931817c..3a03eb8a2 100644
--- a/goal_src/jak1/engine/physics/trajectory.gc
+++ b/goal_src/jak1/engine/physics/trajectory.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/math/vector.gc")
+(require "engine/physics/trajectory-h.gc")
+(require "engine/debug/debug-h.gc")
 
 ;; name: trajectory.gc
 ;; name in dgo: trajectory
diff --git a/goal_src/jak1/engine/ps2/memcard-h.gc b/goal_src/jak1/engine/ps2/memcard-h.gc
index 0d328c084..c44b8e27e 100644
--- a/goal_src/jak1/engine/ps2/memcard-h.gc
+++ b/goal_src/jak1/engine/ps2/memcard-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/font-h.gc")
+(require "kernel/gstring.gc")
 
 ;; name: memcard-h.gc
 ;; name in dgo: memcard-h
diff --git a/goal_src/jak1/engine/ps2/pad.gc b/goal_src/jak1/engine/ps2/pad.gc
index b4757e108..e067f8fbc 100644
--- a/goal_src/jak1/engine/ps2/pad.gc
+++ b/goal_src/jak1/engine/ps2/pad.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "")
+(require "engine/sound/gsound.gc")
+(require "pc/pc-cheats.gc")
 
 ;; name: pad.gc
 ;; name in dgo: pad
diff --git a/goal_src/jak1/engine/ps2/rpc-h.gc b/goal_src/jak1/engine/ps2/rpc-h.gc
index 7d537fa78..b89c1adf9 100644
--- a/goal_src/jak1/engine/ps2/rpc-h.gc
+++ b/goal_src/jak1/engine/ps2/rpc-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: rpc-h.gc
 ;; name in dgo: rpc-h
diff --git a/goal_src/jak1/engine/ps2/timer-h.gc b/goal_src/jak1/engine/ps2/timer-h.gc
index f027412d4..8bb7e3497 100644
--- a/goal_src/jak1/engine/ps2/timer-h.gc
+++ b/goal_src/jak1/engine/ps2/timer-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: timer-h.gc
 ;; name in dgo: timer-h
diff --git a/goal_src/jak1/engine/ps2/timer.gc b/goal_src/jak1/engine/ps2/timer.gc
index 54b1fa82e..35aedf26b 100644
--- a/goal_src/jak1/engine/ps2/timer.gc
+++ b/goal_src/jak1/engine/ps2/timer.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ps2/timer-h.gc")
+(require "kernel/gcommon.gc")
 
 ;; name: timer.gc
 ;; name in dgo: timer
diff --git a/goal_src/jak1/engine/ps2/vif-h.gc b/goal_src/jak1/engine/ps2/vif-h.gc
index c5597844f..78fb470de 100644
--- a/goal_src/jak1/engine/ps2/vif-h.gc
+++ b/goal_src/jak1/engine/ps2/vif-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: vif-h.gc
 ;; name in dgo: vif-h
diff --git a/goal_src/jak1/engine/ps2/vu1-macros.gc b/goal_src/jak1/engine/ps2/vu1-macros.gc
index ed3f79f11..c497fcc82 100644
--- a/goal_src/jak1/engine/ps2/vu1-macros.gc
+++ b/goal_src/jak1/engine/ps2/vu1-macros.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: vu1-macros.gc
 ;; name in dgo: vu1-macros
diff --git a/goal_src/jak1/engine/sound/gsound-h.gc b/goal_src/jak1/engine/sound/gsound-h.gc
index dd99d590b..898fee9dc 100644
--- a/goal_src/jak1/engine/sound/gsound-h.gc
+++ b/goal_src/jak1/engine/sound/gsound-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: gsound-h.gc
 ;; name in dgo: gsound-h
diff --git a/goal_src/jak1/engine/sound/gsound.gc b/goal_src/jak1/engine/sound/gsound.gc
index 6a88944e2..cbe79e3d5 100644
--- a/goal_src/jak1/engine/sound/gsound.gc
+++ b/goal_src/jak1/engine/sound/gsound.gc
@@ -1,5 +1,15 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/settings-h.gc")
+(require "engine/camera/cam-update-h.gc")
+(require "engine/game/main-h.gc")
+(require "engine/ui/progress/progress-h.gc")
+(require "engine/entity/entity-h.gc")
+(require "engine/game/effect-control-h.gc")
+(require "engine/ps2/rpc-h.gc")
+(require "engine/sound/gsound-h.gc")
 
 ;; name: gsound.gc
 ;; name in dgo: gsound
diff --git a/goal_src/jak1/engine/target/collide-reaction-target.gc b/goal_src/jak1/engine/target/collide-reaction-target.gc
index c33629ea3..182c1ab8b 100644
--- a/goal_src/jak1/engine/target/collide-reaction-target.gc
+++ b/goal_src/jak1/engine/target/collide-reaction-target.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/collide/collide-shape.gc")
 
 ;; name: collide-reaction-target.gc
 ;; name in dgo: collide-reaction-target
diff --git a/goal_src/jak1/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc
index 372e98e30..4c210855d 100644
--- a/goal_src/jak1/engine/target/logic-target.gc
+++ b/goal_src/jak1/engine/target/logic-target.gc
@@ -1,5 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/anim/aligner-h.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/level/level.gc")
+(require "engine/target/collide-reaction-target.gc")
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/common-obs/water-h.gc")
+(require "engine/target/target-util.gc")
 
 ;; name: logic-target.gc
 ;; name in dgo: logic-target
diff --git a/goal_src/jak1/engine/target/sidekick.gc b/goal_src/jak1/engine/target/sidekick.gc
index c700d7d93..2e98bc078 100644
--- a/goal_src/jak1/engine/target/sidekick.gc
+++ b/goal_src/jak1/engine/target/sidekick.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/target/target-util.gc")
 
 ;; name: sidekick.gc
 ;; name in dgo: sidekick
diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc
index ab58de1dd..6aacdab51 100644
--- a/goal_src/jak1/engine/target/target-death.gc
+++ b/goal_src/jak1/engine/target/target-death.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/camera/cam-start.gc")
+(require "engine/target/target.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/target/target-part.gc")
 
 ;; name: target-death.gc
 ;; name in dgo: target-death
diff --git a/goal_src/jak1/engine/target/target-h.gc b/goal_src/jak1/engine/target/target-h.gc
index 3ccb20e68..0391e0f88 100644
--- a/goal_src/jak1/engine/target/target-h.gc
+++ b/goal_src/jak1/engine/target/target-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: target-h.gc
 ;; name in dgo: target-h
diff --git a/goal_src/jak1/engine/target/target-handler.gc b/goal_src/jak1/engine/target/target-handler.gc
index e258e070b..127cb8fc6 100644
--- a/goal_src/jak1/engine/target/target-handler.gc
+++ b/goal_src/jak1/engine/target/target-handler.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/target/logic-target.gc")
 
 ;; name: target-handler.gc
 ;; name in dgo: target-handler
diff --git a/goal_src/jak1/engine/target/target-part.gc b/goal_src/jak1/engine/target/target-part.gc
index eae56efa8..9038c732c 100644
--- a/goal_src/jak1/engine/target/target-part.gc
+++ b/goal_src/jak1/engine/target/target-part.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: target-part.gc
 ;; name in dgo: target-part
diff --git a/goal_src/jak1/engine/target/target-util.gc b/goal_src/jak1/engine/target/target-util.gc
index 11d561227..589cf5db0 100644
--- a/goal_src/jak1/engine/target/target-util.gc
+++ b/goal_src/jak1/engine/target/target-util.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/anim/joint.gc")
+(require "engine/collide/collide-shape.gc")
+(require "engine/gfx/shadow/shadow-cpu-h.gc")
+(require "engine/common-obs/process-drawable-h.gc")
 
 ;; name: target-util.gc
 ;; name in dgo: target-util
diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc
index 9f91fbfda..d0f31475a 100644
--- a/goal_src/jak1/engine/target/target.gc
+++ b/goal_src/jak1/engine/target/target.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/target/target-handler.gc")
 
 ;; name: target.gc
 ;; name in dgo: target
diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc
index 5e2b89092..e06a3e39b 100644
--- a/goal_src/jak1/engine/target/target2.gc
+++ b/goal_src/jak1/engine/target/target2.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/game/projectiles-h.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/target/target.gc")
 
 ;; name: target2.gc
 ;; name in dgo: target2
diff --git a/goal_src/jak1/engine/ui/credits.gc b/goal_src/jak1/engine/ui/credits.gc
index d861b3f84..66a21224b 100644
--- a/goal_src/jak1/engine/ui/credits.gc
+++ b/goal_src/jak1/engine/ui/credits.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/text.gc")
 
 ;; name: credits.gc
 ;; name in dgo: credits
diff --git a/goal_src/jak1/engine/ui/hud-classes.gc b/goal_src/jak1/engine/ui/hud-classes.gc
index a53a1c9b8..cd8f7fbf2 100644
--- a/goal_src/jak1/engine/ui/hud-classes.gc
+++ b/goal_src/jak1/engine/ui/hud-classes.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/hud.gc")
 
 ;; name: hud-classes.gc
 ;; name in dgo: hud-classes
diff --git a/goal_src/jak1/engine/ui/hud-h.gc b/goal_src/jak1/engine/ui/hud-h.gc
index c8d695f37..61e28a704 100644
--- a/goal_src/jak1/engine/ui/hud-h.gc
+++ b/goal_src/jak1/engine/ui/hud-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: hud-h.gc
 ;; name in dgo: hud-h
diff --git a/goal_src/jak1/engine/ui/hud.gc b/goal_src/jak1/engine/ui/hud.gc
index 7e18a1bfc..b58f5123c 100644
--- a/goal_src/jak1/engine/ui/hud.gc
+++ b/goal_src/jak1/engine/ui/hud.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/common-obs/collectables.gc")
 
 ;; name: hud.gc
 ;; name in dgo: hud
diff --git a/goal_src/jak1/engine/ui/progress/progress-draw.gc b/goal_src/jak1/engine/ui/progress/progress-draw.gc
index 66eb66993..e0ae88b00 100644
--- a/goal_src/jak1/engine/ui/progress/progress-draw.gc
+++ b/goal_src/jak1/engine/ui/progress/progress-draw.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/progress/progress-static.gc")
+(require "engine/game/main.gc")
+(require "engine/ui/hud-classes.gc")
 
 ;; name: progress-draw.gc
 ;; name in dgo: progress-draw
diff --git a/goal_src/jak1/engine/ui/progress/progress-h.gc b/goal_src/jak1/engine/ui/progress/progress-h.gc
index 77d8096b0..e544934b5 100644
--- a/goal_src/jak1/engine/ui/progress/progress-h.gc
+++ b/goal_src/jak1/engine/ui/progress/progress-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: progress-h.gc
 ;; name in dgo: progress-h
diff --git a/goal_src/jak1/engine/ui/progress/progress-part.gc b/goal_src/jak1/engine/ui/progress/progress-part.gc
index f160a1492..508f5c11f 100644
--- a/goal_src/jak1/engine/ui/progress/progress-part.gc
+++ b/goal_src/jak1/engine/ui/progress/progress-part.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/hud-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/anim/joint-h.gc")
 
 ;; name: progress-part.gc
 ;; name in dgo: progress-part
diff --git a/goal_src/jak1/engine/ui/progress/progress-static.gc b/goal_src/jak1/engine/ui/progress/progress-static.gc
index 1947bf63f..18f09adfb 100644
--- a/goal_src/jak1/engine/ui/progress/progress-static.gc
+++ b/goal_src/jak1/engine/ui/progress/progress-static.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/progress/progress-h.gc")
+(require "engine/ui/text-h.gc")
+(require "engine/game/task/game-task-h.gc")
 
 ;; name: progress-static.gc
 ;; name in dgo: progress-static
diff --git a/goal_src/jak1/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc
index 3b831bf27..03a04e5c0 100644
--- a/goal_src/jak1/engine/ui/progress/progress.gc
+++ b/goal_src/jak1/engine/ui/progress/progress.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/progress/progress-draw.gc")
+(require "engine/ui/progress/progress-part.gc")
 
 ;; name: progress.gc
 ;; name in dgo: progress
diff --git a/goal_src/jak1/engine/ui/text-h.gc b/goal_src/jak1/engine/ui/text-h.gc
index 7fcafabfa..641841a39 100644
--- a/goal_src/jak1/engine/ui/text-h.gc
+++ b/goal_src/jak1/engine/ui/text-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel-h.gc")
 
 ;; name: text-h.gc
 ;; name in dgo: text-h
diff --git a/goal_src/jak1/engine/ui/text.gc b/goal_src/jak1/engine/ui/text.gc
index e602bee2f..399b8f2b3 100644
--- a/goal_src/jak1/engine/ui/text.gc
+++ b/goal_src/jak1/engine/ui/text.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/ui/text-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/load/load-dgo.gc")
 
 ;; name: text.gc
 ;; name in dgo: text
diff --git a/goal_src/jak1/engine/util/capture.gc b/goal_src/jak1/engine/util/capture.gc
index 9ac600cd6..c03b8407a 100644
--- a/goal_src/jak1/engine/util/capture.gc
+++ b/goal_src/jak1/engine/util/capture.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel/gkernel.gc")
+(require "engine/gfx/hw/gs.gc")
 
 ;; name: capture.gc
 ;; name in dgo: capture
diff --git a/goal_src/jak1/engine/util/glist-h.gc b/goal_src/jak1/engine/util/glist-h.gc
index 4bbcc89a1..f1a6296df 100644
--- a/goal_src/jak1/engine/util/glist-h.gc
+++ b/goal_src/jak1/engine/util/glist-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: glist-h.gc
 ;; name in dgo: glist-h
diff --git a/goal_src/jak1/engine/util/glist.gc b/goal_src/jak1/engine/util/glist.gc
index 2a49410c7..af457d561 100644
--- a/goal_src/jak1/engine/util/glist.gc
+++ b/goal_src/jak1/engine/util/glist.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/util/glist-h.gc")
+(require "kernel/gstring.gc")
 
 ;; name: glist.gc
 ;; name in dgo: glist
diff --git a/goal_src/jak1/engine/util/smush-control-h.gc b/goal_src/jak1/engine/util/smush-control-h.gc
index 562de33a7..54c093de9 100644
--- a/goal_src/jak1/engine/util/smush-control-h.gc
+++ b/goal_src/jak1/engine/util/smush-control-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/util/types-h.gc")
 
 ;; name: smush-control-h.gc
 ;; name in dgo: smush-control-h
diff --git a/goal_src/jak1/engine/util/sync-info-h.gc b/goal_src/jak1/engine/util/sync-info-h.gc
index cd014ebcb..5bd45a3d1 100644
--- a/goal_src/jak1/engine/util/sync-info-h.gc
+++ b/goal_src/jak1/engine/util/sync-info-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: sync-info-h.gc
 ;; name in dgo: sync-info-h
diff --git a/goal_src/jak1/engine/util/sync-info.gc b/goal_src/jak1/engine/util/sync-info.gc
index 89599709f..26f711804 100644
--- a/goal_src/jak1/engine/util/sync-info.gc
+++ b/goal_src/jak1/engine/util/sync-info.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "engine/entity/res.gc")
+(require "engine/util/smush-control-h.gc")
+(require "engine/util/sync-info-h.gc")
 
 ;; name: sync-info.gc
 ;; name in dgo: sync-info
diff --git a/goal_src/jak1/engine/util/types-h.gc b/goal_src/jak1/engine/util/types-h.gc
index cdcdf1bbf..1e436909b 100644
--- a/goal_src/jak1/engine/util/types-h.gc
+++ b/goal_src/jak1/engine/util/types-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ENGINE.CGO" "GAME.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: types-h.gc
 ;; name in dgo: types-h
diff --git a/goal_src/jak1/examples/debug-draw-example.gc b/goal_src/jak1/examples/debug-draw-example.gc
index e2d30bf23..8a66d6aed 100644
--- a/goal_src/jak1/examples/debug-draw-example.gc
+++ b/goal_src/jak1/examples/debug-draw-example.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+
+
 ;; This file demonstrates how to use the debug draw.
 
 ;; To run this:
diff --git a/goal_src/jak1/game.gp b/goal_src/jak1/game.gp
index 88da8f166..47559b79a 100644
--- a/goal_src/jak1/game.gp
+++ b/goal_src/jak1/game.gp
@@ -1696,7 +1696,7 @@
  )
 
 
-(goal-src "engine/ps2/pad.gc" "pckernel-h")
+(goal-src "engine/ps2/pad.gc" "pckernel-h" "pc-cheats")
 
 (goal-src-sequence
  ;; prefix
@@ -2066,8 +2066,9 @@
 (goal-src "pc/features/autosplit-h.gc")
 (goal-src "pc/features/autosplit.gc" "autosplit-h" "task-control-h" "progress-static")
 (goal-src "pc/features/speedruns.gc" "speedruns-h" "autosplit-h")
+(goal-src "pc/pc-cheats.gc" "dma-buffer")
 (goal-src "pc/pckernel-h.gc" "dma-buffer")
-(goal-src "pc/pckernel-impl.gc" "pckernel-h")
+(goal-src "pc/pckernel-impl.gc" "pckernel-h" "pc-cheats")
 (goal-src "pc/util/pc-anim-util.gc" "target-h")
 (goal-src "pc/pckernel-common.gc" "pckernel-impl" "pc-anim-util" "settings" "video" "target-h" "autosplit-h" "speedruns-h")
 (goal-src "pc/pckernel.gc" "pckernel-common")
diff --git a/goal_src/jak1/kernel/dgo-h.gc b/goal_src/jak1/kernel/dgo-h.gc
index d17d03d67..02d89790b 100644
--- a/goal_src/jak1/kernel/dgo-h.gc
+++ b/goal_src/jak1/kernel/dgo-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: dgo-h.gc
 ;; name in dgo: dgo-h
diff --git a/goal_src/jak1/kernel/gcommon.gc b/goal_src/jak1/kernel/gcommon.gc
index 1b3f987f6..7f9882294 100644
--- a/goal_src/jak1/kernel/gcommon.gc
+++ b/goal_src/jak1/kernel/gcommon.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "compiler-setup.gc")
+(require "kernel-defs.gc")
 
 ;; name: gcommon.gc
 ;; name in dgo: gcommon
diff --git a/goal_src/jak1/kernel/gkernel-h.gc b/goal_src/jak1/kernel/gkernel-h.gc
index 7e03bf78a..c732b166a 100644
--- a/goal_src/jak1/kernel/gkernel-h.gc
+++ b/goal_src/jak1/kernel/gkernel-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: gkernel-h.gc
 ;; name in dgo: gkernel-h
diff --git a/goal_src/jak1/kernel/gkernel.gc b/goal_src/jak1/kernel/gkernel.gc
index a78ef3709..fe928bfd8 100644
--- a/goal_src/jak1/kernel/gkernel.gc
+++ b/goal_src/jak1/kernel/gkernel.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel/gkernel-h.gc")
+(require "kernel/gstring-h.gc")
 
 ;; name: gkernel.gc
 ;; name in dgo: gkernel
@@ -89,6 +93,9 @@
     )
   )
 
+(define *test-vec4s* (new 'static 'vec4s :x 0. :y 0. :z 0. :w 0.))
+(inspect *test-vec4s*)
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Kernel Globals
diff --git a/goal_src/jak1/kernel/gstate.gc b/goal_src/jak1/kernel/gstate.gc
index 7c0f29fd8..01bac7281 100644
--- a/goal_src/jak1/kernel/gstate.gc
+++ b/goal_src/jak1/kernel/gstate.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel/gkernel.gc")
 
 ;; name: gstate.gc
 ;; name in dgo: gstate
@@ -158,11 +161,14 @@ It type checks the arguments for the entry function.
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
-
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -225,8 +231,8 @@ It type checks the arguments for the entry function.
          ;; This way it can check the individual function types, make sure they make sense, and create
          ;; a state with the appropriate type.
          ,(if virtual
-              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
-              `(define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
 
          )
diff --git a/goal_src/jak1/kernel/gstring-h.gc b/goal_src/jak1/kernel/gstring-h.gc
index 7947bd7c3..9279725f2 100644
--- a/goal_src/jak1/kernel/gstring-h.gc
+++ b/goal_src/jak1/kernel/gstring-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel-defs.gc")
 
 ;; name: gstring-h.gc
 ;; name in dgo: gstring-h
diff --git a/goal_src/jak1/kernel/gstring.gc b/goal_src/jak1/kernel/gstring.gc
index f564573a1..598260887 100644
--- a/goal_src/jak1/kernel/gstring.gc
+++ b/goal_src/jak1/kernel/gstring.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel/gstring-h.gc")
+(require "kernel/gcommon.gc")
 
 ;; name: gstring.gc
 ;; name in dgo: gstring
diff --git a/goal_src/jak1/kernel/pskernel.gc b/goal_src/jak1/kernel/pskernel.gc
index 21dea5858..6d6447ab8 100644
--- a/goal_src/jak1/kernel/pskernel.gc
+++ b/goal_src/jak1/kernel/pskernel.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "KERNEL.CGO")
+
+(require "kernel/gcommon.gc")
 
 ;; name: pskernel.gc
 ;; name in dgo: pskernel
diff --git a/goal_src/jak1/levels/beach/air-h.gc b/goal_src/jak1/levels/beach/air-h.gc
index 6bf56a191..55813b8e0 100644
--- a/goal_src/jak1/levels/beach/air-h.gc
+++ b/goal_src/jak1/levels/beach/air-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/math/vector-h.gc")
 
 ;; name: air-h.gc
 ;; name in dgo: air-h
diff --git a/goal_src/jak1/levels/beach/air.gc b/goal_src/jak1/levels/beach/air.gc
index 4154de00e..f1f64e417 100644
--- a/goal_src/jak1/levels/beach/air.gc
+++ b/goal_src/jak1/levels/beach/air.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "levels/beach/air-h.gc")
+(require "engine/debug/debug-h.gc")
+(require "engine/math/math.gc")
 
 ;; name: air.gc
 ;; name in dgo: air
diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc
index 729768a36..48495a788 100644
--- a/goal_src/jak1/levels/beach/beach-obs.gc
+++ b/goal_src/jak1/levels/beach/beach-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "levels/beach/wobbler.gc")
 
 ;; name: beach-obs.gc
 ;; name in dgo: beach-obs
diff --git a/goal_src/jak1/levels/beach/beach-part.gc b/goal_src/jak1/levels/beach/beach-part.gc
index a6db46f5f..000ce7f3c 100644
--- a/goal_src/jak1/levels/beach/beach-part.gc
+++ b/goal_src/jak1/levels/beach/beach-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: beach-part.gc
 ;; name in dgo: beach-part
diff --git a/goal_src/jak1/levels/beach/beach-rocks.gc b/goal_src/jak1/levels/beach/beach-rocks.gc
index ae74bb34e..6ec04f021 100644
--- a/goal_src/jak1/levels/beach/beach-rocks.gc
+++ b/goal_src/jak1/levels/beach/beach-rocks.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/collectables.gc")
+(require "engine/anim/aligner.gc")
 
 ;; name: beach-rocks.gc
 ;; name in dgo: beach-rocks
diff --git a/goal_src/jak1/levels/beach/bird-lady-beach.gc b/goal_src/jak1/levels/beach/bird-lady-beach.gc
index 972684255..635ce4522 100644
--- a/goal_src/jak1/levels/beach/bird-lady-beach.gc
+++ b/goal_src/jak1/levels/beach/bird-lady-beach.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: bird-lady-beach.gc
 ;; name in dgo: bird-lady-beach
diff --git a/goal_src/jak1/levels/beach/bird-lady.gc b/goal_src/jak1/levels/beach/bird-lady.gc
index 5666ab9bf..d5433d871 100644
--- a/goal_src/jak1/levels/beach/bird-lady.gc
+++ b/goal_src/jak1/levels/beach/bird-lady.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: bird-lady.gc
 ;; name in dgo: bird-lady
diff --git a/goal_src/jak1/levels/beach/lurkercrab.gc b/goal_src/jak1/levels/beach/lurkercrab.gc
index 22f951099..bc5b4df69 100644
--- a/goal_src/jak1/levels/beach/lurkercrab.gc
+++ b/goal_src/jak1/levels/beach/lurkercrab.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
+(require "engine/target/target-util.gc")
 
 ;; name: lurkercrab.gc
 ;; name in dgo: lurkercrab
diff --git a/goal_src/jak1/levels/beach/lurkerpuppy.gc b/goal_src/jak1/levels/beach/lurkerpuppy.gc
index d3b432a12..02fdf38f9 100644
--- a/goal_src/jak1/levels/beach/lurkerpuppy.gc
+++ b/goal_src/jak1/levels/beach/lurkerpuppy.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: lurkerpuppy.gc
 ;; name in dgo: lurkerpuppy
diff --git a/goal_src/jak1/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc
index 13b1f8994..7a3625aca 100644
--- a/goal_src/jak1/levels/beach/lurkerworm.gc
+++ b/goal_src/jak1/levels/beach/lurkerworm.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
+(require "levels/beach/twister.gc")
 
 ;; name: lurkerworm.gc
 ;; name in dgo: lurkerworm
diff --git a/goal_src/jak1/levels/beach/mayor.gc b/goal_src/jak1/levels/beach/mayor.gc
index 330ae6ac1..432d737d7 100644
--- a/goal_src/jak1/levels/beach/mayor.gc
+++ b/goal_src/jak1/levels/beach/mayor.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: mayor.gc
 ;; name in dgo: mayor
diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc
index 936eeefa9..7ae0000ec 100644
--- a/goal_src/jak1/levels/beach/pelican.gc
+++ b/goal_src/jak1/levels/beach/pelican.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
+(require "engine/anim/aligner.gc")
+(require "engine/geometry/path.gc")
 
 ;; name: pelican.gc
 ;; name in dgo: pelican
diff --git a/goal_src/jak1/levels/beach/sculptor.gc b/goal_src/jak1/levels/beach/sculptor.gc
index 55f8f318a..d411b6ee8 100644
--- a/goal_src/jak1/levels/beach/sculptor.gc
+++ b/goal_src/jak1/levels/beach/sculptor.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: sculptor.gc
 ;; name in dgo: sculptor
diff --git a/goal_src/jak1/levels/beach/seagull.gc b/goal_src/jak1/levels/beach/seagull.gc
index 3e9967959..eff9d1d7a 100644
--- a/goal_src/jak1/levels/beach/seagull.gc
+++ b/goal_src/jak1/levels/beach/seagull.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "levels/beach/air.gc")
+(require "engine/geometry/path.gc")
+(require "engine/collide/collide-cache.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: seagull.gc
 ;; name in dgo: seagull
diff --git a/goal_src/jak1/levels/beach/twister.gc b/goal_src/jak1/levels/beach/twister.gc
index d0eaf6583..3c11938a0 100644
--- a/goal_src/jak1/levels/beach/twister.gc
+++ b/goal_src/jak1/levels/beach/twister.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/math/matrix.gc")
+(require "engine/math/vector.gc")
+(require "engine/game/game-h.gc")
 
 ;; name: twister.gc
 ;; name in dgo: twister
diff --git a/goal_src/jak1/levels/beach/wobbler.gc b/goal_src/jak1/levels/beach/wobbler.gc
index 77ff9c0cb..ea4b36dc4 100644
--- a/goal_src/jak1/levels/beach/wobbler.gc
+++ b/goal_src/jak1/levels/beach/wobbler.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO")
+
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/math/quaternion.gc")
 
 ;; name: wobbler.gc
 ;; name in dgo: wobbler
diff --git a/goal_src/jak1/levels/citadel/assistant-citadel.gc b/goal_src/jak1/levels/citadel/assistant-citadel.gc
index ec9d89f83..aebafb3cc 100644
--- a/goal_src/jak1/levels/citadel/assistant-citadel.gc
+++ b/goal_src/jak1/levels/citadel/assistant-citadel.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: assistant-citadel.gc
 ;; name in dgo: assistant-citadel
diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc
index fcc15f62c..43c59a676 100644
--- a/goal_src/jak1/levels/citadel/citadel-obs.gc
+++ b/goal_src/jak1/levels/citadel/citadel-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "engine/common-obs/plat.gc")
+(require "engine/common-obs/baseplat.gc")
+(require "engine/common-obs/basebutton.gc")
+(require "levels/common/battlecontroller.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: citadel-obs.gc
 ;; name in dgo: citadel-obs
diff --git a/goal_src/jak1/levels/citadel/citadel-part.gc b/goal_src/jak1/levels/citadel/citadel-part.gc
index 07f633fe6..4f4c59ea6 100644
--- a/goal_src/jak1/levels/citadel/citadel-part.gc
+++ b/goal_src/jak1/levels/citadel/citadel-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: citadel-part.gc
 ;; name in dgo: citadel-part
diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc
index 52ff1029b..d8a103833 100644
--- a/goal_src/jak1/levels/citadel/citadel-sages.gc
+++ b/goal_src/jak1/levels/citadel/citadel-sages.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "levels/village2/sage-bluehut.gc")
 
 ;; name: citadel-sages.gc
 ;; name in dgo: citadel-sages
diff --git a/goal_src/jak1/levels/citadel/citb-bunny.gc b/goal_src/jak1/levels/citadel/citb-bunny.gc
index 5d2f5852b..8f4bd2d46 100644
--- a/goal_src/jak1/levels/citadel/citb-bunny.gc
+++ b/goal_src/jak1/levels/citadel/citb-bunny.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "levels/snow/snow-bunny.gc")
 
 ;; name: citb-bunny.gc
 ;; name in dgo: citb-bunny
diff --git a/goal_src/jak1/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc
index 625bd2635..47ab24753 100644
--- a/goal_src/jak1/levels/citadel/citb-drop-plat.gc
+++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: citb-drop-plat-CIT.gc
 ;; name in dgo: citb-drop-plat
diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc
index 20823abce..8c0b74798 100644
--- a/goal_src/jak1/levels/citadel/citb-plat.gc
+++ b/goal_src/jak1/levels/citadel/citb-plat.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/common-obs/plat-eco.gc")
+(require "engine/common-obs/plat-button.gc")
 
 ;; name: citb-plat.gc
 ;; name in dgo: citb-plat
diff --git a/goal_src/jak1/levels/common/battlecontroller.gc b/goal_src/jak1/levels/common/battlecontroller.gc
index f0d0d06ef..4795b6a0f 100644
--- a/goal_src/jak1/levels/common/battlecontroller.gc
+++ b/goal_src/jak1/levels/common/battlecontroller.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO" "MIS.DGO" "SWA.DGO")
+
+(require "engine/common-obs/babak.gc")
 
 ;; name: battlecontroller.gc
 ;; name in dgo: battlecontroller
diff --git a/goal_src/jak1/levels/common/blocking-plane.gc b/goal_src/jak1/levels/common/blocking-plane.gc
index 25722aa4a..0c4abc2fb 100644
--- a/goal_src/jak1/levels/common/blocking-plane.gc
+++ b/goal_src/jak1/levels/common/blocking-plane.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO" "SNO.DGO" "SWA.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: blocking-plane.gc
 ;; name in dgo: blocking-plane
diff --git a/goal_src/jak1/levels/common/launcherdoor.gc b/goal_src/jak1/levels/common/launcherdoor.gc
index d64cffefb..62cc9f2ed 100644
--- a/goal_src/jak1/levels/common/launcherdoor.gc
+++ b/goal_src/jak1/levels/common/launcherdoor.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO" "MAI.DGO" "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: launcherdoor.gc
 ;; name in dgo: launcherdoor
diff --git a/goal_src/jak1/levels/darkcave/darkcave-obs.gc b/goal_src/jak1/levels/darkcave/darkcave-obs.gc
index 45bb26778..b2b65f938 100644
--- a/goal_src/jak1/levels/darkcave/darkcave-obs.gc
+++ b/goal_src/jak1/levels/darkcave/darkcave-obs.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "DAR.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "levels/maincave/cavecrystal-light.gc")
 
 ;; name: darkcave-obs.gc
 ;; name in dgo: darkcave-obs
diff --git a/goal_src/jak1/levels/demo/demo-obs.gc b/goal_src/jak1/levels/demo/demo-obs.gc
index e6be9d044..b9f3e24d9 100644
--- a/goal_src/jak1/levels/demo/demo-obs.gc
+++ b/goal_src/jak1/levels/demo/demo-obs.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "DEM.DGO")
+
+(require "engine/target/logic-target.gc")
+(require "levels/demo/static-screen.gc")
 
 ;; name: demo-obs.gc
 ;; name in dgo: demo-obs
diff --git a/goal_src/jak1/levels/demo/static-screen.gc b/goal_src/jak1/levels/demo/static-screen.gc
index e1f216fa2..b95af9ae3 100644
--- a/goal_src/jak1/levels/demo/static-screen.gc
+++ b/goal_src/jak1/levels/demo/static-screen.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "DEM.DGO" "TIT.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+(require "engine/ui/hud-h.gc")
+(require "engine/game/settings.gc")
 
 ;; name: static-screen.gc
 ;; name in dgo: static-screen
diff --git a/goal_src/jak1/levels/finalboss/final-door.gc b/goal_src/jak1/levels/finalboss/final-door.gc
index 827d07036..aef2d4949 100644
--- a/goal_src/jak1/levels/finalboss/final-door.gc
+++ b/goal_src/jak1/levels/finalboss/final-door.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/game/main.gc")
+(require "engine/physics/trajectory.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/target/logic-target.gc")
 
 ;; name: final-door.gc
 ;; name in dgo: final-door
diff --git a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
index 39e8c4ee7..848fe28ba 100644
--- a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
+++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "levels/snow/snow-ram-boss.gc")
 
 ;; name: green-eco-lurker.gc
 ;; name in dgo: green-eco-lurker
diff --git a/goal_src/jak1/levels/finalboss/light-eco.gc b/goal_src/jak1/levels/finalboss/light-eco.gc
index 4dce6400d..b7bd813dc 100644
--- a/goal_src/jak1/levels/finalboss/light-eco.gc
+++ b/goal_src/jak1/levels/finalboss/light-eco.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/game/projectiles-h.gc")
+(require "engine/physics/trajectory.gc")
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: light-eco.gc
 ;; name in dgo: light-eco
diff --git a/goal_src/jak1/levels/finalboss/robotboss-h.gc b/goal_src/jak1/levels/finalboss/robotboss-h.gc
index 0997f778a..1bfc7c05f 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-h.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/data/art-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
 
 ;; name: robotboss-h.gc
 ;; name in dgo: robotboss-h
diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc
index 29df8e3ab..88d98880a 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "levels/finalboss/robotboss-h.gc")
+(require "levels/citadel/citadel-sages.gc")
 
 ;; name: robotboss-misc.gc
 ;; name in dgo: robotboss-misc
diff --git a/goal_src/jak1/levels/finalboss/robotboss-part.gc b/goal_src/jak1/levels/finalboss/robotboss-part.gc
index 71bd3fce9..34ec76fff 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-part.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-part.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: robotboss-part.gc
 ;; name in dgo: robotboss-part
diff --git a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
index f9a3c40b5..008b886d8 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/common-obs/process-drawable.gc")
 
 ;; name: robotboss-weapon.gc
 ;; name in dgo: robotboss-weapon
diff --git a/goal_src/jak1/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc
index caba026f2..3eb1dcac3 100644
--- a/goal_src/jak1/levels/finalboss/robotboss.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "levels/finalboss/light-eco.gc")
+(require "levels/finalboss/robotboss-misc.gc")
+(require "levels/finalboss/robotboss-weapon.gc")
+(require "levels/finalboss/green-eco-lurker.gc")
 
 ;; name: robotboss.gc
 ;; name in dgo: robotboss
diff --git a/goal_src/jak1/levels/finalboss/sage-finalboss-part.gc b/goal_src/jak1/levels/finalboss/sage-finalboss-part.gc
index 0efa11831..1ab6b3b3c 100644
--- a/goal_src/jak1/levels/finalboss/sage-finalboss-part.gc
+++ b/goal_src/jak1/levels/finalboss/sage-finalboss-part.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
 
 ;; name: sage-finalboss-part.gc
 ;; name in dgo: sage-finalboss-part
diff --git a/goal_src/jak1/levels/finalboss/sage-finalboss.gc b/goal_src/jak1/levels/finalboss/sage-finalboss.gc
index 0e8276af4..dced65273 100644
--- a/goal_src/jak1/levels/finalboss/sage-finalboss.gc
+++ b/goal_src/jak1/levels/finalboss/sage-finalboss.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIN.DGO")
+
+(require "engine/common-obs/plat-eco.gc")
+(require "levels/finalboss/robotboss-misc.gc")
+(require "levels/finalboss/final-door.gc")
+(require "engine/ui/credits.gc")
 
 ;; name: sage-finalboss-FIN.gc
 ;; name in dgo: sage-finalboss
diff --git a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
index 00afaa2e7..716cce3fe 100644
--- a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
+++ b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: assistant-firecanyon.gc
 ;; name in dgo: assistant-firecanyon
diff --git a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
index a5d91f3a5..0076ec980 100644
--- a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
+++ b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "OGR.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: firecanyon-obs.gc
 ;; name in dgo: firecanyon-obs
diff --git a/goal_src/jak1/levels/firecanyon/firecanyon-part.gc b/goal_src/jak1/levels/firecanyon/firecanyon-part.gc
index d99b9ae15..fd1c49ae0 100644
--- a/goal_src/jak1/levels/firecanyon/firecanyon-part.gc
+++ b/goal_src/jak1/levels/firecanyon/firecanyon-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: firecanyon-part.gc
 ;; name in dgo: firecanyon-part
diff --git a/goal_src/jak1/levels/flut_common/flut-part.gc b/goal_src/jak1/levels/flut_common/flut-part.gc
index 748f6d508..f64251e67 100644
--- a/goal_src/jak1/levels/flut_common/flut-part.gc
+++ b/goal_src/jak1/levels/flut_common/flut-part.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO" "SWA.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: flut-part.gc
 ;; name in dgo: flut-part
diff --git a/goal_src/jak1/levels/flut_common/flutflut.gc b/goal_src/jak1/levels/flut_common/flutflut.gc
index 7d785c277..8834f09b7 100644
--- a/goal_src/jak1/levels/flut_common/flutflut.gc
+++ b/goal_src/jak1/levels/flut_common/flutflut.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO" "SWA.DGO")
+
+(require "levels/common/blocking-plane.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/entity/ambient.gc")
 
 ;; name: flutflut.gc
 ;; name in dgo: flutflut
diff --git a/goal_src/jak1/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc
index 145ae1be3..7f602f5cf 100644
--- a/goal_src/jak1/levels/flut_common/target-flut.gc
+++ b/goal_src/jak1/levels/flut_common/target-flut.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO" "SWA.DGO")
+
+(require "engine/game/projectiles-h.gc")
+(require "engine/target/target-death.gc")
+(require "engine/anim/aligner.gc")
+(require "engine/common-obs/water.gc")
+(require "levels/flut_common/flutflut.gc")
+(require "engine/common-obs/nav-enemy-h.gc")
 
 ;; name: target-flut.gc
 ;; name in dgo: target-flut
diff --git a/goal_src/jak1/levels/intro/evilbro.gc b/goal_src/jak1/levels/intro/evilbro.gc
index 8c365c607..c07eeba74 100644
--- a/goal_src/jak1/levels/intro/evilbro.gc
+++ b/goal_src/jak1/levels/intro/evilbro.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "INT.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: evilbro.gc
 ;; name in dgo: evilbro
diff --git a/goal_src/jak1/levels/jungle/bouncer.gc b/goal_src/jak1/levels/jungle/bouncer.gc
index 43c38c778..38f3ff848 100644
--- a/goal_src/jak1/levels/jungle/bouncer.gc
+++ b/goal_src/jak1/levels/jungle/bouncer.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/entity/entity.gc")
 
 ;; name: bouncer.gc
 ;; name in dgo: bouncer
diff --git a/goal_src/jak1/levels/jungle/darkvine.gc b/goal_src/jak1/levels/jungle/darkvine.gc
index 8fc6654dd..30b25b6df 100644
--- a/goal_src/jak1/levels/jungle/darkvine.gc
+++ b/goal_src/jak1/levels/jungle/darkvine.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: darkvine.gc
 ;; name in dgo: darkvine
diff --git a/goal_src/jak1/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc
index 61c02b597..3a1ab3952 100644
--- a/goal_src/jak1/levels/jungle/fisher.gc
+++ b/goal_src/jak1/levels/jungle/fisher.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/process-taskable.gc")
+(require "engine/target/logic-target.gc")
+(require "engine/target/sidekick.gc")
 
 ;; name: fisher-JUN.gc
 ;; name in dgo: fisher
diff --git a/goal_src/jak1/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc
index c2ad3df8f..e261d286f 100644
--- a/goal_src/jak1/levels/jungle/hopper.gc
+++ b/goal_src/jak1/levels/jungle/hopper.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: hopper.gc
 ;; name in dgo: hopper
diff --git a/goal_src/jak1/levels/jungle/jungle-elevator.gc b/goal_src/jak1/levels/jungle/jungle-elevator.gc
index a274a924e..fcb053505 100644
--- a/goal_src/jak1/levels/jungle/jungle-elevator.gc
+++ b/goal_src/jak1/levels/jungle/jungle-elevator.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/plat-button.gc")
 
 ;; name: jungle-elevator.gc
 ;; name in dgo: jungle-elevator
diff --git a/goal_src/jak1/levels/jungle/jungle-mirrors.gc b/goal_src/jak1/levels/jungle/jungle-mirrors.gc
index 663d534fd..a65b4f212 100644
--- a/goal_src/jak1/levels/jungle/jungle-mirrors.gc
+++ b/goal_src/jak1/levels/jungle/jungle-mirrors.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/entity/ambient.gc")
+(require "engine/collide/collide-cache.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: jungle-mirrors.gc
 ;; name in dgo: jungle-mirrors
diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc
index ed535f650..0905fe4ba 100644
--- a/goal_src/jak1/levels/jungle/jungle-obs.gc
+++ b/goal_src/jak1/levels/jungle/jungle-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/util/sync-info.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/common-obs/baseplat.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: jungle-obs.gc
 ;; name in dgo: jungle-obs
diff --git a/goal_src/jak1/levels/jungle/jungle-part.gc b/goal_src/jak1/levels/jungle/jungle-part.gc
index a3ceac72e..477d7b5a1 100644
--- a/goal_src/jak1/levels/jungle/jungle-part.gc
+++ b/goal_src/jak1/levels/jungle/jungle-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: jungle-part.gc
 ;; name in dgo: jungle-part
diff --git a/goal_src/jak1/levels/jungle/junglefish.gc b/goal_src/jak1/levels/jungle/junglefish.gc
index 1cb5d15bd..4ec2b1514 100644
--- a/goal_src/jak1/levels/jungle/junglefish.gc
+++ b/goal_src/jak1/levels/jungle/junglefish.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
+(require "engine/common-obs/water.gc")
 
 ;; name: junglefish.gc
 ;; name in dgo: junglefish
diff --git a/goal_src/jak1/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc
index f10f9aac9..ff19e4dbf 100644
--- a/goal_src/jak1/levels/jungle/junglesnake.gc
+++ b/goal_src/jak1/levels/jungle/junglesnake.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUN.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: junglesnake.gc
 ;; name in dgo: junglesnake
diff --git a/goal_src/jak1/levels/jungleb/aphid.gc b/goal_src/jak1/levels/jungleb/aphid.gc
index 8e4891137..b24f8ea48 100644
--- a/goal_src/jak1/levels/jungleb/aphid.gc
+++ b/goal_src/jak1/levels/jungleb/aphid.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUB.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: aphid.gc
 ;; name in dgo: aphid
diff --git a/goal_src/jak1/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc
index bafcd79ad..9f06027d0 100644
--- a/goal_src/jak1/levels/jungleb/jungleb-obs.gc
+++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUB.DGO")
+
+(require "engine/common-obs/baseplat.gc")
+(require "engine/entity/entity.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: jungleb-obs.gc
 ;; name in dgo: jungleb-obs
diff --git a/goal_src/jak1/levels/jungleb/plant-boss.gc b/goal_src/jak1/levels/jungleb/plant-boss.gc
index b2fae13fa..54d670738 100644
--- a/goal_src/jak1/levels/jungleb/plant-boss.gc
+++ b/goal_src/jak1/levels/jungleb/plant-boss.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUB.DGO")
+
+(require "levels/jungleb/aphid.gc")
 
 ;; name: plant-boss.gc
 ;; name in dgo: plant-boss
diff --git a/goal_src/jak1/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc
index 8479088c0..38ef0fa6c 100644
--- a/goal_src/jak1/levels/jungleb/plat-flip.gc
+++ b/goal_src/jak1/levels/jungleb/plat-flip.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "JUB.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: plat-flip.gc
 ;; name in dgo: plat-flip
diff --git a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
index 6bbc10ece..5fca46211 100644
--- a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
+++ b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "LAV.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: assistant-lavatube.gc
 ;; name in dgo: assistant-lavatube
diff --git a/goal_src/jak1/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc
index 60b779c37..10cbe9df5 100644
--- a/goal_src/jak1/levels/lavatube/lavatube-energy.gc
+++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "LAV.DGO")
+
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/game/task/hint-control.gc")
 
 ;; name: lavatube-energy.gc
 ;; name in dgo: lavatube-energy
diff --git a/goal_src/jak1/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc
index 8883434ad..b4c247b9b 100644
--- a/goal_src/jak1/levels/lavatube/lavatube-obs.gc
+++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "LAV.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/common-obs/water-anim.gc")
 
 ;; name: lavatube-obs.gc
 ;; name in dgo: lavatube-obs
diff --git a/goal_src/jak1/levels/lavatube/lavatube-part.gc b/goal_src/jak1/levels/lavatube/lavatube-part.gc
index a30717ced..b1322d307 100644
--- a/goal_src/jak1/levels/lavatube/lavatube-part.gc
+++ b/goal_src/jak1/levels/lavatube/lavatube-part.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "LAV.DGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/sound/gsound-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: lavatube-part.gc
 ;; name in dgo: lavatube-part
diff --git a/goal_src/jak1/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc
index bf22114ea..0e42a2e06 100644
--- a/goal_src/jak1/levels/maincave/baby-spider.gc
+++ b/goal_src/jak1/levels/maincave/baby-spider.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "levels/maincave/cavecrystal-light.gc")
+(require "levels/snow/snow-ram-boss.gc")
 
 ;; name: baby-spider.gc
 ;; name in dgo: baby-spider
diff --git a/goal_src/jak1/levels/maincave/cavecrystal-light.gc b/goal_src/jak1/levels/maincave/cavecrystal-light.gc
index 3cd9439b4..40a8b5227 100644
--- a/goal_src/jak1/levels/maincave/cavecrystal-light.gc
+++ b/goal_src/jak1/levels/maincave/cavecrystal-light.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/anim/joint-h.gc")
+(require "engine/gfx/mood/time-of-day.gc")
 
 ;; name: cavecrystal-light.gc
 ;; name in dgo: cavecrystal-light
diff --git a/goal_src/jak1/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc
index d78abc550..8ce4fe891 100644
--- a/goal_src/jak1/levels/maincave/dark-crystal.gc
+++ b/goal_src/jak1/levels/maincave/dark-crystal.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/anim/joint-exploder.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: dark-crystal.gc
 ;; name in dgo: dark-crystal
diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc
index 96c099056..18899b387 100644
--- a/goal_src/jak1/levels/maincave/driller-lurker.gc
+++ b/goal_src/jak1/levels/maincave/driller-lurker.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "levels/maincave/cavecrystal-light.gc")
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: driller-lurker.gc
 ;; name in dgo: driller-lurker
diff --git a/goal_src/jak1/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc
index c814fefce..a078f1958 100644
--- a/goal_src/jak1/levels/maincave/gnawer.gc
+++ b/goal_src/jak1/levels/maincave/gnawer.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/game/task/task-control.gc")
+(require "engine/geometry/path.gc")
+(require "levels/maincave/maincave-obs.gc")
 
 ;; name: gnawer.gc
 ;; name in dgo: gnawer
diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc
index bdf87e45a..a30dd379b 100644
--- a/goal_src/jak1/levels/maincave/maincave-obs.gc
+++ b/goal_src/jak1/levels/maincave/maincave-obs.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "levels/maincave/cavecrystal-light.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/geometry/path-h.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: maincave-obs.gc
 ;; name in dgo: maincave-obs
diff --git a/goal_src/jak1/levels/maincave/maincave-part.gc b/goal_src/jak1/levels/maincave/maincave-part.gc
index 5bb067970..3e5928cb1 100644
--- a/goal_src/jak1/levels/maincave/maincave-part.gc
+++ b/goal_src/jak1/levels/maincave/maincave-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: maincave-part.gc
 ;; name in dgo: maincave-part
diff --git a/goal_src/jak1/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc
index e8b7cab9a..79f5d7f9c 100644
--- a/goal_src/jak1/levels/maincave/mother-spider-egg.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/gfx/shadow/shadow.gc")
+(require "levels/maincave/cavecrystal-light.gc")
+(require "engine/physics/trajectory.gc")
+(require "engine/common-obs/process-drawable.gc")
+(require "engine/nav/navigate-h.gc")
 
 ;; name: mother-spider-egg.gc
 ;; name in dgo: mother-spider-egg
diff --git a/goal_src/jak1/levels/maincave/mother-spider-h.gc b/goal_src/jak1/levels/maincave/mother-spider-h.gc
index e22458f16..7ce4e8a55 100644
--- a/goal_src/jak1/levels/maincave/mother-spider-h.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider-h.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/game/game-h.gc")
+(require "kernel/gcommon.gc")
 
 ;; name: mother-spider-h.gc
 ;; name in dgo: mother-spider-h
diff --git a/goal_src/jak1/levels/maincave/mother-spider-proj.gc b/goal_src/jak1/levels/maincave/mother-spider-proj.gc
index 9dc98340f..dee815ab7 100644
--- a/goal_src/jak1/levels/maincave/mother-spider-proj.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider-proj.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/game/projectiles.gc")
 
 ;; name: mother-spider-proj.gc
 ;; name in dgo: mother-spider-proj
diff --git a/goal_src/jak1/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc
index 739b1629a..50660686e 100644
--- a/goal_src/jak1/levels/maincave/mother-spider.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "levels/maincave/mother-spider-egg.gc")
+(require "levels/maincave/mother-spider-proj.gc")
+(require "levels/maincave/baby-spider.gc")
+(require "levels/maincave/mother-spider-h.gc")
 
 ;; name: mother-spider.gc
 ;; name in dgo: mother-spider
diff --git a/goal_src/jak1/levels/maincave/spiderwebs.gc b/goal_src/jak1/levels/maincave/spiderwebs.gc
index 3f002f85c..97100b41e 100644
--- a/goal_src/jak1/levels/maincave/spiderwebs.gc
+++ b/goal_src/jak1/levels/maincave/spiderwebs.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MAI.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: spiderwebs.gc
 ;; name in dgo: spiderwebs
diff --git a/goal_src/jak1/levels/misty/babak-with-cannon.gc b/goal_src/jak1/levels/misty/babak-with-cannon.gc
index 688180f22..9130ab986 100644
--- a/goal_src/jak1/levels/misty/babak-with-cannon.gc
+++ b/goal_src/jak1/levels/misty/babak-with-cannon.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO" "MIS.DGO")
+
+(require "levels/misty/mistycannon.gc")
+(require "engine/common-obs/babak.gc")
 
 ;; name: babak-with-cannon.gc
 ;; name in dgo: babak-with-cannon
diff --git a/goal_src/jak1/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc
index df197b63d..1702cc32e 100644
--- a/goal_src/jak1/levels/misty/balloonlurker.gc
+++ b/goal_src/jak1/levels/misty/balloonlurker.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: balloonlurker.gc
 ;; name in dgo: balloonlurker
diff --git a/goal_src/jak1/levels/misty/bonelurker.gc b/goal_src/jak1/levels/misty/bonelurker.gc
index 4a986f343..387020ce3 100644
--- a/goal_src/jak1/levels/misty/bonelurker.gc
+++ b/goal_src/jak1/levels/misty/bonelurker.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: bonelurker.gc
 ;; name in dgo: bonelurker
diff --git a/goal_src/jak1/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc
index 5d17bd4bf..9e2052d26 100644
--- a/goal_src/jak1/levels/misty/misty-conveyor.gc
+++ b/goal_src/jak1/levels/misty/misty-conveyor.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/anim/joint-mod-h.gc")
 
 ;; name: misty-conveyor.gc
 ;; name in dgo: misty-conveyor
diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc
index ee5c9963c..8ef106272 100644
--- a/goal_src/jak1/levels/misty/misty-obs.gc
+++ b/goal_src/jak1/levels/misty/misty-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "levels/common/battlecontroller.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: misty-obs.gc
 ;; name in dgo: misty-obs
diff --git a/goal_src/jak1/levels/misty/misty-part.gc b/goal_src/jak1/levels/misty/misty-part.gc
index 7b4747ad8..952872707 100644
--- a/goal_src/jak1/levels/misty/misty-part.gc
+++ b/goal_src/jak1/levels/misty/misty-part.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/sound/gsound-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: misty-part.gc
 ;; name in dgo: misty-part
diff --git a/goal_src/jak1/levels/misty/misty-teetertotter.gc b/goal_src/jak1/levels/misty/misty-teetertotter.gc
index ba5f1f6ec..dd11868cd 100644
--- a/goal_src/jak1/levels/misty/misty-teetertotter.gc
+++ b/goal_src/jak1/levels/misty/misty-teetertotter.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/game/task/hint-control.gc")
 
 ;; name: misty-teetertotter.gc
 ;; name in dgo: misty-teetertotter
diff --git a/goal_src/jak1/levels/misty/misty-warehouse.gc b/goal_src/jak1/levels/misty/misty-warehouse.gc
index 569c421a7..e9bc0076b 100644
--- a/goal_src/jak1/levels/misty/misty-warehouse.gc
+++ b/goal_src/jak1/levels/misty/misty-warehouse.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: misty-warehouse.gc
 ;; name in dgo: misty-warehouse
diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc
index 7150b0d88..4305d1f1a 100644
--- a/goal_src/jak1/levels/misty/mistycannon.gc
+++ b/goal_src/jak1/levels/misty/mistycannon.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "BEA.DGO" "MIS.DGO")
+
+(require "engine/gfx/shadow/shadow.gc")
+(require "engine/common-obs/water.gc")
+(require "engine/entity/ambient.gc")
 
 ;; name: mistycannon.gc
 ;; name in dgo: mistycannon
diff --git a/goal_src/jak1/levels/misty/mud.gc b/goal_src/jak1/levels/misty/mud.gc
index a7a9c0818..e5459e56d 100644
--- a/goal_src/jak1/levels/misty/mud.gc
+++ b/goal_src/jak1/levels/misty/mud.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/water-anim.gc")
 
 ;; name: mud.gc
 ;; name in dgo: mud
diff --git a/goal_src/jak1/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc
index ead194ea2..a32617ad5 100644
--- a/goal_src/jak1/levels/misty/muse.gc
+++ b/goal_src/jak1/levels/misty/muse.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: muse.gc
 ;; name in dgo: muse
diff --git a/goal_src/jak1/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc
index 824476043..1f7fb0331 100644
--- a/goal_src/jak1/levels/misty/quicksandlurker.gc
+++ b/goal_src/jak1/levels/misty/quicksandlurker.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "engine/common-obs/water-anim.gc")
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: quicksandlurker.gc
 ;; name in dgo: quicksandlurker
diff --git a/goal_src/jak1/levels/misty/sidekick-human.gc b/goal_src/jak1/levels/misty/sidekick-human.gc
index 56510d30f..ac621e87e 100644
--- a/goal_src/jak1/levels/misty/sidekick-human.gc
+++ b/goal_src/jak1/levels/misty/sidekick-human.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "MIS.DGO")
+
+(require "levels/village1/sequence-a-village1.gc")
+(require "engine/common-obs/babak.gc")
+(require "levels/intro/evilbro.gc")
 
 ;; name: sidekick-human.gc
 ;; name in dgo: sidekick-human
diff --git a/goal_src/jak1/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc
index 52cc63a39..0d8d6f0a8 100644
--- a/goal_src/jak1/levels/ogre/flying-lurker.gc
+++ b/goal_src/jak1/levels/ogre/flying-lurker.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "OGR.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/collide/collide-cache.gc")
+(require "engine/entity/entity.gc")
 
 ;; name: flying-lurker.gc
 ;; name in dgo: flying-lurker
diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc
index 5272842b0..4ebaa1ec2 100644
--- a/goal_src/jak1/levels/ogre/ogre-obs.gc
+++ b/goal_src/jak1/levels/ogre/ogre-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "OGR.DGO")
+
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/game/projectiles.gc")
+(require "engine/common-obs/rigid-body.gc")
 
 ;; name: ogre-obs.gc
 ;; name in dgo: ogre-obs
diff --git a/goal_src/jak1/levels/ogre/ogre-part.gc b/goal_src/jak1/levels/ogre/ogre-part.gc
index 90b0431dc..445c9abae 100644
--- a/goal_src/jak1/levels/ogre/ogre-part.gc
+++ b/goal_src/jak1/levels/ogre/ogre-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "OGR.DGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: ogre-part.gc
 ;; name in dgo: ogre-part
diff --git a/goal_src/jak1/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc
index c1a8818a5..71128eaea 100644
--- a/goal_src/jak1/levels/ogre/ogreboss.gc
+++ b/goal_src/jak1/levels/ogre/ogreboss.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "OGR.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/collide/collide-cache.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/physics/trajectory.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: ogreboss.gc
 ;; name in dgo: ogreboss
diff --git a/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc b/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc
index dd78718af..51a596a00 100644
--- a/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc
+++ b/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "engine/target/collide-reaction-target.gc")
 
 ;; name: collide-reaction-racer.gc
 ;; name in dgo: collide-reaction-racer
diff --git a/goal_src/jak1/levels/racer_common/racer-part.gc b/goal_src/jak1/levels/racer_common/racer-part.gc
index 7b0eab9cc..eaca6f4b1 100644
--- a/goal_src/jak1/levels/racer_common/racer-part.gc
+++ b/goal_src/jak1/levels/racer_common/racer-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "engine/ui/hud.gc")
+(require "levels/racer_common/target-racer-h.gc")
 
 ;; name: racer-part.gc
 ;; name in dgo: racer-part
diff --git a/goal_src/jak1/levels/racer_common/racer-states.gc b/goal_src/jak1/levels/racer_common/racer-states.gc
index c43f8565f..dd1c11c34 100644
--- a/goal_src/jak1/levels/racer_common/racer-states.gc
+++ b/goal_src/jak1/levels/racer_common/racer-states.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "levels/racer_common/target-racer.gc")
+(require "engine/common-obs/babak.gc")
+(require "engine/target/target.gc")
+(require "levels/racer_common/racer-part.gc")
+(require "engine/common-obs/water.gc")
+(require "engine/anim/joint-exploder.gc")
 
 ;; name: racer-states-FIC-LAV-MIS-OGR-ROL.gc
 ;; name in dgo: racer-states
diff --git a/goal_src/jak1/levels/racer_common/racer.gc b/goal_src/jak1/levels/racer_common/racer.gc
index 6e01019f3..3f64edd6c 100644
--- a/goal_src/jak1/levels/racer_common/racer.gc
+++ b/goal_src/jak1/levels/racer_common/racer.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "levels/common/blocking-plane.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/entity/ambient.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: racer.gc
 ;; name in dgo: racer
diff --git a/goal_src/jak1/levels/racer_common/target-racer-h.gc b/goal_src/jak1/levels/racer_common/target-racer-h.gc
index c469d009e..c9ea1d3dd 100644
--- a/goal_src/jak1/levels/racer_common/target-racer-h.gc
+++ b/goal_src/jak1/levels/racer_common/target-racer-h.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "engine/math/vector-h.gc")
+(require "engine/collide/surface-h.gc")
+(require "engine/data/art-h.gc")
 
 ;; name: target-racer-h-FIC-LAV-MIS-OGR-ROL.gc
 ;; name in dgo: target-racer-h
diff --git a/goal_src/jak1/levels/racer_common/target-racer.gc b/goal_src/jak1/levels/racer_common/target-racer.gc
index b0be63eb1..2864f88be 100644
--- a/goal_src/jak1/levels/racer_common/target-racer.gc
+++ b/goal_src/jak1/levels/racer_common/target-racer.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO")
+
+(require "levels/racer_common/target-racer-h.gc")
+(require "engine/game/projectiles-h.gc")
+(require "levels/racer_common/racer.gc")
+(require "engine/target/logic-target.gc")
+(require "engine/game/effect-control.gc")
 
 ;; name: target-racer-FIC-LAV-MIS-OGR-ROL.gc
 ;; name in dgo: target-racer
diff --git a/goal_src/jak1/levels/robocave/cave-trap.gc b/goal_src/jak1/levels/robocave/cave-trap.gc
index 84fae44e6..4e33b2b4a 100644
--- a/goal_src/jak1/levels/robocave/cave-trap.gc
+++ b/goal_src/jak1/levels/robocave/cave-trap.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROB.DGO")
+
+(require "levels/maincave/baby-spider.gc")
 
 ;; name: cave-trap.gc
 ;; name in dgo: cave-trap
diff --git a/goal_src/jak1/levels/robocave/robocave-part.gc b/goal_src/jak1/levels/robocave/robocave-part.gc
index 4ab634828..81ab1e03c 100644
--- a/goal_src/jak1/levels/robocave/robocave-part.gc
+++ b/goal_src/jak1/levels/robocave/robocave-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROB.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: robocave-part.gc
 ;; name in dgo: robocave-part
diff --git a/goal_src/jak1/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc
index 1f1c515a3..c9abf31c8 100644
--- a/goal_src/jak1/levels/robocave/spider-egg.gc
+++ b/goal_src/jak1/levels/robocave/spider-egg.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROB.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: spider-egg.gc
 ;; name in dgo: spider-egg
diff --git a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
index 2e7b54b94..acd89ccf0 100644
--- a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
+++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROL.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: rolling-lightning-mole.gc
 ;; name in dgo: rolling-lightning-mole
diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc
index 18fc25e46..998f08942 100644
--- a/goal_src/jak1/levels/rolling/rolling-obs.gc
+++ b/goal_src/jak1/levels/rolling/rolling-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROL.DGO")
+
+(require "engine/util/sync-info.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/ticky.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/common-obs/water-anim.gc")
 
 ;; name: rolling-obs.gc
 ;; name in dgo: rolling-obs
diff --git a/goal_src/jak1/levels/rolling/rolling-race-ring.gc b/goal_src/jak1/levels/rolling/rolling-race-ring.gc
index 673fd0697..c68f15b4f 100644
--- a/goal_src/jak1/levels/rolling/rolling-race-ring.gc
+++ b/goal_src/jak1/levels/rolling/rolling-race-ring.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROL.DGO")
+
+(require "engine/common-obs/collectables.gc")
 
 ;; name: rolling-race-ring.gc
 ;; name in dgo: rolling-race-ring
diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc
index 04a0e8e37..79c6aae94 100644
--- a/goal_src/jak1/levels/rolling/rolling-robber.gc
+++ b/goal_src/jak1/levels/rolling/rolling-robber.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "ROL.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: rolling-robber.gc
 ;; name in dgo: rolling-robber
diff --git a/goal_src/jak1/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc
index 0c406610a..c7e1a0071 100644
--- a/goal_src/jak1/levels/snow/ice-cube.gc
+++ b/goal_src/jak1/levels/snow/ice-cube.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "levels/sunken/double-lurker.gc")
+(require "engine/anim/joint-exploder.gc")
 
 ;; name: ice-cube.gc
 ;; name in dgo: ice-cube
diff --git a/goal_src/jak1/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc
index 07615e2ec..19a5b6255 100644
--- a/goal_src/jak1/levels/snow/snow-ball.gc
+++ b/goal_src/jak1/levels/snow/snow-ball.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/geometry/path.gc")
+(require "engine/gfx/shadow/shadow-cpu.gc")
 
 ;; name: snow-ball.gc
 ;; name in dgo: snow-ball
diff --git a/goal_src/jak1/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc
index bdd01ec29..01adbbd4f 100644
--- a/goal_src/jak1/levels/snow/snow-bumper.gc
+++ b/goal_src/jak1/levels/snow/snow-bumper.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: snow-bumper.gc
 ;; name in dgo: snow-bumper
diff --git a/goal_src/jak1/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc
index 62c8532db..c567c4f9b 100644
--- a/goal_src/jak1/levels/snow/snow-bunny.gc
+++ b/goal_src/jak1/levels/snow/snow-bunny.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO" "SNO.DGO")
+
+(require "levels/snow/snow-ram-boss.gc")
 
 ;; name: snow-bunny.gc
 ;; name in dgo: snow-bunny
diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
index 234eb55b9..d8be4598c 100644
--- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
+++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/common-obs/plat-eco.gc")
+(require "engine/common-obs/ticky.gc")
 
 ;; name: snow-flutflut-obs.gc
 ;; name in dgo: snow-flutflut-obs
diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc
index 8b00849c8..0b8eb2b8c 100644
--- a/goal_src/jak1/levels/snow/snow-obs.gc
+++ b/goal_src/jak1/levels/snow/snow-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: snow-obs.gc
 ;; name in dgo: snow-obs
diff --git a/goal_src/jak1/levels/snow/snow-part.gc b/goal_src/jak1/levels/snow/snow-part.gc
index 5917d2eab..ce152a012 100644
--- a/goal_src/jak1/levels/snow/snow-part.gc
+++ b/goal_src/jak1/levels/snow/snow-part.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/hw/display-h.gc")
+(require "engine/math/matrix-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: snow-part.gc
 ;; name in dgo: snow-part
diff --git a/goal_src/jak1/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc
index 32b54829a..456c92a3a 100644
--- a/goal_src/jak1/levels/snow/snow-ram-boss.gc
+++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/game/projectiles.gc")
+(require "levels/snow/ice-cube.gc")
 
 ;; name: snow-ram-boss.gc
 ;; name in dgo: snow-ram-boss
diff --git a/goal_src/jak1/levels/snow/snow-ram-h.gc b/goal_src/jak1/levels/snow/snow-ram-h.gc
index 08182b0a9..02090b4cb 100644
--- a/goal_src/jak1/levels/snow/snow-ram-h.gc
+++ b/goal_src/jak1/levels/snow/snow-ram-h.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/game/game-h.gc")
 
 ;; name: snow-ram-h.gc
 ;; name in dgo: snow-ram-h
diff --git a/goal_src/jak1/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc
index 2485cf0ff..c667d1378 100644
--- a/goal_src/jak1/levels/snow/snow-ram.gc
+++ b/goal_src/jak1/levels/snow/snow-ram.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "levels/snow/snow-ram-h.gc")
+(require "levels/snow/snow-ram-boss.gc")
+(require "levels/snow/snow-obs.gc")
 
 ;; name: snow-ram.gc
 ;; name in dgo: snow-ram
diff --git a/goal_src/jak1/levels/snow/target-ice.gc b/goal_src/jak1/levels/snow/target-ice.gc
index e7757527d..88b665750 100644
--- a/goal_src/jak1/levels/snow/target-ice.gc
+++ b/goal_src/jak1/levels/snow/target-ice.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/target/target-handler.gc")
 
 ;; name: target-ice.gc
 ;; name in dgo: target-ice
diff --git a/goal_src/jak1/levels/snow/target-snowball.gc b/goal_src/jak1/levels/snow/target-snowball.gc
index 59fdd5ef9..7b85bf56a 100644
--- a/goal_src/jak1/levels/snow/target-snowball.gc
+++ b/goal_src/jak1/levels/snow/target-snowball.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/target/logic-target.gc")
 
 ;; name: target-snowball.gc
 ;; name in dgo: target-snowball
diff --git a/goal_src/jak1/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc
index 7a29b752b..7e98b87e5 100644
--- a/goal_src/jak1/levels/snow/yeti.gc
+++ b/goal_src/jak1/levels/snow/yeti.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SNO.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: yeti.gc
 ;; name in dgo: yeti
diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc
index 271d222fb..b4ae7999e 100644
--- a/goal_src/jak1/levels/sunken/bully.gc
+++ b/goal_src/jak1/levels/sunken/bully.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/nav/navigate.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/anim/joint-mod-h.gc")
 
 ;; name: bully.gc
 ;; name in dgo: bully
diff --git a/goal_src/jak1/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc
index 7a71a5d07..fc9b6116b 100644
--- a/goal_src/jak1/levels/sunken/double-lurker.gc
+++ b/goal_src/jak1/levels/sunken/double-lurker.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "levels/misty/muse.gc")
 
 ;; name: double-lurker.gc
 ;; name in dgo: double-lurker
diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc
index 9b5228fdb..24e563b97 100644
--- a/goal_src/jak1/levels/sunken/floating-launcher.gc
+++ b/goal_src/jak1/levels/sunken/floating-launcher.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: floating-launcher.gc
 ;; name in dgo: floating-launcher
diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc
index d41514f84..a71404e64 100644
--- a/goal_src/jak1/levels/sunken/helix-water.gc
+++ b/goal_src/jak1/levels/sunken/helix-water.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/dark-eco-pool.gc")
+(require "levels/sunken/sunken-obs.gc")
+(require "engine/common-obs/babak.gc")
+(require "levels/common/launcherdoor.gc")
 
 ;; name: helix-water.gc
 ;; name in dgo: helix-water
diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc
index 3c4932795..864723d6b 100644
--- a/goal_src/jak1/levels/sunken/orbit-plat.gc
+++ b/goal_src/jak1/levels/sunken/orbit-plat.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/nav/navigate.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: orbit-plat.gc
 ;; name in dgo: orbit-plat
diff --git a/goal_src/jak1/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc
index 19107b389..db6386b91 100644
--- a/goal_src/jak1/levels/sunken/puffer.gc
+++ b/goal_src/jak1/levels/sunken/puffer.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/nav/navigate.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/collectables.gc")
 
 ;; name: puffer.gc
 ;; name in dgo: puffer
diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc
index 2b0a5a9f1..add62cfac 100644
--- a/goal_src/jak1/levels/sunken/qbert-plat.gc
+++ b/goal_src/jak1/levels/sunken/qbert-plat.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/game/task/hint-control.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/common-obs/rigid-body.gc")
 
 ;; name: qbert-plat.gc
 ;; name in dgo: qbert-plat
diff --git a/goal_src/jak1/levels/sunken/shover.gc b/goal_src/jak1/levels/sunken/shover.gc
index 284f6e129..8a9d6c514 100644
--- a/goal_src/jak1/levels/sunken/shover.gc
+++ b/goal_src/jak1/levels/sunken/shover.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/geometry/path-h.gc")
 
 ;; name: shover.gc
 ;; name in dgo: shover
diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc
index 15ba4a150..cbad1e3a5 100644
--- a/goal_src/jak1/levels/sunken/square-platform.gc
+++ b/goal_src/jak1/levels/sunken/square-platform.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/basebutton.gc")
+(require "engine/common-obs/ticky.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "levels/sunken/sunken-obs.gc")
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: square-platform.gc
 ;; name in dgo: square-platform
diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc
index ed30b9393..15c836848 100644
--- a/goal_src/jak1/levels/sunken/steam-cap.gc
+++ b/goal_src/jak1/levels/sunken/steam-cap.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: steam-cap.gc
 ;; name in dgo: steam-cap
diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
index 79eecfd90..836070bc6 100644
--- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
+++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "levels/sunken/sunken-obs.gc")
+(require "engine/game/task/task-control.gc")
+(require "levels/sunken/sun-iris-door.gc")
+(require "engine/common-obs/basebutton.gc")
 
 ;; name: sun-exit-chamber.gc
 ;; name in dgo: sun-exit-chamber
diff --git a/goal_src/jak1/levels/sunken/sun-iris-door.gc b/goal_src/jak1/levels/sunken/sun-iris-door.gc
index d7b40f132..b1556ddfc 100644
--- a/goal_src/jak1/levels/sunken/sun-iris-door.gc
+++ b/goal_src/jak1/levels/sunken/sun-iris-door.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
 
 ;; name: sun-iris-door.gc
 ;; name in dgo: sun-iris-door
diff --git a/goal_src/jak1/levels/sunken/sunken-fish.gc b/goal_src/jak1/levels/sunken/sunken-fish.gc
index cf23f5e7a..950f07d01 100644
--- a/goal_src/jak1/levels/sunken/sunken-fish.gc
+++ b/goal_src/jak1/levels/sunken/sunken-fish.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/geometry/path.gc")
 
 ;; name: sunken-fish.gc
 ;; name in dgo: sunken-fish
diff --git a/goal_src/jak1/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc
index 21e994d77..1c7c85b4c 100644
--- a/goal_src/jak1/levels/sunken/sunken-obs.gc
+++ b/goal_src/jak1/levels/sunken/sunken-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/plat.gc")
+(require "engine/camera/pov-camera.gc")
+(require "engine/game/main.gc")
 
 ;; name: sunken-obs.gc
 ;; name in dgo: sunken-obs
diff --git a/goal_src/jak1/levels/sunken/sunken-part.gc b/goal_src/jak1/levels/sunken/sunken-part.gc
index bb658657a..18fd6f05a 100644
--- a/goal_src/jak1/levels/sunken/sunken-part.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: sunken-part.gc
 ;; name in dgo: sunken-part
diff --git a/goal_src/jak1/levels/sunken/sunken-part2.gc b/goal_src/jak1/levels/sunken/sunken-part2.gc
index 5a2e326c5..8df783aae 100644
--- a/goal_src/jak1/levels/sunken/sunken-part2.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part2.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: sunken-part2.gc
 ;; name in dgo: sunken-part2
diff --git a/goal_src/jak1/levels/sunken/sunken-part3.gc b/goal_src/jak1/levels/sunken/sunken-part3.gc
index 1f3821d65..4abb8750d 100644
--- a/goal_src/jak1/levels/sunken/sunken-part3.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part3.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: sunken-part3.gc
 ;; name in dgo: sunken-part3
diff --git a/goal_src/jak1/levels/sunken/sunken-part4.gc b/goal_src/jak1/levels/sunken/sunken-part4.gc
index 19e1540d4..cc94fdc11 100644
--- a/goal_src/jak1/levels/sunken/sunken-part4.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part4.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: sunken-part4.gc
 ;; name in dgo: sunken-part4
diff --git a/goal_src/jak1/levels/sunken/sunken-part5.gc b/goal_src/jak1/levels/sunken/sunken-part5.gc
index 00062b53b..c777ec5a2 100644
--- a/goal_src/jak1/levels/sunken/sunken-part5.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part5.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: sunken-part5.gc
 ;; name in dgo: sunken-part5
diff --git a/goal_src/jak1/levels/sunken/sunken-pipegame.gc b/goal_src/jak1/levels/sunken/sunken-pipegame.gc
index 8ebe459aa..1563369e8 100644
--- a/goal_src/jak1/levels/sunken/sunken-pipegame.gc
+++ b/goal_src/jak1/levels/sunken/sunken-pipegame.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/ticky.gc")
+(require "engine/geometry/path.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/common-obs/basebutton.gc")
 
 ;; name: sunken-pipegame.gc
 ;; name in dgo: sunken-pipegame
diff --git a/goal_src/jak1/levels/sunken/sunken-water.gc b/goal_src/jak1/levels/sunken/sunken-water.gc
index c94a2ff14..1c8cfc129 100644
--- a/goal_src/jak1/levels/sunken/sunken-water.gc
+++ b/goal_src/jak1/levels/sunken/sunken-water.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/water-anim.gc")
+(require "engine/util/sync-info.gc")
+(require "engine/gfx/mood/time-of-day.gc")
 
 ;; name: sunken-water.gc
 ;; name in dgo: sunken-water
diff --git a/goal_src/jak1/levels/sunken/target-tube.gc b/goal_src/jak1/levels/sunken/target-tube.gc
index b0af4d463..6700c544a 100644
--- a/goal_src/jak1/levels/sunken/target-tube.gc
+++ b/goal_src/jak1/levels/sunken/target-tube.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/target/target-death.gc")
+(require "engine/anim/aligner.gc")
+(require "engine/geometry/path.gc")
 
 ;; name: target-tube.gc
 ;; name in dgo: target-tube
diff --git a/goal_src/jak1/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc
index fe637b125..5c4de5f3c 100644
--- a/goal_src/jak1/levels/sunken/wall-plat.gc
+++ b/goal_src/jak1/levels/sunken/wall-plat.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: wall-plat.gc
 ;; name in dgo: wall-plat
diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc
index 59771a804..f7a91b188 100644
--- a/goal_src/jak1/levels/sunken/wedge-plats.gc
+++ b/goal_src/jak1/levels/sunken/wedge-plats.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/baseplat.gc")
 
 ;; name: wedge-plats.gc
 ;; name in dgo: wedge-plats
diff --git a/goal_src/jak1/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc
index 6cb0781e8..301f379de 100644
--- a/goal_src/jak1/levels/sunken/whirlpool.gc
+++ b/goal_src/jak1/levels/sunken/whirlpool.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SUN.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: whirlpool.gc
 ;; name in dgo: whirlpool
diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc
index 82a1a6d53..d6b95f673 100644
--- a/goal_src/jak1/levels/swamp/billy.gc
+++ b/goal_src/jak1/levels/swamp/billy.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "levels/swamp/swamp-rat.gc")
 
 ;; name: billy.gc
 ;; name in dgo: billy
diff --git a/goal_src/jak1/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc
index caac11ebf..549f21cb3 100644
--- a/goal_src/jak1/levels/swamp/kermit.gc
+++ b/goal_src/jak1/levels/swamp/kermit.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: kermit.gc
 ;; name in dgo: kermit
diff --git a/goal_src/jak1/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc
index 6de0adb19..3f7b463d8 100644
--- a/goal_src/jak1/levels/swamp/swamp-bat.gc
+++ b/goal_src/jak1/levels/swamp/swamp-bat.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/nav-enemy.gc")
+(require "engine/geometry/vol.gc")
 
 ;; name: swamp-bat.gc
 ;; name in dgo: swamp-bat
diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc
index 66c1953fc..b1119e6bc 100644
--- a/goal_src/jak1/levels/swamp/swamp-obs.gc
+++ b/goal_src/jak1/levels/swamp/swamp-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/common-obs/crates.gc")
+(require "engine/util/sync-info.gc")
+(require "levels/common/battlecontroller.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: swamp-obs.gc
 ;; name in dgo: swamp-obs
diff --git a/goal_src/jak1/levels/swamp/swamp-part.gc b/goal_src/jak1/levels/swamp/swamp-part.gc
index 691563cfc..a18d7c457 100644
--- a/goal_src/jak1/levels/swamp/swamp-part.gc
+++ b/goal_src/jak1/levels/swamp/swamp-part.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: swamp-part.gc
 ;; name in dgo: swamp-part
diff --git a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
index b7065405d..59b31a0e7 100644
--- a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
+++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "levels/swamp/swamp-rat.gc")
 
 ;; name: swamp-rat-nest.gc
 ;; name in dgo: swamp-rat-nest
diff --git a/goal_src/jak1/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc
index 27ef0f455..efdb292b0 100644
--- a/goal_src/jak1/levels/swamp/swamp-rat.gc
+++ b/goal_src/jak1/levels/swamp/swamp-rat.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "SWA.DGO")
+
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: swamp-rat.gc
 ;; name in dgo: swamp-rat
diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc
index 0b1ef3e5f..c0f98a393 100644
--- a/goal_src/jak1/levels/title/title-obs.gc
+++ b/goal_src/jak1/levels/title/title-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "TIT.DGO")
+
+(require "pc/progress-pc.gc")
+(require "engine/target/logic-target.gc")
+(require "levels/demo/static-screen.gc")
 
 ;; name: title-obs.gc
 ;; name in dgo: title-obs
diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc
index 9ff46f2f8..37ce1e4c4 100644
--- a/goal_src/jak1/levels/training/training-obs.gc
+++ b/goal_src/jak1/levels/training/training-obs.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "TRA.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/common-obs/baseplat.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/game/effect-control.gc")
+(require "engine/anim/joint-exploder.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: training-obs.gc
 ;; name in dgo: training-obs
diff --git a/goal_src/jak1/levels/training/training-part.gc b/goal_src/jak1/levels/training/training-part.gc
index 9c2ad9f17..b9e0ddd00 100644
--- a/goal_src/jak1/levels/training/training-part.gc
+++ b/goal_src/jak1/levels/training/training-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "TRA.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: training-part.gc
 ;; name in dgo: training-part
diff --git a/goal_src/jak1/levels/village1/assistant.gc b/goal_src/jak1/levels/village1/assistant.gc
index 43bcc0b91..52174e28b 100644
--- a/goal_src/jak1/levels/village1/assistant.gc
+++ b/goal_src/jak1/levels/village1/assistant.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: assistant.gc
 ;; name in dgo: assistant
diff --git a/goal_src/jak1/levels/village1/explorer.gc b/goal_src/jak1/levels/village1/explorer.gc
index 91ad1b213..ca1fb4fd3 100644
--- a/goal_src/jak1/levels/village1/explorer.gc
+++ b/goal_src/jak1/levels/village1/explorer.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: explorer.gc
 ;; name in dgo: explorer
diff --git a/goal_src/jak1/levels/village1/farmer.gc b/goal_src/jak1/levels/village1/farmer.gc
index cbf8a99cd..a561e585f 100644
--- a/goal_src/jak1/levels/village1/farmer.gc
+++ b/goal_src/jak1/levels/village1/farmer.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: farmer.gc
 ;; name in dgo: farmer
diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc
index 083e9b2f9..18226397d 100644
--- a/goal_src/jak1/levels/village1/fishermans-boat.gc
+++ b/goal_src/jak1/levels/village1/fishermans-boat.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/entity/ambient.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/geometry/bounding-box.gc")
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/geometry/path-h.gc")
 
 ;; name: fishermans-boat.gc
 ;; name in dgo: fishermans-boat
diff --git a/goal_src/jak1/levels/village1/sage.gc b/goal_src/jak1/levels/village1/sage.gc
index f1d248159..0912c661e 100644
--- a/goal_src/jak1/levels/village1/sage.gc
+++ b/goal_src/jak1/levels/village1/sage.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "levels/village1/assistant.gc")
 
 ;; name: sage.gc
 ;; name in dgo: sage
diff --git a/goal_src/jak1/levels/village1/sequence-a-village1.gc b/goal_src/jak1/levels/village1/sequence-a-village1.gc
index 77b2ce220..15609f64f 100644
--- a/goal_src/jak1/levels/village1/sequence-a-village1.gc
+++ b/goal_src/jak1/levels/village1/sequence-a-village1.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
+(require "engine/ui/credits.gc")
 
 ;; name: sequence-a-village1.gc
 ;; name in dgo: sequence-a-village1
diff --git a/goal_src/jak1/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc
index 0c27637c9..851a602e2 100644
--- a/goal_src/jak1/levels/village1/village-obs.gc
+++ b/goal_src/jak1/levels/village1/village-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/util/sync-info.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "engine/common-obs/nav-enemy.gc")
 
 ;; name: village-obs-VI1.gc
 ;; name in dgo: village-obs
diff --git a/goal_src/jak1/levels/village1/village1-part.gc b/goal_src/jak1/levels/village1/village1-part.gc
index 1fa9d0a76..c5f50bf43 100644
--- a/goal_src/jak1/levels/village1/village1-part.gc
+++ b/goal_src/jak1/levels/village1/village1-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: village1-part.gc
 ;; name in dgo: village1-part
diff --git a/goal_src/jak1/levels/village1/village1-part2.gc b/goal_src/jak1/levels/village1/village1-part2.gc
index 2846e664f..5e30d5e36 100644
--- a/goal_src/jak1/levels/village1/village1-part2.gc
+++ b/goal_src/jak1/levels/village1/village1-part2.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
 
 ;; name: village1-part2.gc
 ;; name in dgo: village1-part2
diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc
index 76d35e069..00d20b1da 100644
--- a/goal_src/jak1/levels/village1/yakow.gc
+++ b/goal_src/jak1/levels/village1/yakow.gc
@@ -1,5 +1,15 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI1.DGO")
+
+(require "engine/nav/navigate.gc")
+(require "engine/gfx/shadow/shadow-cpu.gc")
+(require "engine/anim/aligner-h.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/water.gc")
+(require "engine/common-obs/collectables.gc")
+(require "engine/camera/pov-camera-h.gc")
 
 ;; name: yakow.gc
 ;; name in dgo: yakow
diff --git a/goal_src/jak1/levels/village2/assistant-village2.gc b/goal_src/jak1/levels/village2/assistant-village2.gc
index c0a96c1d7..9e7b8c06d 100644
--- a/goal_src/jak1/levels/village2/assistant-village2.gc
+++ b/goal_src/jak1/levels/village2/assistant-village2.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "levels/village2/village2-obs.gc")
+(require "levels/village2/flutflut-bluehut.gc")
+(require "levels/village2/sage-bluehut.gc")
 
 ;; name: assistant-village2.gc
 ;; name in dgo: assistant-village2
diff --git a/goal_src/jak1/levels/village2/flutflut-bluehut.gc b/goal_src/jak1/levels/village2/flutflut-bluehut.gc
index a2e919f58..9c823e1fb 100644
--- a/goal_src/jak1/levels/village2/flutflut-bluehut.gc
+++ b/goal_src/jak1/levels/village2/flutflut-bluehut.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: flutflut-bluehut.gc
 ;; name in dgo: flutflut-bluehut
diff --git a/goal_src/jak1/levels/village2/gambler.gc b/goal_src/jak1/levels/village2/gambler.gc
index dce10c918..3b4ff3072 100644
--- a/goal_src/jak1/levels/village2/gambler.gc
+++ b/goal_src/jak1/levels/village2/gambler.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: gambler.gc
 ;; name in dgo: gambler
diff --git a/goal_src/jak1/levels/village2/geologist.gc b/goal_src/jak1/levels/village2/geologist.gc
index 646f27637..b2eb0face 100644
--- a/goal_src/jak1/levels/village2/geologist.gc
+++ b/goal_src/jak1/levels/village2/geologist.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: geologist.gc
 ;; name in dgo: geologist
diff --git a/goal_src/jak1/levels/village2/sage-bluehut.gc b/goal_src/jak1/levels/village2/sage-bluehut.gc
index 3a4334a24..0e4f93393 100644
--- a/goal_src/jak1/levels/village2/sage-bluehut.gc
+++ b/goal_src/jak1/levels/village2/sage-bluehut.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "levels/village1/sage.gc")
 
 ;; name: sage-bluehut.gc
 ;; name in dgo: sage-bluehut
diff --git a/goal_src/jak1/levels/village2/sunken-elevator.gc b/goal_src/jak1/levels/village2/sunken-elevator.gc
index 10094cc3c..29cce9569 100644
--- a/goal_src/jak1/levels/village2/sunken-elevator.gc
+++ b/goal_src/jak1/levels/village2/sunken-elevator.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "levels/village2/village2-obs.gc")
+(require "engine/common-obs/plat-button.gc")
 
 ;; name: sunken-elevator.gc
 ;; name in dgo: sunken-elevator
diff --git a/goal_src/jak1/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc
index 2da2f72aa..5363ab0fb 100644
--- a/goal_src/jak1/levels/village2/swamp-blimp.gc
+++ b/goal_src/jak1/levels/village2/swamp-blimp.gc
@@ -1,5 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/anim/joint-mod-h.gc")
+(require "engine/game/task/hint-control.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: swamp-blimp.gc
 ;; name in dgo: swamp-blimp
diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc
index 58cedd141..e96e8c33c 100644
--- a/goal_src/jak1/levels/village2/village2-obs.gc
+++ b/goal_src/jak1/levels/village2/village2-obs.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/common-obs/rigid-body.gc")
+(require "engine/camera/pov-camera.gc")
+(require "engine/game/task/task-control.gc")
 
 ;; name: village2-obs.gc
 ;; name in dgo: village2-obs
diff --git a/goal_src/jak1/levels/village2/village2-part.gc b/goal_src/jak1/levels/village2/village2-part.gc
index fbbd4db9e..a484c16ea 100644
--- a/goal_src/jak1/levels/village2/village2-part.gc
+++ b/goal_src/jak1/levels/village2/village2-part.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle.gc")
+(require "engine/common-obs/generic-obs-h.gc")
 
 ;; name: village2-part.gc
 ;; name in dgo: village2-part
diff --git a/goal_src/jak1/levels/village2/village2-part2.gc b/goal_src/jak1/levels/village2/village2-part2.gc
index 8a03213b1..e13d4a19e 100644
--- a/goal_src/jak1/levels/village2/village2-part2.gc
+++ b/goal_src/jak1/levels/village2/village2-part2.gc
@@ -1,5 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: village2-part2.gc
 ;; name in dgo: village2-part2
diff --git a/goal_src/jak1/levels/village2/warrior.gc b/goal_src/jak1/levels/village2/warrior.gc
index 536840ff6..06e76b637 100644
--- a/goal_src/jak1/levels/village2/warrior.gc
+++ b/goal_src/jak1/levels/village2/warrior.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI2.DGO")
+
+(require "levels/village2/village2-obs.gc")
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: warrior.gc
 ;; name in dgo: warrior
diff --git a/goal_src/jak1/levels/village3/assistant-village3.gc b/goal_src/jak1/levels/village3/assistant-village3.gc
index 574a6ed27..8722455e1 100644
--- a/goal_src/jak1/levels/village3/assistant-village3.gc
+++ b/goal_src/jak1/levels/village3/assistant-village3.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: assistant-village3.gc
 ;; name in dgo: assistant-village3
diff --git a/goal_src/jak1/levels/village3/minecart.gc b/goal_src/jak1/levels/village3/minecart.gc
index c90e784ed..e4e83866b 100644
--- a/goal_src/jak1/levels/village3/minecart.gc
+++ b/goal_src/jak1/levels/village3/minecart.gc
@@ -1,5 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/util/sync-info.gc")
 
 ;; name: minecart.gc
 ;; name in dgo: minecart
diff --git a/goal_src/jak1/levels/village3/miners.gc b/goal_src/jak1/levels/village3/miners.gc
index 3b9b77cbd..1442ae361 100644
--- a/goal_src/jak1/levels/village3/miners.gc
+++ b/goal_src/jak1/levels/village3/miners.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: miners.gc
 ;; name in dgo: miners
diff --git a/goal_src/jak1/levels/village3/sage-village3.gc b/goal_src/jak1/levels/village3/sage-village3.gc
index 15edcf35a..2720e7069 100644
--- a/goal_src/jak1/levels/village3/sage-village3.gc
+++ b/goal_src/jak1/levels/village3/sage-village3.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: sage-village3.gc
 ;; name in dgo: sage-village3
diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc
index 5fb1210a9..ea1409d56 100644
--- a/goal_src/jak1/levels/village3/village3-obs.gc
+++ b/goal_src/jak1/levels/village3/village3-obs.gc
@@ -1,5 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/gfx/shadow/shadow-cpu.gc")
+(require "engine/common-obs/generic-obs.gc")
+(require "engine/entity/ambient.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/common-obs/water-anim.gc")
+(require "engine/target/target-util.gc")
 
 ;; name: village3-obs.gc
 ;; name in dgo: village3-obs
diff --git a/goal_src/jak1/levels/village3/village3-part.gc b/goal_src/jak1/levels/village3/village3-part.gc
index 705d4de0e..4f1807e94 100644
--- a/goal_src/jak1/levels/village3/village3-part.gc
+++ b/goal_src/jak1/levels/village3/village3-part.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "VI3.DGO")
+
+(require "engine/common-obs/generic-obs-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-h.gc")
+(require "engine/gfx/texture/texture-h.gc")
+(require "engine/sound/gsound-h.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; name: village3-part.gc
 ;; name in dgo: village3-part
diff --git a/goal_src/jak1/levels/village_common/oracle.gc b/goal_src/jak1/levels/village_common/oracle.gc
index 9a9b274aa..8eac200bb 100644
--- a/goal_src/jak1/levels/village_common/oracle.gc
+++ b/goal_src/jak1/levels/village_common/oracle.gc
@@ -1,5 +1,8 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO" "VI1.DGO" "VI2.DGO" "VI3.DGO")
+
+(require "engine/common-obs/process-taskable.gc")
 
 ;; name: oracle.gc
 ;; name in dgo: oracle
diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc
index b32eeae0a..0207563ff 100644
--- a/goal_src/jak1/levels/village_common/villagep-obs.gc
+++ b/goal_src/jak1/levels/village_common/villagep-obs.gc
@@ -1,5 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
+(bundles "CIT.DGO" "VI1.DGO" "VI2.DGO" "VI3.DGO")
+
+(require "engine/entity/ambient.gc")
+(require "engine/game/task/task-control.gc")
+(require "engine/target/target.gc")
+(require "engine/camera/pov-camera-h.gc")
+(require "engine/common-obs/basebutton.gc")
 
 ;; name: villagep-obs.gc
 ;; name in dgo: villagep-obs
diff --git a/goal_src/jak1/old/cavegeyserrock.gc b/goal_src/jak1/old/cavegeyserrock.gc
index a58f4e491..363eccc0d 100644
--- a/goal_src/jak1/old/cavegeyserrock.gc
+++ b/goal_src/jak1/old/cavegeyserrock.gc
@@ -1,6 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/math/vector-h.gc")
+(require "engine/sound/gsound-h.gc")
+(require "kernel/gstate.gc")
+(require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
+
 ;; name: cavegeyserrock.gc
 ;; name in dgo: cavegeyserrock
 ;; dgos: L1
diff --git a/goal_src/jak1/pc/debug/anim-tester-x.gc b/goal_src/jak1/pc/debug/anim-tester-x.gc
index c81e940e8..b585a4a39 100644
--- a/goal_src/jak1/pc/debug/anim-tester-x.gc
+++ b/goal_src/jak1/pc/debug/anim-tester-x.gc
@@ -1,6 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/nav/navigate.gc")
+(require "pc/pckernel.gc")
+(require "engine/anim/aligner.gc")
+
+
 #|
 
   Code for the PC port anim tester. It's like their original anim tester tool, but actually functional, and with
diff --git a/goal_src/jak1/pc/debug/default-menu-pc.gc b/goal_src/jak1/pc/debug/default-menu-pc.gc
index 12cc247d1..d92a80bf3 100644
--- a/goal_src/jak1/pc/debug/default-menu-pc.gc
+++ b/goal_src/jak1/pc/debug/default-menu-pc.gc
@@ -1,6 +1,14 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/debug/menu.gc")
+(require "pc/progress-pc.gc")
+(require "engine/debug/part-tester.gc")
+(require "engine/gfx/generic/generic-tie.gc")
+(require "pc/debug/entity-debug.gc")
+(require "pc/debug/anim-tester-x.gc")
+
+
 #|
 
   Extra debug menus for PC port.
diff --git a/goal_src/jak1/pc/debug/entity-debug.gc b/goal_src/jak1/pc/debug/entity-debug.gc
index e42c4f963..3c257c2eb 100644
--- a/goal_src/jak1/pc/debug/entity-debug.gc
+++ b/goal_src/jak1/pc/debug/entity-debug.gc
@@ -1,6 +1,13 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/ui/text-h.gc")
+(require "pc/pckernel-common.gc")
+(require "engine/game/fact-h.gc")
+(require "engine/debug/debug.gc")
+(require "engine/game/game-info-h.gc")
+
+
 #|
 
   Entity debugging utilities.
diff --git a/goal_src/jak1/pc/debug/pc-debug-common.gc b/goal_src/jak1/pc/debug/pc-debug-common.gc
index cbfe90de1..0a374e410 100644
--- a/goal_src/jak1/pc/debug/pc-debug-common.gc
+++ b/goal_src/jak1/pc/debug/pc-debug-common.gc
@@ -1,6 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "kernel/gstring.gc")
+(require "engine/math/math.gc")
+
+
 #|
   Various debugging displays made for the pc port. This file is shared for all games.
  |#
diff --git a/goal_src/jak1/pc/debug/pc-debug-methods.gc b/goal_src/jak1/pc/debug/pc-debug-methods.gc
index 3b7edb35f..c0536caaf 100644
--- a/goal_src/jak1/pc/debug/pc-debug-methods.gc
+++ b/goal_src/jak1/pc/debug/pc-debug-methods.gc
@@ -1,6 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/gfx/hw/display.gc")
+(require "pc/debug/pc-debug-common.gc")
+(require "engine/math/quaternion-h.gc")
+(require "engine/game/game-info-h.gc")
+
+
 #|
   Various debugging displays made for the pc port. This file includes overrides or game-specific implementations.
  |#
diff --git a/goal_src/jak1/pc/features/autosplit-h.gc b/goal_src/jak1/pc/features/autosplit-h.gc
index 6a44b53aa..aab348909 100644
--- a/goal_src/jak1/pc/features/autosplit-h.gc
+++ b/goal_src/jak1/pc/features/autosplit-h.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "kernel-defs.gc")
+
+
 ;; LiveSplit ASL requires all settings to initalized _before_ you connect the process
 ;; Therefore everything has to be laid out in a predictable fashion before hand
 ;; So this is a lot of hard-coding, but not too bad when just copied from the debug menu code
diff --git a/goal_src/jak1/pc/features/autosplit.gc b/goal_src/jak1/pc/features/autosplit.gc
index 30acf83f1..9b57e91a2 100644
--- a/goal_src/jak1/pc/features/autosplit.gc
+++ b/goal_src/jak1/pc/features/autosplit.gc
@@ -1,6 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/game/game-info.gc")
+(require "pc/features/autosplit-h.gc")
+
+
 (define *autosplit-info-jak1* (new 'static 'autosplit-info-jak1))
 ;; Setup markers
 (charp<-string (-> *autosplit-info-jak1* end-marker) "end")
diff --git a/goal_src/jak1/pc/features/speedruns-h.gc b/goal_src/jak1/pc/features/speedruns-h.gc
index 403bd3f40..d58a74496 100644
--- a/goal_src/jak1/pc/features/speedruns-h.gc
+++ b/goal_src/jak1/pc/features/speedruns-h.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "kernel-defs.gc")
+
+
 (defenum speedrun-category
   :type uint32
   ;; Main Categories
diff --git a/goal_src/jak1/pc/features/speedruns.gc b/goal_src/jak1/pc/features/speedruns.gc
index b56696920..6c0d4fdc8 100644
--- a/goal_src/jak1/pc/features/speedruns.gc
+++ b/goal_src/jak1/pc/features/speedruns.gc
@@ -1,6 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/game/game-save.gc")
+(require "engine/game/task/game-task-h.gc")
+(require "pc/pckernel-common.gc")
+(require "pc/features/autosplit-h.gc")
+
+
 (define *speedrun-info* (new 'static 'speedrun-info-jak1 :should-display? #t :needs-post-blackout-setup? #f))
 
 (define *hub1-cell-list* (new 'static 'boxed-array :type game-task
diff --git a/goal_src/jak1/pc/hud-classes-pc.gc b/goal_src/jak1/pc/hud-classes-pc.gc
index bd4a70706..494e3d073 100644
--- a/goal_src/jak1/pc/hud-classes-pc.gc
+++ b/goal_src/jak1/pc/hud-classes-pc.gc
@@ -1,6 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/ui/hud.gc")
+(require "levels/common/battlecontroller.gc")
+
+
 #|
 
   Code for extra HUD elements in the PC port.
diff --git a/goal_src/jak1/pc/pc-cheats.gc b/goal_src/jak1/pc/pc-cheats.gc
new file mode 100644
index 000000000..e6db66c8d
--- /dev/null
+++ b/goal_src/jak1/pc/pc-cheats.gc
@@ -0,0 +1,29 @@
+;;-*-Lisp-*-
+(in-package goal)
+
+(defconstant PC_CHEAT_MAX 18) ;; number of cheats
+(defenum pc-cheats
+  :bitfield #t
+  :type uint64
+  (eco-green)
+  (eco-red)
+  (eco-blue)
+  (eco-yellow)
+  (invinc)
+  (sidekick-blue)
+  (tunes)
+  (sky)
+  (mirror)
+  (big-head)
+  (small-head)
+  (big-fist)
+  (no-tex)
+  (hard-rats)
+  (hero-mode)
+  (huge-head)
+  (big-head-npc)
+  (oh-my-goodness)
+  )
+
+(defmacro pc-cheats? (obj &rest cheats)
+  `(logtest? ,obj (pc-cheats ,@cheats)))
diff --git a/goal_src/jak1/pc/pckernel-common.gc b/goal_src/jak1/pc/pckernel-common.gc
index 3efcefb39..38a50bde7 100644
--- a/goal_src/jak1/pc/pckernel-common.gc
+++ b/goal_src/jak1/pc/pckernel-common.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
+
+
 #|
 
   This file contains new code that we need for the PC port of the game specifically.
diff --git a/goal_src/jak1/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc
index df2d93a2e..667f3190c 100644
--- a/goal_src/jak1/pc/pckernel-h.gc
+++ b/goal_src/jak1/pc/pckernel-h.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/ps2/pad.gc")
+
+
 #|
 
   This file contains code that we need for the PC port of the game specifically.
@@ -83,10 +86,6 @@
   (direct3d)
   )
 
-
-(defmacro pc-cheats? (obj &rest cheats)
-  `(logtest? ,obj (pc-cheats ,@cheats)))
-
 ;; music log info
 (deftype pc-music-log-entry (structure)
   ((name  symbol)
diff --git a/goal_src/jak1/pc/pckernel-impl.gc b/goal_src/jak1/pc/pckernel-impl.gc
index b13c8db7a..e0ff4e420 100644
--- a/goal_src/jak1/pc/pckernel-impl.gc
+++ b/goal_src/jak1/pc/pckernel-impl.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "pc/pckernel-h.gc")
+
+
 #|
 	This file has the game-specific implementation of the pckernel (see pckernel-h.gc and pckernel.gc).
  |#
@@ -18,32 +21,6 @@
 ;;;; types and enums
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-
-;; cheats
-(defconstant PC_CHEAT_MAX 18) ;; number of cheats
-(defenum pc-cheats
-  :bitfield #t
-  :type uint64
-  (eco-green)
-  (eco-red)
-  (eco-blue)
-  (eco-yellow)
-  (invinc)
-  (sidekick-blue)
-  (tunes)
-  (sky)
-  (mirror)
-  (big-head)
-  (small-head)
-  (big-fist)
-  (no-tex)
-  (hard-rats)
-  (hero-mode)
-  (huge-head)
-  (big-head-npc)
-  (oh-my-goodness)
-  )
-
 ;; pc enum for languages. this is the game's languages + custom ones.
 (defenum pc-language
   :type uint16
diff --git a/goal_src/jak1/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc
index 6b1e4dd16..23b6d8992 100644
--- a/goal_src/jak1/pc/pckernel.gc
+++ b/goal_src/jak1/pc/pckernel.gc
@@ -1,6 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "pc/util/pc-anim-util.gc")
+(require "engine/gfx/mood/time-of-day.gc")
+(require "engine/level/level.gc")
+(require "pc/pckernel-common.gc")
+
+
 #|
 
   This file runs the game-specific version of the pckernel.
diff --git a/goal_src/jak1/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc
index c6ca6ba44..96504e16f 100644
--- a/goal_src/jak1/pc/progress-pc.gc
+++ b/goal_src/jak1/pc/progress-pc.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/ui/progress/progress.gc")
+
+
 #|
 
   Code for the progress menu in the PC port. The original code is still loaded, this just has some overriden functions.
diff --git a/goal_src/jak1/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc
index fe9f087d2..dba19c17b 100644
--- a/goal_src/jak1/pc/subtitle.gc
+++ b/goal_src/jak1/pc/subtitle.gc
@@ -1,6 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/entity/ambient.gc")
+(require "pc/pckernel.gc")
+
+
 #|
 
   Code for subtitles for the PC port. A PC actor pool is provided, and the subtitle process lives there.
diff --git a/goal_src/jak1/pc/util/display-font-color.gc b/goal_src/jak1/pc/util/display-font-color.gc
index e2eecfe9a..b9bc614e3 100644
--- a/goal_src/jak1/pc/util/display-font-color.gc
+++ b/goal_src/jak1/pc/util/display-font-color.gc
@@ -1,6 +1,11 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/gfx/hw/display-h.gc")
+(require "kernel/gstring.gc")
+(require "kernel/gstate.gc")
+
+
 ;; This script creates a simple process that draws text demonstrating
 ;; all of GOAL's color constants to the on-screen debug output.
 
diff --git a/goal_src/jak1/pc/util/font-encode-test.gc b/goal_src/jak1/pc/util/font-encode-test.gc
index bb631a60e..e3f4d3377 100644
--- a/goal_src/jak1/pc/util/font-encode-test.gc
+++ b/goal_src/jak1/pc/util/font-encode-test.gc
@@ -1,6 +1,10 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "kernel/gstate.gc")
+(require "engine/ps2/pad.gc")
+
+
 
 ;; This file is used for debugging and testing the large font encoding.
 ;; This file should *not* be included as part of any packages, it should be manually loaded by the user.
diff --git a/goal_src/jak1/pc/util/knuth-rand.gc b/goal_src/jak1/pc/util/knuth-rand.gc
index 344906555..a886b5b9e 100644
--- a/goal_src/jak1/pc/util/knuth-rand.gc
+++ b/goal_src/jak1/pc/util/knuth-rand.gc
@@ -1,6 +1,9 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/game/settings-h.gc")
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; mimicking Java's util.Random https://docs.oracle.com/javase/8/docs/api/java/util/Random.html
 ;;;; This is a linear congruential pseudorandom number generator, as defined by D. H. Lehmer
diff --git a/goal_src/jak1/pc/util/pc-anim-util.gc b/goal_src/jak1/pc/util/pc-anim-util.gc
index 44d0bbc7d..0e747d6aa 100644
--- a/goal_src/jak1/pc/util/pc-anim-util.gc
+++ b/goal_src/jak1/pc/util/pc-anim-util.gc
@@ -1,6 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "pc/pckernel-impl.gc")
+(require "engine/common-obs/process-drawable-h.gc")
+(require "engine/anim/mspace-h.gc")
+(require "engine/target/target-h.gc")
+
+
 #|
 A random assortment of functions used for manipulating various animations and skeletons in the pc port.
 
diff --git a/goal_src/jak1/pc/util/pc-pad-utils.gc b/goal_src/jak1/pc/util/pc-pad-utils.gc
index 67a6cc510..0b5c41eb7 100644
--- a/goal_src/jak1/pc/util/pc-pad-utils.gc
+++ b/goal_src/jak1/pc/util/pc-pad-utils.gc
@@ -1,6 +1,12 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+(require "engine/dma/dma-buffer.gc")
+(require "kernel/gstring.gc")
+(require "kernel/gstate.gc")
+(require "engine/util/types-h.gc")
+
+
 
 ;; This file is used for debugging and testing the PC port pad (controller/input) implementation.
 ;; It contains a function for creating a process for debugging cpad inputs and a function to kill that process.
diff --git a/goal_src/jak2/dgos/game.gd b/goal_src/jak2/dgos/game.gd
index 8914c7a35..531727c3f 100644
--- a/goal_src/jak2/dgos/game.gd
+++ b/goal_src/jak2/dgos/game.gd
@@ -30,6 +30,7 @@
   "dma-bucket.o"
   "dma-disasm.o"
   "statistics-h.o" ;; added
+  "pc-cheats.o" ;; added
   "pckernel-h.o" ;; added
   "pckernel-impl.o" ;; added
   "pc-debug-common.o" ;; added
diff --git a/goal_src/jak2/kernel/gstate.gc b/goal_src/jak2/kernel/gstate.gc
index 10257e16e..811b74ce6 100644
--- a/goal_src/jak2/kernel/gstate.gc
+++ b/goal_src/jak2/kernel/gstate.gc
@@ -159,11 +159,15 @@ It type checks the arguments for the entry function.
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
 
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -226,8 +230,8 @@ It type checks the arguments for the entry function.
          ;; This way it can check the individual function types, make sure they make sense, and create
          ;; a state with the appropriate type.
          ,(if virtual
-              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
-              `(define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
 
          )
diff --git a/goal_src/jak2/pc/pc-cheats.gc b/goal_src/jak2/pc/pc-cheats.gc
new file mode 100644
index 000000000..a8197eead
--- /dev/null
+++ b/goal_src/jak2/pc/pc-cheats.gc
@@ -0,0 +1,5 @@
+;;-*-Lisp-*-
+(in-package goal)
+
+(defmacro pc-cheats? (obj &rest cheats)
+  `(logtest? ,obj (pc-cheats ,@cheats)))
diff --git a/goal_src/jak3/dgos/game.gd b/goal_src/jak3/dgos/game.gd
index c590b9117..2fb7e77a6 100644
--- a/goal_src/jak3/dgos/game.gd
+++ b/goal_src/jak3/dgos/game.gd
@@ -30,6 +30,7 @@
   "dma-buffer.o"
   "dma-bucket.o"
   "dma-disasm.o"
+  "pc-cheats.o" ;; added
   "pckernel-h.o" ;; added
   "pckernel-impl.o" ;; added
   "pc-debug-common.o" ;; added
diff --git a/goal_src/jak3/kernel/gstate.gc b/goal_src/jak3/kernel/gstate.gc
index f6d54ca29..8c1feaa58 100644
--- a/goal_src/jak3/kernel/gstate.gc
+++ b/goal_src/jak3/kernel/gstate.gc
@@ -119,11 +119,15 @@
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
 
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -190,26 +194,26 @@
             `(begin
               (inherit-state ,new-state ,(if (pair? parent) `(method-of-type ,(car parent) ,(cadr parent)) `(the state ,parent)))
               (set! (-> ,new-state parent) ,(if (pair? parent) `(method-of-type ,(car parent) ,(cadr parent)) `(the state ,parent)))
-              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            (virtual
             `(begin
               (set! (-> ,new-state parent) #f)
-              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            (parent
             `(begin
               (inherit-state ,new-state (the state ,parent))
               (set! (-> ,new-state parent) (the state ,parent))
-              (define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            (#t
             `(begin
               (set! (-> ,new-state parent) #f)
-              (define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            )
diff --git a/goal_src/jak3/pc/pc-cheats.gc b/goal_src/jak3/pc/pc-cheats.gc
new file mode 100644
index 000000000..a8197eead
--- /dev/null
+++ b/goal_src/jak3/pc/pc-cheats.gc
@@ -0,0 +1,5 @@
+;;-*-Lisp-*-
+(in-package goal)
+
+(defmacro pc-cheats? (obj &rest cheats)
+  `(logtest? ,obj (pc-cheats ,@cheats)))
diff --git a/goalc/compiler/Compiler.h b/goalc/compiler/Compiler.h
index 507455e35..b299ad0c9 100644
--- a/goalc/compiler/Compiler.h
+++ b/goalc/compiler/Compiler.h
@@ -39,6 +39,10 @@ struct CompilationOptions {
   bool print_time = false;              // print timing statistics
 };
 
+struct GlobalConstantInfo {
+  std::optional<goos::TextDb::ShortInfo> definition_info;
+};
+
 class Compiler {
  public:
   Compiler(GameVersion version,
@@ -122,19 +126,20 @@ class Compiler {
   listener::Listener m_listener;
   goos::Interpreter m_goos;
   Debugger m_debugger;
-  // TODO - this should be able to be removed, these are stored in `m_symbol_info`
-  std::unordered_map<std::string, goos::ArgumentSpec> m_macro_specs;
-  // TODO - this should be able to be removed, these are stored in `m_symbol_info`
+  MakeSystem m_make;
+  std::unique_ptr<REPL::Wrapper> m_repl;
+  CompilerSettings m_settings;
+  bool m_throw_on_define_extern_redefinition = false;  // TODO - move to settings
+
+  // State Tracking
+  symbol_info::SymbolInfoMap m_symbol_info;
   goos::InternedPtrMap<TypeSpec> m_symbol_types;
   goos::InternedPtrMap<goos::Object> m_global_constants;
   std::unordered_map<goos::InternedSymbolPtr, InlineableFunction, goos::InternedSymbolPtr::hash>
       m_inlineable_functions;
-  CompilerSettings m_settings;
-  bool m_throw_on_define_extern_redefinition = false;
+
+  // Overrides
   std::unordered_set<std::string> m_allow_inconsistent_definition_symbols;
-  MakeSystem m_make;
-  std::unique_ptr<REPL::Wrapper> m_repl;
-  symbol_info::SymbolInfoMap m_symbol_info;
 
   struct DebugStats {
     int num_spills = 0;
@@ -627,6 +632,8 @@ class Compiler {
   Val* compile_gs(const goos::Object& form, const goos::Object& rest, Env* env);
   Val* compile_set_config(const goos::Object& form, const goos::Object& rest, Env* env);
   Val* compile_in_package(const goos::Object& form, const goos::Object& rest, Env* env);
+  Val* compile_bundles(const goos::Object& form, const goos::Object& rest, Env* env);
+  Val* compile_require(const goos::Object& form, const goos::Object& rest, Env* env);
   Val* compile_build_dgo(const goos::Object& form, const goos::Object& rest, Env* env);
   Val* compile_reload(const goos::Object& form, const goos::Object& rest, Env* env);
   Val* compile_get_info(const goos::Object& form, const goos::Object& rest, Env* env);
@@ -638,6 +645,7 @@ class Compiler {
                                           const goos::Object& rest,
                                           Env* env);
   Val* compile_gen_docs(const goos::Object& form, const goos::Object& rest, Env* env);
+  Val* compile_export_requires(const goos::Object& form, const goos::Object& rest, Env*);
 
   // ControlFlow
   Condition compile_condition(const goos::Object& condition, Env* env, bool invert);
diff --git a/goalc/compiler/CompilerSettings.h b/goalc/compiler/CompilerSettings.h
index cd62ef736..e02f53126 100644
--- a/goalc/compiler/CompilerSettings.h
+++ b/goalc/compiler/CompilerSettings.h
@@ -12,6 +12,8 @@ class CompilerSettings {
   bool debug_print_regalloc = false;
   bool disable_math_const_prop = false;
   bool emit_move_after_return = true;
+  bool check_for_requires = false;  // check for missing 'require' statements (TODO - does not work
+                                    // for virtual state usages or macro usages)
 
   void set(const std::string& name, const goos::Object& value);
 
diff --git a/goalc/compiler/Env.cpp b/goalc/compiler/Env.cpp
index 269c75cc9..3b0cbb7c9 100644
--- a/goalc/compiler/Env.cpp
+++ b/goalc/compiler/Env.cpp
@@ -118,6 +118,10 @@ std::vector<std::string> GlobalEnv::list_files_with_prefix(const std::string& pr
   return matches;
 }
 
+std::vector<std::unique_ptr<FileEnv>>& GlobalEnv::get_files() {
+  return m_files;
+}
+
 ///////////////////
 // BlockEnv
 ///////////////////
diff --git a/goalc/compiler/Env.h b/goalc/compiler/Env.h
index a5bb7e7d8..9b928207f 100644
--- a/goalc/compiler/Env.h
+++ b/goalc/compiler/Env.h
@@ -86,6 +86,7 @@ class GlobalEnv : public Env {
   FileEnv* add_file(std::string name);
   // TODO - consider refactoring to use a Trie
   std::vector<std::string> list_files_with_prefix(const std::string& prefix);
+  std::vector<std::unique_ptr<FileEnv>>& get_files();
 
  private:
   std::vector<std::unique_ptr<FileEnv>> m_files;
@@ -130,6 +131,10 @@ class FileEnv : public Env {
 
   void cleanup_after_codegen();
 
+  // TODO - privatize these eventually
+  std::unordered_set<std::string> m_required_files;          // TODO - a string for now
+  std::unordered_set<std::string> m_missing_required_files;  // TODO - a string for now
+
  protected:
   std::string m_name;
   std::vector<std::unique_ptr<FunctionEnv>> m_functions;
diff --git a/goalc/compiler/Util.cpp b/goalc/compiler/Util.cpp
index 4400533eb..82bcdb628 100644
--- a/goalc/compiler/Util.cpp
+++ b/goalc/compiler/Util.cpp
@@ -1,6 +1,7 @@
 #include "common/goos/ParseHelpers.h"
 #include "common/type_system/deftype.h"
 #include "common/util/json_util.h"
+#include "common/util/string_util.h"
 
 #include "goalc/compiler/Compiler.h"
 #include "goalc/compiler/IR.h"
@@ -295,6 +296,28 @@ TypeSpec Compiler::parse_typespec(const goos::Object& src, Env* env) {
     return env->function_env()->method_function_type.substitute_for_method_call(
         env->function_env()->method_of_type_name);
   }
+  if (m_settings.check_for_requires) {
+    TypeSpec ts = ::parse_typespec(&m_ts, src);
+    const auto& type_name = ts.base_type();
+    if (!type_name.empty()) {
+      const auto& symbol_info = m_symbol_info.lookup_exact_name(type_name);
+      if (!symbol_info.empty()) {
+        const auto& result = symbol_info.at(0);
+        if (result->m_def_location.has_value() &&
+            !env->file_env()->m_missing_required_files.contains(
+                result->m_def_location->file_path) &&
+            env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+                env->file_env()->m_required_files.end() &&
+            !str_util::ends_with(result->m_def_location->file_path,
+                                 env->file_env()->name() + ".gc")) {
+          lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                   result->m_def_location->file_path, type_name);
+          env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+        }
+      }
+    }
+  }
+
   return ::parse_typespec(&m_ts, src);
 }
 
diff --git a/goalc/compiler/compilation/Atoms.cpp b/goalc/compiler/compilation/Atoms.cpp
index 90ab5de78..9ccb61dfb 100644
--- a/goalc/compiler/compilation/Atoms.cpp
+++ b/goalc/compiler/compilation/Atoms.cpp
@@ -3,6 +3,8 @@
  * Top-level compilation forms for each of the GOOS object types.
  */
 
+#include "common/util/string_util.h"
+
 #include "goalc/compiler/Compiler.h"
 #include "goalc/compiler/IR.h"
 
@@ -153,6 +155,8 @@ const std::unordered_map<
         {"reset-target", {"", &Compiler::compile_reset_target}},
         {":status", {"", &Compiler::compile_poke}},
         {"in-package", {"", &Compiler::compile_in_package}},
+        {"bundles", {"", &Compiler::compile_bundles}},
+        {"require", {"", &Compiler::compile_require}},
         {"reload", {"", &Compiler::compile_reload}},
         {"get-info", {"", &Compiler::compile_get_info}},
         {"autocomplete", {"", &Compiler::compile_autocomplete}},
@@ -161,6 +165,7 @@ const std::unordered_map<
         {"make", {"", &Compiler::compile_make}},
         {"print-debug-compiler-stats", {"", &Compiler::compile_print_debug_compiler_stats}},
         {"gen-docs", {"", &Compiler::compile_gen_docs}},
+        {"export-requires", {"", &Compiler::compile_export_requires}},
         {"gc-text", {"", &Compiler::compile_gc_text}},
 
         // CONDITIONAL COMPILATION
@@ -395,7 +400,39 @@ Val* Compiler::compile_get_symbol_value(const goos::Object& form,
   }
 
   const auto& ts = *existing_symbol;
-  auto sext = m_ts.lookup_type_allow_partial_def(ts)->get_load_signed();
+  const auto& full_type = m_ts.lookup_type_allow_partial_def(ts);
+  if (m_settings.check_for_requires) {
+    if (full_type->m_metadata.definition_info.has_value() &&
+        !env->file_env()->m_missing_required_files.contains(
+            full_type->m_metadata.definition_info->filename) &&
+        env->file_env()->m_required_files.find(full_type->m_metadata.definition_info->filename) ==
+            env->file_env()->m_required_files.end() &&
+        !str_util::ends_with(full_type->m_metadata.definition_info->filename,
+                             env->file_env()->name() + ".gc")) {
+      lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+               full_type->m_metadata.definition_info->filename, name);
+      env->file_env()->m_missing_required_files.insert(
+          full_type->m_metadata.definition_info->filename);
+    } else {
+      // Try to lookup in symbol_info
+      const auto& symbol_info = m_symbol_info.lookup_exact_name(name);
+      if (!symbol_info.empty()) {
+        const auto& result = symbol_info.at(0);
+        if (result->m_def_location.has_value() &&
+            !env->file_env()->m_missing_required_files.contains(
+                result->m_def_location->file_path) &&
+            env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+                env->file_env()->m_required_files.end() &&
+            !str_util::ends_with(result->m_def_location->file_path,
+                                 env->file_env()->name() + ".gc")) {
+          lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                   result->m_def_location->file_path, name);
+          env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+        }
+      }
+    }
+  }
+  auto sext = full_type->get_load_signed();
   auto fe = env->function_env();
   auto sym = fe->alloc_val<SymbolVal>(name, m_ts.make_typespec("symbol"));
   auto re = fe->alloc_val<SymbolValueVal>(sym, ts, sext);
@@ -432,17 +469,35 @@ Val* Compiler::compile_symbol(const goos::Object& form, Env* env) {
   }
 
   auto global_constant = m_global_constants.lookup(form.as_symbol());
-  auto existing_symbol = m_symbol_types.lookup(form.as_symbol());
 
   // see if it's a constant
   if (global_constant) {
+    auto existing_symbol = m_symbol_types.lookup(form.as_symbol());
     // check there is no symbol with the same name
     if (existing_symbol) {
       throw_compiler_error(form,
                            "Ambiguous symbol: {} is both a global variable and a constant and it "
                            "is not clear which should be used here.");
     }
-
+    if (m_settings.check_for_requires) {
+      // TODO - these file checks are gross, replace with something more robust long-term
+      const auto& symbol_info =
+          m_symbol_info.lookup_exact_name(name, symbol_info::Kind::GLOBAL_VAR);
+      if (!symbol_info.empty()) {
+        const auto& result = symbol_info.at(0);
+        if (result->m_def_location.has_value() &&
+            !env->file_env()->m_missing_required_files.contains(
+                result->m_def_location->file_path) &&
+            env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+                env->file_env()->m_required_files.end() &&
+            !str_util::ends_with(result->m_def_location->file_path,
+                                 env->file_env()->name() + ".gc")) {
+          lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                   result->m_def_location->file_path, name);
+          env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+        }
+      }
+    }
     // got a global constant
     return compile_error_guard(*global_constant, env);
   }
diff --git a/goalc/compiler/compilation/CompilerControl.cpp b/goalc/compiler/compilation/CompilerControl.cpp
index 383ff92b8..3e61a12bb 100644
--- a/goalc/compiler/compilation/CompilerControl.cpp
+++ b/goalc/compiler/compilation/CompilerControl.cpp
@@ -311,6 +311,26 @@ Val* Compiler::compile_in_package(const goos::Object& form, const goos::Object&
   return get_none();
 }
 
+/*!
+ * TODO - this form will denote which .DGO/.CGO the file should be bundled within
+ */
+Val* Compiler::compile_bundles(const goos::Object& form, const goos::Object& rest, Env* env) {
+  (void)form;
+  (void)rest;
+  (void)env;
+  return get_none();
+}
+
+/*!
+ * TODO - this form will denote a dependency for the given file
+ */
+Val* Compiler::compile_require(const goos::Object& form, const goos::Object& rest, Env* env) {
+  (void)form;
+  (void)rest;
+  (void)env;
+  return get_none();
+}
+
 /*!
  * Build dgo files. Takes a string argument pointing to the DGO description file, which is read
  * and parsed here.
@@ -583,7 +603,6 @@ Val* Compiler::compile_update_macro_metadata(const goos::Object& form,
   auto& name = args.unnamed.at(0).as_symbol().name_ptr;
 
   auto arg_spec = m_goos.parse_arg_spec(form, args.unnamed.at(2));
-  m_macro_specs[name] = arg_spec;
   m_symbol_info.add_macro(name, arg_spec, form, args.unnamed.at(1).as_string()->data);
   return get_none();
 }
@@ -757,7 +776,8 @@ Compiler::generate_per_file_symbol_info() {
       macro_doc.name = sym_info->m_name;
       macro_doc.description = sym_info->m_docstring;
       macro_doc.def_location = def_loc;
-      const auto& arg_spec = m_macro_specs[macro_doc.name];
+      // TODO - rewrite all of this to use the new symbol map, make sure macros work
+      /*const auto& arg_spec = m_macro_specs[macro_doc.name];
       for (const auto& arg : arg_spec.unnamed) {
         macro_doc.args.push_back(arg);
       }
@@ -770,7 +790,7 @@ Compiler::generate_per_file_symbol_info() {
       }
       if (!arg_spec.rest.empty()) {
         macro_doc.variadic_arg = arg_spec.rest;
-      }
+      }*/
       file_doc.macros.push_back(macro_doc);
     } else if (sym_info->m_kind == symbol_info::Kind::METHOD) {
       Docs::MethodDocumentation method_doc;
@@ -856,6 +876,25 @@ Val* Compiler::compile_gen_docs(const goos::Object& form, const goos::Object& re
   return get_none();
 }
 
+Val* Compiler::compile_export_requires(const goos::Object& form, const goos::Object& rest, Env*) {
+  auto args = get_va(form, rest);
+  va_check(form, args, {goos::ObjectType::STRING}, {});
+
+  const auto& export_path = fs::path(args.unnamed.at(0).as_string()->data);
+  lg::info("Saving require map to: {}", export_path.string());
+
+  json export_map;
+  for (const auto& file : m_global_env->get_files()) {
+    export_map[file->name()] = file->m_missing_required_files;
+  }
+
+  file_util::write_text_file(
+      export_path / fmt::format("{}-missing-requires.json", version_to_game_name(m_version)),
+      export_map.dump());
+
+  return get_none();
+}
+
 Val* Compiler::compile_gc_text(const goos::Object&, const goos::Object&, Env*) {
   m_goos.reader.db.clear_info();
   return get_none();
diff --git a/goalc/compiler/compilation/ConstantPropagation.cpp b/goalc/compiler/compilation/ConstantPropagation.cpp
index 2a630005c..abf858bf0 100644
--- a/goalc/compiler/compilation/ConstantPropagation.cpp
+++ b/goalc/compiler/compilation/ConstantPropagation.cpp
@@ -1,3 +1,5 @@
+#include "common/util/string_util.h"
+
 #include "goalc/compiler/Compiler.h"
 
 /*!
@@ -245,19 +247,43 @@ Compiler::ConstPropResult Compiler::constant_propagation_dispatch(const goos::Ob
 }
 
 s64 Compiler::get_constant_integer_or_error(const goos::Object& in, Env* env) {
-  auto prop = try_constant_propagation(in, env);
+  const auto prop = try_constant_propagation(in, env);
   if (prop.value.is_pair()) {
-    auto head = prop.value.as_pair()->car;
+    const auto& head = prop.value.as_pair()->car;
     if (head.is_symbol()) {
-      auto head_sym = head.as_symbol();
-      auto enum_type = m_ts.try_enum_lookup(head_sym.name_ptr);
+      const auto& head_sym = head.as_symbol();
+      const auto enum_type = m_ts.try_enum_lookup(head_sym.name_ptr);
       if (enum_type) {
+        if (m_settings.check_for_requires) {
+          // Check if the enum has been required or not
+          if (enum_type->m_metadata.definition_info.has_value() &&
+              !env->file_env()->m_missing_required_files.contains(
+                  enum_type->m_metadata.definition_info->filename) &&
+              env->file_env()->m_required_files.find(
+                  enum_type->m_metadata.definition_info->filename) ==
+                  env->file_env()->m_required_files.end() &&
+              !str_util::ends_with(enum_type->m_metadata.definition_info->filename,
+                                   env->file_env()->name() + ".gc")) {
+            lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                     enum_type->m_metadata.definition_info->filename, head_sym.name_ptr);
+            env->file_env()->m_missing_required_files.insert(
+                enum_type->m_metadata.definition_info->filename);
+          }
+        }
         bool success;
-        u64 as_enum =
-            enum_lookup(prop.value, enum_type, prop.value.as_pair()->cdr, false, &success);
+        // TODO - changed false to true so you'd actually once again get a useful error (something
+        // wasn't found in the enum instead of just "cant be used as a constant") Ramifications of
+        // this?
+        const u64 as_enum =
+            enum_lookup(prop.value, enum_type, prop.value.as_pair()->cdr, true, &success);
         if (success) {
           return as_enum;
         }
+      } else {
+        // TODO - provide a meaningful error to using an enum that wasn't defined
+        // is this going to break other things, it looks like currently the `has_side_effects` is
+        // defaulted to `true` so the error below is kinda...by accident?
+        throw_compiler_error(in, "{} is not a defined enum.", head_sym.name_ptr);
       }
     }
   }
diff --git a/goalc/compiler/compilation/Define.cpp b/goalc/compiler/compilation/Define.cpp
index 420961c58..fdde59bf0 100644
--- a/goalc/compiler/compilation/Define.cpp
+++ b/goalc/compiler/compilation/Define.cpp
@@ -49,7 +49,7 @@ Val* Compiler::compile_define(const goos::Object& form, const goos::Object& rest
       f.lambda = as_lambda->lambda;
       f.type = as_lambda->type();
     }
-    // Most defines come via macro invokations, we want the TRUE defining form location
+    // Most defines come via macro invocations, we want the TRUE defining form location
     // if we can get it
     // TODO - test the return value changes
     if (env->macro_expand_env()) {
diff --git a/goalc/compiler/compilation/Function.cpp b/goalc/compiler/compilation/Function.cpp
index f88e1b50f..7f81586d5 100644
--- a/goalc/compiler/compilation/Function.cpp
+++ b/goalc/compiler/compilation/Function.cpp
@@ -3,6 +3,8 @@
  * Calling and defining functions, lambdas, and inlining.
  */
 
+#include "common/util/string_util.h"
+
 #include "goalc/compiler/Compiler.h"
 #include "goalc/emitter/CallingConvention.h"
 
@@ -315,10 +317,26 @@ Val* Compiler::compile_lambda(const goos::Object& form, const goos::Object& rest
  */
 Val* Compiler::compile_function_or_method_call(const goos::Object& form, Env* env) {
   goos::Object f = form;
-  auto fe = env->function_env();
+  const auto fe = env->function_env();
 
-  auto args = get_va(form, form);
-  auto uneval_head = args.unnamed.at(0);
+  const auto args = get_va(form, form);
+  const auto& uneval_head = args.unnamed.at(0);
+  if (m_settings.check_for_requires) {
+    const auto& symbol_info = m_symbol_info.lookup_exact_name(uneval_head.print());
+    if (!symbol_info.empty()) {
+      const auto& result = symbol_info.at(0);
+      if (result->m_def_location.has_value() &&
+          !env->file_env()->m_missing_required_files.contains(result->m_def_location->file_path) &&
+          env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+              env->file_env()->m_required_files.end() &&
+          !str_util::ends_with(result->m_def_location->file_path,
+                               env->file_env()->name() + ".gc")) {
+        lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                 result->m_def_location->file_path, uneval_head.print());
+        env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+      }
+    }
+  }
   Val* head = get_none();
 
   // determine if this call should be automatically inlined.
diff --git a/goalc/compiler/compilation/Macro.cpp b/goalc/compiler/compilation/Macro.cpp
index 52d5c436a..6d21de2ee 100644
--- a/goalc/compiler/compilation/Macro.cpp
+++ b/goalc/compiler/compilation/Macro.cpp
@@ -1,4 +1,5 @@
 #include "common/goos/PrettyPrinter.h"
+#include "common/util/string_util.h"
 
 #include "goalc/compiler/Compiler.h"
 
@@ -31,6 +32,24 @@ Val* Compiler::compile_goos_macro(const goos::Object& o,
                                   const goos::Object& rest,
                                   const goos::Object& name,
                                   Env* env) {
+  if (m_settings.check_for_requires) {
+    const auto& symbol_info =
+        m_symbol_info.lookup_exact_name(name.print(), symbol_info::Kind::MACRO);
+    if (!symbol_info.empty()) {
+      const auto& result = symbol_info.at(0);
+      if (result->m_def_location.has_value() &&
+          !env->file_env()->m_missing_required_files.contains(result->m_def_location->file_path) &&
+          env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+              env->file_env()->m_required_files.end() &&
+          !str_util::ends_with(result->m_def_location->file_path,
+                               env->file_env()->name() + ".gc")) {
+        lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                 result->m_def_location->file_path, name.print());
+        env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+      }
+    }
+  }
+
   auto macro = macro_obj.as_macro();
   Arguments args = m_goos.get_args(o, rest, macro->args);
   auto mac_env_obj = EnvironmentObject::make_new();
@@ -45,8 +64,6 @@ Val* Compiler::compile_goos_macro(const goos::Object& o,
       env->function_env()->alloc_env<MacroExpandEnv>(env, name.as_symbol(), macro->body, o);
   try {
     const auto& compile_result = compile(goos_result, compile_env_for_macro);
-    // TODO - is this critical (do the args and such change?)?
-    m_macro_specs.emplace(macro->name, macro->args);
     return compile_result;
   } catch (CompilerException& ce) {
     if (ce.print_err_stack) {
diff --git a/goalc/compiler/compilation/State.cpp b/goalc/compiler/compilation/State.cpp
index 9f7eb989e..4d4614a16 100644
--- a/goalc/compiler/compilation/State.cpp
+++ b/goalc/compiler/compilation/State.cpp
@@ -45,8 +45,10 @@ Val* Compiler::compile_define_state_hook(const goos::Object& form,
   //  state_name
   //  state_parent
   //  state object
+  //  docstring
   //  named args for enter/exit/trans/post/event/code
-  va_check(form, args, {goos::ObjectType::SYMBOL, goos::ObjectType::SYMBOL, {}},
+  va_check(form, args,
+           {goos::ObjectType::SYMBOL, goos::ObjectType::SYMBOL, {}, goos::ObjectType::STRING},
            {
                {"enter", {true, {}}},
                {"exit", {true, {}}},
@@ -56,6 +58,11 @@ Val* Compiler::compile_define_state_hook(const goos::Object& form,
                {"code", {true, {}}},
            });
 
+  std::string docstring = "";
+  if (args.unnamed.size() == 4 && args.unnamed.at(3).is_string()) {
+    docstring = args.unnamed.at(3).as_string()->data;
+  }
+
   Val* code_value = NULL;
   Val* enter_value = NULL;
 
@@ -121,6 +128,18 @@ Val* Compiler::compile_define_state_hook(const goos::Object& form,
 
   auto sym_val = env->function_env()->alloc_val<SymbolVal>(state_name.name_ptr, type_to_use);
 
+  std::vector<symbol_info::ArgumentInfo> arg_info = {};
+  if (code_value) {
+    auto as_lambda = dynamic_cast<LambdaVal*>(code_value);
+    if (as_lambda) {
+      for (const auto& arg : as_lambda->lambda.params) {
+        arg_info.push_back({.name = arg.name, .type = arg.type.base_type()});
+      }
+    }
+  }
+
+  m_symbol_info.add_state(state_name.name_ptr, state_parent_type.print(), false, arg_info, form,
+                          docstring);
   env->emit_ir<IR_SetSymbolValue>(form, sym_val, state_object);
 
   return get_none();
@@ -141,10 +160,15 @@ Val* Compiler::compile_define_virtual_state_hook(const goos::Object& form,
   //  state_name
   //  state_parent
   //  state object
+  //  docstring
   //  is_override
   //  named args for enter/exit/trans/post/event/code
   va_check(form, args,
-           {goos::ObjectType::SYMBOL, goos::ObjectType::SYMBOL, {}, goos::ObjectType::SYMBOL},
+           {goos::ObjectType::SYMBOL,
+            goos::ObjectType::SYMBOL,
+            {},
+            goos::ObjectType::STRING,
+            goos::ObjectType::SYMBOL},
            {
                {"enter", {true, {}}},
                {"exit", {true, {}}},
@@ -154,6 +178,11 @@ Val* Compiler::compile_define_virtual_state_hook(const goos::Object& form,
                {"code", {true, {}}},
            });
 
+  std::string docstring = "";
+  if (args.unnamed.size() == 5 && args.unnamed.at(3).is_string()) {
+    docstring = args.unnamed.at(3).as_string()->data;
+  }
+
   Val* code_value = NULL;
   Val* enter_value = NULL;
 
@@ -184,7 +213,7 @@ Val* Compiler::compile_define_virtual_state_hook(const goos::Object& form,
   MethodInfo parent_method_info;
   auto parent_of_parent_type = m_ts.lookup_type(state_parent.name_ptr)->get_parent();
   if (m_ts.try_lookup_method(parent_of_parent_type, state_name.name_ptr, &parent_method_info) &&
-      args.unnamed.at(3).as_symbol() == "#f") {
+      args.unnamed.at(4).as_symbol() == "#f") {
     // need to call inherit state TODO
     auto inherit_state_func =
         compile_get_symbol_value(form, "inherit-state", env)->to_gpr(form, env);
@@ -234,6 +263,19 @@ Val* Compiler::compile_define_virtual_state_hook(const goos::Object& form,
     }
   }
 
+  std::vector<symbol_info::ArgumentInfo> arg_info = {};
+  if (code_value) {
+    auto as_lambda = dynamic_cast<LambdaVal*>(code_value);
+    if (as_lambda) {
+      for (const auto& arg : as_lambda->lambda.params) {
+        arg_info.push_back({.name = arg.name, .type = arg.type.base_type()});
+      }
+    }
+  }
+
+  m_symbol_info.add_state(state_name.name_ptr, state_parent_type.print(), true, arg_info, form,
+                          docstring);
+
   return get_none();
 }
 
diff --git a/goalc/compiler/compilation/Type.cpp b/goalc/compiler/compilation/Type.cpp
index f110390d6..f20114ec1 100644
--- a/goalc/compiler/compilation/Type.cpp
+++ b/goalc/compiler/compilation/Type.cpp
@@ -3,6 +3,7 @@
 #include "common/type_system/deftype.h"
 #include "common/type_system/state.h"
 #include "common/util/math_util.h"
+#include "common/util/string_util.h"
 
 #include "goalc/compiler/Compiler.h"
 #include "goalc/emitter/CallingConvention.h"
@@ -89,6 +90,33 @@ RegVal* Compiler::compile_get_method_of_object(const goos::Object& form,
     }
   }
 
+  if (m_settings.check_for_requires) {
+    std::vector<symbol_info::SymbolInfo*> symbol_info =
+        m_symbol_info.lookup_exact_method_name(method_info.name, compile_time_type.base_type());
+    // TODO - check for virtual state requirement, if i could track the defining form!
+    // if (symbol_info.empty()) {
+    //  // maybe it's a virtual state
+    //  symbol_info = m_symbol_info.lookup_exact_virtual_state_name(method_info.name,
+    //                                                              compile_time_type.base_type());
+    //  if (!symbol_info.empty()) {
+    //    int x = 0;
+    //  }
+    //}
+    if (!symbol_info.empty()) {
+      const auto& result = symbol_info.at(0);
+      if (result->m_def_location.has_value() &&
+          !env->file_env()->m_missing_required_files.contains(result->m_def_location->file_path) &&
+          env->file_env()->m_required_files.find(result->m_def_location->file_path) ==
+              env->file_env()->m_required_files.end() &&
+          !str_util::ends_with(result->m_def_location->file_path,
+                               env->file_env()->name() + ".gc")) {
+        lg::warn("Missing require in {} for {} over {}", env->file_env()->name(),
+                 result->m_def_location->file_path, method_info.name);
+        env->file_env()->m_missing_required_files.insert(result->m_def_location->file_path);
+      }
+    }
+  }
+
   method_info.type = method_info.type.substitute_for_method_call(compile_time_type.base_type());
   auto fe = env->function_env();
 
@@ -1464,7 +1492,11 @@ Val* Compiler::compile_defenum(const goos::Object& form, const goos::Object& res
   (void)form;
   (void)env;
 
-  parse_defenum(rest, &m_ts, {});
+  DefinitionMetadata def_metadata;
+  const auto new_enum = parse_defenum(rest, &m_ts, &def_metadata);
+  new_enum->m_metadata.definition_info = m_goos.reader.db.get_short_info_for(form);
+  m_symbol_info.add_enum(new_enum, form,
+                         def_metadata.docstring.has_value() ? def_metadata.docstring.value() : "");
   return get_none();
 }
 
@@ -1477,7 +1509,8 @@ u64 Compiler::enum_lookup(const goos::Object& form,
   if (e->is_bitfield()) {
     uint64_t value = 0;
     for_each_in_list(rest, [&](const goos::Object& o) {
-      auto kv = e->entries().find(symbol_string(o));
+      const auto test = symbol_string(o);
+      auto kv = e->entries().find(test);
       if (kv == e->entries().end()) {
         if (throw_on_error) {
           throw_compiler_error(form, "The value {} was not found in enum.", o.print());
diff --git a/goalc/compiler/symbol_info.cpp b/goalc/compiler/symbol_info.cpp
index d5832b7c9..2b74c3a4d 100644
--- a/goalc/compiler/symbol_info.cpp
+++ b/goalc/compiler/symbol_info.cpp
@@ -106,7 +106,6 @@ void SymbolInfoMap::add_function(const std::string& name,
   for (const auto& goal_arg : args) {
     ArgumentInfo arg_info;
     arg_info.name = goal_arg.name;
-    arg_info.type_spec = goal_arg.type;
     // TODO - is this reliable?
     arg_info.type = goal_arg.type.base_type();
     info.m_args.push_back(arg_info);
@@ -239,10 +238,11 @@ void SymbolInfoMap::add_builtin(const std::string& name, const std::string& docs
 void SymbolInfoMap::add_method(const std::string& method_name,
                                const std::vector<GoalArg>& args,
                                const MethodInfo& method_info,
-                               const goos::Object& /*defining_form*/) {
+                               const goos::Object& defining_form) {
   SymbolInfo info = {
       .m_kind = Kind::METHOD,
       .m_name = method_name,
+      .m_def_form = defining_form,
       .m_method_info = method_info,
       .m_method_builtin = method_info.id <= 9,
   };
@@ -252,7 +252,6 @@ void SymbolInfoMap::add_method(const std::string& method_name,
   for (const auto& goal_arg : args) {
     ArgumentInfo arg_info;
     arg_info.name = goal_arg.name;
-    arg_info.type_spec = goal_arg.type;
     // TODO - is this reliable?
     arg_info.type = goal_arg.type.base_type();
     info.m_args.push_back(arg_info);
@@ -265,6 +264,44 @@ void SymbolInfoMap::add_method(const std::string& method_name,
   }
 }
 
+void SymbolInfoMap::add_state(const std::string& name,
+                              const std::string& related_type,
+                              const bool is_virtual,
+                              const std::vector<ArgumentInfo>& code_args,
+                              const goos::Object& defining_form,
+                              const std::string& docstring) {
+  SymbolInfo info = {
+      .m_kind = Kind::STATE,
+      .m_name = name,
+      .m_def_form = defining_form,
+      .m_docstring = docstring,
+      .m_state_related_type = related_type,
+      .m_state_virtual = is_virtual,
+  };
+  // TODO - split up docstring into individual handlers
+  // TODO - update args from docstring
+  info.set_definition_location(m_textdb);
+  const auto inserted_symbol = m_symbol_map.insert(name, info);
+  if (info.m_def_location) {
+    add_symbol_to_file_index(info.m_def_location->file_path, inserted_symbol);
+  }
+}
+
+void SymbolInfoMap::add_enum(EnumType* enum_info,
+                             const goos::Object& defining_form,
+                             const std::string& docstring) {
+  SymbolInfo info = {.m_kind = Kind::ENUM,
+                     .m_name = enum_info->get_name(),
+                     .m_def_form = defining_form,
+                     .m_docstring = docstring,
+                     .m_enum_info = enum_info};
+  info.set_definition_location(m_textdb);
+  const auto inserted_symbol = m_symbol_map.insert(info.m_name, info);
+  if (info.m_def_location) {
+    add_symbol_to_file_index(info.m_def_location->file_path, inserted_symbol);
+  }
+}
+
 std::vector<SymbolInfo*> SymbolInfoMap::lookup_symbols_by_file(const std::string& file_path) const {
   if (m_file_symbol_index.find(file_path) != m_file_symbol_index.end()) {
     return m_file_symbol_index.at(file_path);
@@ -276,6 +313,45 @@ std::vector<SymbolInfo*> SymbolInfoMap::lookup_exact_name(const std::string& nam
   return m_symbol_map.retrieve_with_exact(name);
 }
 
+std::vector<SymbolInfo*> SymbolInfoMap::lookup_exact_name(const std::string& name,
+                                                          const Kind sym_kind) const {
+  const auto query_results = m_symbol_map.retrieve_with_exact(name);
+  std::vector<SymbolInfo*> filtered_results = {};
+  for (const auto& result : query_results) {
+    if (result->m_kind == sym_kind) {
+      filtered_results.push_back(result);
+    }
+  }
+  return filtered_results;
+}
+
+std::vector<SymbolInfo*> SymbolInfoMap::lookup_exact_method_name(
+    const std::string& name,
+    const std::string& defining_type_name) const {
+  const auto query_results = m_symbol_map.retrieve_with_exact(name);
+  std::vector<SymbolInfo*> filtered_results = {};
+  for (const auto& result : query_results) {
+    if (result->m_kind == Kind::METHOD && result->m_method_info.type_name == defining_type_name) {
+      filtered_results.push_back(result);
+    }
+  }
+  return filtered_results;
+}
+
+std::vector<SymbolInfo*> SymbolInfoMap::lookup_exact_virtual_state_name(
+    const std::string& name,
+    const std::string& defining_type_name) const {
+  const auto query_results = m_symbol_map.retrieve_with_exact(name);
+  std::vector<SymbolInfo*> filtered_results = {};
+  for (const auto& result : query_results) {
+    if (result->m_kind == Kind::STATE && result->m_state_virtual &&
+        result->m_state_related_type == defining_type_name) {
+      filtered_results.push_back(result);
+    }
+  }
+  return filtered_results;
+}
+
 std::vector<SymbolInfo*> SymbolInfoMap::lookup_symbols_starting_with(
     const std::string& prefix) const {
   std::vector<SymbolInfo*> symbols;
diff --git a/goalc/compiler/symbol_info.h b/goalc/compiler/symbol_info.h
index 6469ef35d..d8801851e 100644
--- a/goalc/compiler/symbol_info.h
+++ b/goalc/compiler/symbol_info.h
@@ -12,17 +12,28 @@
 
 namespace symbol_info {
 
-// TODO - states
-// TODO - enums
+// Require statement todo:
+// - [] reduce empty fields in SymbolInfo
+// - [] `bundle-list` command
+// - [] get rid of old doc generation code
+// - [] compilation speed report
+// - [] potentially remove redundant map in compiler, try to get my symbol info trie more efficient
+// (assuming its not).  Some sort of lookup cache, etc.
+// - [] replace most unordered_maps with robin-maps atleast a 2x improvement (benchmark it)
+// - [] some paths are stored differently for some reason, there's some inconsistent path separators
+// somewhere, investigate
+
 enum class Kind {
   GLOBAL_VAR,
   FWD_DECLARED_SYM,
   FUNCTION,
   TYPE,
   CONSTANT,
-  MACRO,
+  MACRO,  // TODO - defining form for virtual state isnt tracked by reader
   LANGUAGE_BUILTIN,
   METHOD,
+  STATE,  // TODO - defining form for virtual state isnt tracked by reader
+  ENUM,
   INVALID
 };
 
@@ -35,8 +46,6 @@ struct DefinitionLocation {
 
 struct ArgumentInfo {
   std::string name;
-  // TODO - anything use this?
-  TypeSpec type_spec;
   std::string type;
   std::string description = "";
   // !var
@@ -74,15 +83,6 @@ struct TypeStateInfo {
   std::optional<int> id;  // TODO - is this even relevant anymore?
 };
 
-/*!
- * Info about a single symbol, representing one of:
- *  - Global variable
- *  - Global function
- *  - Type
- *  - Constant
- *  - Macro
- *  - Builtin keyword of the OpenGOAL language
- */
 struct SymbolInfo {
   Kind m_kind = Kind::INVALID;
   std::string m_name;
@@ -99,7 +99,6 @@ struct SymbolInfo {
   // Type Related
   std::string m_parent_type = "";
   int m_type_size = -1;
-  // NOTE - removed method count...seems unnecessary?
   std::vector<FieldInfo> m_type_fields = {};
   std::vector<TypeMethodInfo> m_type_methods = {};
   std::vector<TypeStateInfo> m_type_states = {};
@@ -107,6 +106,14 @@ struct SymbolInfo {
   std::vector<std::string> m_macro_args = {};
   std::vector<std::pair<std::string, std::optional<std::string>>> m_macro_kwargs = {};
   std::optional<std::string> m_variadic_arg = {};
+  // State Related
+  std::string m_state_related_type;
+  bool m_state_virtual = false;
+  std::unordered_map<std::string, std::string> m_state_handler_docstrings;
+  std::vector<ArgumentInfo> m_state_enter_and_code_args = {};
+  // Enum related
+  EnumType* m_enum_info = nullptr;
+
   // TODO: need to track references for this, this is a TODO for LSP work
   // bool is_unused = false;
 
@@ -156,8 +163,23 @@ class SymbolInfoMap {
                   const std::vector<GoalArg>& args,
                   const MethodInfo& method_info,
                   const goos::Object& defining_form);
+  void add_state(const std::string& name,
+                 const std::string& related_type,
+                 const bool is_virtual,
+                 const std::vector<ArgumentInfo>& code_args,
+                 const goos::Object& defining_form,
+                 const std::string& docstring);
+  void add_enum(EnumType* enum_info,
+                const goos::Object& defining_form,
+                const std::string& docstring = "");
   std::vector<SymbolInfo*> lookup_symbols_by_file(const std::string& file_path) const;
   std::vector<SymbolInfo*> lookup_exact_name(const std::string& name) const;
+  std::vector<SymbolInfo*> lookup_exact_name(const std::string& name, const Kind sym_kind) const;
+  std::vector<SymbolInfo*> lookup_exact_method_name(const std::string& name,
+                                                    const std::string& defining_type_name) const;
+  std::vector<SymbolInfo*> lookup_exact_virtual_state_name(
+      const std::string& name,
+      const std::string& defining_type_name) const;
   std::vector<SymbolInfo*> lookup_symbols_starting_with(const std::string& prefix) const;
   std::set<std::string> lookup_names_starting_with(const std::string& prefix,
                                                    int max_count = -1) const;
diff --git a/scripts/gsrc/.gitignore b/scripts/gsrc/.gitignore
new file mode 100644
index 000000000..94a2dd146
--- /dev/null
+++ b/scripts/gsrc/.gitignore
@@ -0,0 +1 @@
+*.json
\ No newline at end of file
diff --git a/scripts/gsrc/add-missing-requires.py b/scripts/gsrc/add-missing-requires.py
new file mode 100644
index 000000000..8111d387d
--- /dev/null
+++ b/scripts/gsrc/add-missing-requires.py
@@ -0,0 +1,175 @@
+import json
+import os
+import re
+
+with open('./jak1-missing-requires.json', 'r') as f:
+  missing_requires = json.load(f)
+
+from pathlib import Path
+from collections import defaultdict
+import networkx as nx
+import glob
+
+# 1. in `goalc` right now atleast, I can't seem to be able to accurately detect:
+# - macro usages
+# - virtual state usages
+# This is because tracking their definition locations is difficult, due to it coming from
+# a macro environment, which is not tracked.
+# 
+# This can probably be solved, but for now, I'll bite the bullet and statically analyze the code
+#
+# Find all macro definition locations in `goal_src` as well as all virtual `defstate`s.
+# Then we can find all spots where these are used and ensure they are within the missing-require json.
+macro_definitions = {}
+virtual_state_definitions = {}
+
+# find definitions
+files = glob.glob("../../goal_src/jak1/**/*.gc", recursive=True)
+for file in files:
+    with open(file, 'r') as f:
+        lines = f.readlines()
+        for line_no, line in enumerate(lines):
+            if line.lstrip().startswith("(defmacro "):
+                name = line.split("(defmacro ")[1].split(" ")[0]
+                macro_definitions[name] = file
+            elif line.lstrip().startswith("(defstate ") and line_no + 1 < len(lines) and ":virtual #t" in lines[line_no + 1]:
+                name = line.split("(defstate ")[1].split(" ")[0]
+                proc_name = line.split("(defstate ")[1].split("(")[1].split(")")[0]
+                virtual_state_definitions[f"{name}-{proc_name}"] = file
+
+print(len(macro_definitions))
+print(len(virtual_state_definitions))
+
+# now look for all usages
+for file_no, file in enumerate(files):
+    print(f"{file_no}/{len(files)} - {Path(file).stem}")
+    with open(file, 'r') as f:
+        lines = f.readlines()
+        for line_no, line in enumerate(lines):
+            if '(go-virtual ' in line:
+                state_name = line.split("(go-virtual ")[1].split(" ")[0]
+                # find the process name by winding back up the line count until we find:
+                # an defstate/defbehavior line
+                # an empty line (give up)
+                temp_line_no = line_no
+                proc_name = ""
+                while temp_line_no > 0:
+                    temp_line = lines[temp_line_no]
+                    if temp_line.lstrip().startswith("(defstate "):
+                        proc_name = temp_line.split("(defstate ")[1].split("(")[1].split(")")[0]
+                        break
+                    elif temp_line.lstrip().startswith("(defbehavior "):
+                        proc_name = temp_line.split("(defbehavior ")[1].split(" ")[1]
+                        break
+                    elif temp_line.strip() == "":
+                        break
+                    temp_line_no = temp_line_no - 1
+                if proc_name != "":
+                    # find the state's definition and ensure we require it
+                    if f"{name}-{proc_name}" in virtual_state_definitions.keys():
+                        state_definition_file = virtual_state_definitions[f"{name}-{proc_name}"]
+                        curr_file = Path(file).stem
+                        if curr_file not in missing_requires.keys():
+                            missing_requires[curr_file] = [state_definition_file]
+                        else:
+                            missing_requires[curr_file].append(state_definition_file)
+            # ... check all macros
+            else:
+                for macro_name, macro_definition_file in macro_definitions.items():
+                    if f"({macro_name} " in line:
+                        curr_file = Path(file).stem
+                        if curr_file not in missing_requires.keys():
+                            missing_requires[curr_file] = [macro_definition_file]
+                        else:
+                            missing_requires[curr_file].append(macro_definition_file)
+
+# reduce dependencies to just stems because currently files have to be globally unique, so this is fine
+# also dedupe them
+for file_name, deps in missing_requires.items():
+    new_deps = set()
+    for dep in deps:
+        stem = Path(dep).stem
+        if stem != file_name:
+            new_deps.add(stem)
+    missing_requires[file_name] = list(new_deps)
+
+output_file = "jak1-missing-requires-final.json"
+with open(output_file, "w") as f:
+    json.dump(missing_requires, f, indent=2)
+
+def create_graph(dependencies):
+    graph = nx.DiGraph()
+    for key, files in dependencies.items():
+        for file in files:
+            graph.add_edge(key, Path(file).stem)
+    return graph
+
+def transitive_reduction(graph):
+    transitive_reduced_graph = nx.transitive_reduction(graph)
+    return transitive_reduced_graph
+
+graph = create_graph(missing_requires)
+# print(nx.find_cycle(graph)) DEBUGGING CYCLES
+reduced_graph = transitive_reduction(graph)
+
+# Convert reduced graph to dictionary
+reduced_dependencies = {}
+for node, successors in reduced_graph.adjacency():
+    reduced_dependencies[node] = list(successors.keys())
+
+output_file = "transitive_reduced_dependencies.json"
+with open(output_file, "w") as f:
+    json.dump(reduced_dependencies, f, indent=4)
+
+print(f"Transitive reduced dependencies written to {output_file}")
+
+# Figure out packages by looking at .gd files
+file_bundles = {}
+gd_files = glob.glob("../../goal_src/jak1/**/*.gd", recursive=True)
+for file in gd_files:
+    with open(file, 'r') as f:
+        lines = f.readlines()
+        bundle_name = lines[0].replace("(", "").replace(")", "").replace("\"", "").strip()
+        for line_no, line in enumerate(lines):
+           if line_no == 0:
+              continue
+           stripped_line = line.replace("(", "").replace(")", "").replace("\"", "").strip()
+           if '.o' in stripped_line:
+              file_name = stripped_line.replace(".o", "")
+              if file_name not in file_bundles.keys():
+                file_bundles[file_name] = [f"\"{bundle_name}\""]
+              elif f"\"{bundle_name}\"" not in file_bundles[file_name]:
+                file_bundles[file_name].append(f"\"{bundle_name}\"")
+
+# Go and append the require statements to the beginning of all files
+for file in files:
+    with open(file, 'r+') as f:
+        lines = f.readlines()
+        new_lines = []
+        for line in lines:
+           if "(in-package " in line:
+              new_lines.append(line)
+              file_stem = Path(file).stem
+              # add in bundle and require statements
+              if file_stem in file_bundles.keys():
+                new_lines.append(f"(bundles {" ".join(file_bundles[file_stem])})\n")
+              if file_stem in reduced_dependencies.keys():
+                new_lines.append("\n")
+                for dep in reduced_dependencies[file_stem]:
+                   # Find the file's full path
+                   minimized_path = ""
+                   for temp_file in files:
+                     if Path(temp_file).stem == dep:
+                        minimized_path = os.path.normpath(temp_file).replace(os.sep, '/').split("goal_src/jak1/")[1]
+                        break
+                   new_lines.append(f"(require \"{minimized_path}\")\n")
+                new_lines.append("\n")
+           else:
+               new_lines.append(line)
+            
+        # Move the file pointer to the beginning
+        f.seek(0)
+        # Write the modified lines back to the file
+        f.writelines(new_lines)
+        # Truncate any remaining content (if the new content is shorter than the old)
+        f.truncate()
diff --git a/test/decompiler/reference/jak1/decompiler-macros.gc b/test/decompiler/reference/jak1/decompiler-macros.gc
index 8434e809a..b8edeecb9 100644
--- a/test/decompiler/reference/jak1/decompiler-macros.gc
+++ b/test/decompiler/reference/jak1/decompiler-macros.gc
@@ -422,11 +422,14 @@
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
-
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -489,8 +492,8 @@
          ;; This way it can check the individual function types, make sure they make sense, and create
          ;; a state with the appropriate type.
          ,(if virtual
-              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
-              `(define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
 
          )
diff --git a/test/decompiler/reference/jak2/decompiler-macros.gc b/test/decompiler/reference/jak2/decompiler-macros.gc
index ece299a6d..add3b04af 100644
--- a/test/decompiler/reference/jak2/decompiler-macros.gc
+++ b/test/decompiler/reference/jak2/decompiler-macros.gc
@@ -478,11 +478,15 @@
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
 
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -545,8 +549,8 @@
          ;; This way it can check the individual function types, make sure they make sense, and create
          ;; a state with the appropriate type.
          ,(if virtual
-              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
-              `(define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              `(define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
 
          )
diff --git a/test/decompiler/reference/jak3/decompiler-macros.gc b/test/decompiler/reference/jak3/decompiler-macros.gc
index d3b4650af..179240072 100644
--- a/test/decompiler/reference/jak3/decompiler-macros.gc
+++ b/test/decompiler/reference/jak3/decompiler-macros.gc
@@ -146,11 +146,15 @@
                                &key (exit *no-state*)
                                &key (code *no-state*)
                                &key (post *no-state*)
+                               &rest body
                                )
   "Define a new state!"
 
   (with-gensyms (new-state)
-    (let ((defstate-type (first parents)))
+    (let ((defstate-type (first parents))
+          (docstring ""))
+      (when (and (> (length body) 1) (string? (first body)))
+        (set! docstring (first body)))
       (when (not (null? *defstate-type-stack*))
         (fmt #t "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
                  *defstate-type-stack*)
@@ -217,23 +221,26 @@
             `(begin
               (inherit-state ,new-state ,(if (pair? parent) `(method-of-type ,(car parent) ,(cadr parent)) `(the state ,parent)))
               (set! (-> ,new-state parent) ,(if (pair? parent) `(method-of-type ,(car parent) ,(cadr parent)) `(the state ,parent)))
-              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            (virtual
-            `(define-virtual-state-hook ,state-name ,defstate-type ,new-state ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+            `(begin
+              (set! (-> ,new-state parent) #f)
+              (define-virtual-state-hook ,state-name ,defstate-type ,new-state ,docstring ,(eq? virtual 'override) :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              )
             )
            (parent
             `(begin
               (inherit-state ,new-state (the state ,parent))
               (set! (-> ,new-state parent) (the state ,parent))
-              (define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            (#t
             `(begin
               (set! (-> ,new-state parent) #f)
-              (define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
+              (define-state-hook ,state-name ,defstate-type ,new-state ,docstring :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
               )
             )
            )