X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fguile-init.cc;h=4270aa01d6b9de89f093bad38df5f300b60545a0;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=86a998e9ab5c71ab23fda0465067c33650ebf8b8;hpb=ee35bce9fe991b2ee3dfa7e33539d74b29bcf91f;p=lilypond.git

diff --git a/lily/guile-init.cc b/lily/guile-init.cc
index 86a998e9ab..4270aa01d6 100644
--- a/lily/guile-init.cc
+++ b/lily/guile-init.cc
@@ -22,6 +22,7 @@
 #include "main.hh"
 #include "warn.hh"
 #include "smobs.hh"
+#include "lily-imports.hh"
 
 /*
   INIT
@@ -48,7 +49,7 @@ void add_scm_init_func (void (*f) ())
 }
 
 void
-ly_init_ly_module (void *)
+ly_init_ly_module ()
 {
   // Start up type system first.
   Scm_init::init ();
@@ -66,11 +67,12 @@ ly_init_ly_module (void *)
   scm_primitive_load_path (scm_from_ascii_string ("lily.scm"));
 }
 
-SCM global_lily_module;
-
 void
 ly_c_init_guile ()
 {
-  global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
+  Guile_user::module.import ();
+  Lily::module.boot (ly_init_ly_module);
+  Syntax::module.import ();
+  Display::module.import ();
   scm_c_use_module ("lily");
 }