diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 93df1726b6..8fc62a115f 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -132,7 +132,7 @@ gnc_add_scheme_deprecated_module ("gnucash report report-system report-collector
 gnc_add_scheme_deprecated_module ("gnucash report stylesheets" "" "" "")
 gnc_add_scheme_deprecated_module ("gnucash report utility-reports" "" "" "")
 
-add_custom_target(scm-report ALL DEPENDS scm-report-eguile)
+add_custom_target(scm-report ALL DEPENDS scm-report-2 scm-report-eguile)
 
 set_local_dist(report_DIST_local CMakeLists.txt
   report.i
diff --git a/gnucash/report/html-barchart.scm b/gnucash/report/html-barchart.scm
index 0af3e2f31e..4032e462da 100644
--- a/gnucash/report/html-barchart.scm
+++ b/gnucash/report/html-barchart.scm
@@ -21,8 +21,6 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report))
-
 (define <html-barchart>
   (make-record-type "<html-barchart>"
                     '(width 
diff --git a/gnucash/report/html-linechart.scm b/gnucash/report/html-linechart.scm
index a4dfe74fe8..44ebd40b1b 100644
--- a/gnucash/report/html-linechart.scm
+++ b/gnucash/report/html-linechart.scm
@@ -24,8 +24,6 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report))
-
 (define <html-linechart>
   (make-record-type "<html-linechart>"
                     '(width
diff --git a/gnucash/report/html-piechart.scm b/gnucash/report/html-piechart.scm
index 3eee4e35ad..f30ac8e519 100644
--- a/gnucash/report/html-piechart.scm
+++ b/gnucash/report/html-piechart.scm
@@ -21,8 +21,6 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report))
-
 (define <html-piechart>
   (make-record-type "<html-piechart>"
                     '(width
diff --git a/gnucash/report/html-scatter.scm b/gnucash/report/html-scatter.scm
index cc931df6c3..8167d19511 100644
--- a/gnucash/report/html-scatter.scm
+++ b/gnucash/report/html-scatter.scm
@@ -24,8 +24,6 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report))
-
 (define <html-scatter>
   (make-record-type "<html-scatter>"
                     '(width
diff --git a/libgnucash/engine/engine-utilities.scm b/libgnucash/engine/engine-utilities.scm
index 939e65ba26..1840eddd54 100644
--- a/libgnucash/engine/engine-utilities.scm
+++ b/libgnucash/engine/engine-utilities.scm
@@ -22,7 +22,10 @@
 ;; Copyright 2000 Rob Browning <rlb@cs.utexas.edu>
 (use-modules (gnucash gnc-module))
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/engine" 0))
+(eval-when
+      (compile load eval expand)
+      (load-extension "libgncmod-engine" "scm_init_sw_engine_module"))
+(use-modules (sw_engine))
 
 (use-modules (srfi srfi-1)
              (srfi srfi-13))