diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index a1fe3aae64..a2da0f7853 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -97,7 +97,8 @@ set(GUILE_DEPENDS
 gnc_add_scheme_targets(scm-report-1
     SOURCES "${report_SCHEME_1}"
     OUTPUT_DIR "gnucash/report"
-    DEPENDS "${GUILE_DEPENDS}")
+    DEPENDS "${GUILE_DEPENDS}"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-report-2
     SOURCES "${report_SCHEME_2}"
diff --git a/gnucash/report/commodity-utilities.scm b/gnucash/report/commodity-utilities.scm
index 2dd1e6dce6..21f7238328 100644
--- a/gnucash/report/commodity-utilities.scm
+++ b/gnucash/report/commodity-utilities.scm
@@ -20,8 +20,43 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (ice-9 match))
+(define-module (gnucash report commodity-utilities))
+
+(use-modules (gnucash core-utils))
+(use-modules (gnucash engine))
+(use-modules (gnucash utilities))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report report-utilities))
+
+(use-modules (srfi srfi-1))
 (use-modules (srfi srfi-26))
+(use-modules (ice-9 match))
+
+(export gnc:get-match-commodity-splits)
+(export gnc:get-match-commodity-splits-sorted)
+(export gnc:get-all-commodity-splits )
+(export gnc:exchange-by-euro-numeric)
+(export gnc:get-commodity-totalavg-prices)
+(export gnc:get-commoditylist-totalavg-prices)
+(export gnc:get-commodity-inst-prices)
+(export gnc:pricelist-price-find-nearest)
+(export gnc:pricealist-lookup-nearest-in-time)
+(export gnc:resolve-unknown-comm)
+(export gnc:get-exchange-totals)
+(export gnc:get-exchange-cost-totals)
+(export gnc:make-exchange-alist)
+(export gnc:make-exchange-cost-alist)
+(export gnc:exchange-by-euro)
+(export gnc:exchange-if-same)
+(export gnc:make-exchange-function)
+(export gnc:exchange-by-pricedb-latest )
+(export gnc:exchange-by-pricedb-nearest)
+(export gnc:exchange-by-pricealist-nearest)
+(export gnc:case-exchange-fn)
+(export gnc:case-exchange-time-fn)
+(export gnc:case-price-fn)
+(export gnc:sum-collector-commodity)
+(export gnc:uniform-commodity?)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Functions to get splits with interesting data from accounts.
diff --git a/gnucash/report/html-acct-table.scm b/gnucash/report/html-acct-table.scm
index ae18decef3..43d069311c 100644
--- a/gnucash/report/html-acct-table.scm
+++ b/gnucash/report/html-acct-table.scm
@@ -495,8 +495,42 @@
 ;; user.  This class simply maps its contents to the html-table.
 ;; 
 
+(define-module (gnucash report html-acct-table))
+
 (use-modules (srfi srfi-2))
 (use-modules (srfi srfi-9))
+(use-modules (gnucash core-utils))
+(use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report commodity-utilities))
+(use-modules (gnucash report report-utilities))
+(use-modules (gnucash report html-utilities))
+(use-modules (gnucash report html-text))
+(use-modules (gnucash report html-table))
+
+(export <html-acct-table>)
+(export gnc:html-acct-table?)
+(export gnc:_make-html-acct-table_)
+(export gnc:make-html-acct-table)
+(export gnc:make-html-acct-table/env)
+(export gnc:make-html-acct-table/env/accts)
+(export gnc:_html-acct-table-matrix_)
+(export gnc:_html-acct-table-set-matrix!_)
+(export gnc:_html-acct-table-env_)
+(export gnc:_html-acct-table-set-env!_)
+(export gnc:html-acct-table-add-accounts!)
+(export gnc:html-acct-table-num-rows)
+(export gnc:html-acct-table-get-row)
+(export gnc:html-acct-table-get-cell)
+(export gnc:html-acct-table-set-cell!)
+(export gnc:html-acct-table-get-row-env)
+(export gnc:html-acct-table-set-row-env!)
+(export gnc:account-code-less-p)
+(export gnc:account-name-less-p)
+(export gnc:account-path-less-p)
+(export gnc:html-table-add-labeled-amount-line!)
+(export gnc:html-table-add-account-balances)
+(export gnc-commodity-table)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  <html-acct-table> class
@@ -512,6 +546,8 @@
 (define (gnc:make-html-acct-table)
   (gnc:_make-html-acct-table_ (gnc:make-html-table) #f))
 
+(define gnc:html-acct-table-set-env! gnc:_html-acct-table-set-env!_)
+
 (define (gnc:make-html-acct-table/env env)
   (let ((acct-table (gnc:make-html-acct-table)))
     (gnc:html-acct-table-set-env! acct-table env)
diff --git a/gnucash/report/html-anytag.scm b/gnucash/report/html-anytag.scm
index fc2475d3a8..b27098e03f 100644
--- a/gnucash/report/html-anytag.scm
+++ b/gnucash/report/html-anytag.scm
@@ -24,7 +24,25 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-anytag))
+
 (use-modules (srfi srfi-9))
+(use-modules (gnucash core-utils))
+(use-modules (gnucash report html-style-info))
+(use-modules (gnucash report html-document))
+
+(export <html-anytag>)
+(export gnc:html-anytag?)
+(export gnc:html-anytag-data)
+(export gnc:html-anytag-set-data!)
+(export gnc:html-anytag-style)
+(export gnc:html-anytag-append-data!)
+(export gnc:html-anytag-set-style!)
+(export gnc:html-anytag-render div doc)
+(export gnc:make-html-div)
+(export gnc:make-html-div/markup)
+(export gnc:make-html-span)
+(export gnc:make-html-span/markup)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  <html-anytag> class
diff --git a/gnucash/report/html-barchart.scm b/gnucash/report/html-barchart.scm
index 6671e9c1a4..ea3b72ec7e 100644
--- a/gnucash/report/html-barchart.scm
+++ b/gnucash/report/html-barchart.scm
@@ -21,6 +21,60 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-barchart))
+
+(use-modules (gnucash utilities))
+(use-modules (gnucash report html-chart)
+             (gnucash report report-utilities))
+
+(export <html-barchart>)
+(export gnc:html-barchart? )
+(export gnc:make-html-barchart-internal)
+(export gnc:make-html-barchart)
+(export gnc:html-barchart-data)
+(export gnc:html-barchart-set-data!)
+(export gnc:html-barchart-width)
+(export gnc:html-barchart-set-width!)
+(export gnc:html-barchart-height)
+(export gnc:html-barchart-set-height!)
+(export gnc:html-barchart-x-axis-label)
+(export gnc:html-barchart-set-x-axis-label!)
+(export gnc:html-barchart-y-axis-label)
+(export gnc:html-barchart-set-y-axis-label!)
+(export gnc:html-barchart-row-labels)
+(export gnc:html-barchart-set-row-labels!)
+(export gnc:html-barchart-row-labels-rotated?)
+(export gnc:html-barchart-set-row-labels-rotated?!)
+(export gnc:html-barchart-stacked?)
+(export gnc:html-barchart-set-stacked?!)
+(export gnc:html-barchart-col-labels)
+(export gnc:html-barchart-set-col-labels!)
+(export gnc:html-barchart-col-colors)
+(export gnc:html-barchart-set-col-colors!)
+(export gnc:html-barchart-legend-reversed?)
+(export gnc:html-barchart-set-legend-reversed?!)
+(export gnc:html-barchart-title)
+(export gnc:html-barchart-set-title!)
+(export gnc:html-barchart-subtitle)
+(export gnc:html-barchart-set-subtitle!)
+(export gnc:html-barchart-button-1-bar-urls)
+(export gnc:html-barchart-set-button-1-bar-urls!)
+(export gnc:html-barchart-button-2-bar-urls)
+(export gnc:html-barchart-set-button-2-bar-urls!)
+(export gnc:html-barchart-button-3-bar-urls)
+(export gnc:html-barchart-set-button-3-bar-urls!)
+(export gnc:html-barchart-button-1-legend-urls)
+(export gnc:html-barchart-set-button-1-legend-urls!)
+(export gnc:html-barchart-button-2-legend-urls)
+(export gnc:html-barchart-set-button-2-legend-urls!)
+(export gnc:html-barchart-button-3-legend-urls)
+(export gnc:html-barchart-set-button-3-legend-urls!)
+(export gnc:html-barchart-append-row!)
+(export gnc:html-barchart-prepend-row!)
+(export gnc:html-barchart-append-column!)
+(export gnc:html-barchart-prepend-column!)
+(export gnc:html-barchart-render barchart)
+
 (define <html-barchart>
   (make-record-type '<html-barchart>
                     '(width 
diff --git a/gnucash/report/html-chart.scm b/gnucash/report/html-chart.scm
index a65b813a01..3e8829b25a 100644
--- a/gnucash/report/html-chart.scm
+++ b/gnucash/report/html-chart.scm
@@ -24,8 +24,36 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-chart))
+
+(use-modules (gnucash core-utils))
 (use-modules (gnucash json builder))            ;for building JSON options
+(use-modules (gnucash report html-utilities))
 (use-modules (srfi srfi-9))
+(use-modules (ice-9 match))
+
+;; html-chart.scm
+
+(export gnc:html-chart?)
+(export gnc:make-html-chart)
+(export gnc:html-chart-data)
+(export gnc:html-chart-set-data!)
+(export gnc:html-chart-width)
+(export gnc:html-chart-set-width!)
+(export gnc:html-chart-height)
+(export gnc:html-chart-set-height!)
+(export gnc:html-chart-type)
+(export gnc:html-chart-set-type!)
+(export gnc:html-chart-title)
+(export gnc:html-chart-get)
+(export gnc:html-chart-set!)
+(export gnc:html-chart-currency-iso)
+(export gnc:html-chart-set-currency-iso!)
+(export gnc:html-chart-currency-symbol)
+(export gnc:html-chart-set-currency-symbol!)
+(export gnc:html-chart-render)
+(export gnc:html-chart-set-custom-x-axis-ticks?!)
+(export gnc:html-chart-set-custom-y-axis-ticks?!)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -33,8 +61,6 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (ice-9 match))
-
 ;; nested-alist-set! parameters are
 ;; lst - a nested alist e.g. (list (cons 'key1 'val1)
 ;;                                 (cons 'key2 (list (cons 'key2-sub1 'val2a))))
diff --git a/gnucash/report/html-document.scm b/gnucash/report/html-document.scm
index 575cb57df6..fa34e0c5f4 100644
--- a/gnucash/report/html-document.scm
+++ b/gnucash/report/html-document.scm
@@ -21,9 +21,69 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-document))
+
 (use-modules (gnucash html))
-(use-modules (srfi srfi-9))
+(use-modules (gnucash report html-anytag))
+(use-modules (gnucash report html-barchart))
+(use-modules (gnucash report html-chart))
+(use-modules (gnucash report html-linechart))
+(use-modules (gnucash report html-piechart))
+(use-modules (gnucash report html-scatter))
+(use-modules (gnucash report html-style-info))
+(use-modules (gnucash report html-style-sheet))
+(use-modules (gnucash report html-table))
+(use-modules (gnucash report html-text))
+(use-modules (gnucash report report-utilities))
+(use-modules (gnucash utilities))
 (use-modules (ice-9 match))
+(use-modules (srfi srfi-1))
+(use-modules (srfi srfi-9))
+
+(export <html-document>)
+(export gnc:html-document?)
+(export gnc:make-html-document-internal)
+(export gnc:make-html-document)
+(export gnc:html-document-set-title!)
+(export gnc:html-document-title)
+(export gnc:html-document-set-headline!)
+(export gnc:html-document-headline)
+(export gnc:html-document-set-style-text!)
+(export gnc:html-document-style-text)
+(export gnc:html-document-set-style-sheet!)
+(export gnc:html-document-style-sheet)
+(export gnc:html-document-set-style-stack!)
+(export gnc:html-document-style-stack)
+(export gnc:html-document-set-style-internal!)
+(export gnc:html-document-style)
+(export gnc:html-document-set-objects!)
+(export gnc:html-document-objects)
+(export gnc:html-document?)
+(export gnc:html-document-set-style!)
+(export gnc:html-document-tree-collapse)
+(export gnc:html-document-render)
+(export gnc:html-document-push-style)
+(export gnc:html-document-pop-style)
+(export gnc:html-document-add-object!)
+(export gnc:html-document-append-objects!)
+(export gnc:html-document-fetch-markup-style)
+(export gnc:html-document-fetch-data-style)
+(export gnc:html-document-markup-start)
+(export gnc:html-document-markup-end)
+(export gnc:html-document-render-data)
+(export gnc:html-document-export-string)
+(export gnc:html-document-set-export-string)
+(export gnc:html-document-export-error)
+(export gnc:html-document-set-export-error)
+(export <html-object>)
+(export gnc:html-object?)
+(export gnc:make-html-object-internal)
+(export gnc:make-html-object)
+(export gnc:html-object-renderer)
+(export gnc:html-object-set-renderer!)
+(export gnc:html-object-data)
+(export gnc:html-object-set-data!)
+(export gnc:html-object-render)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  <html-document> class
diff --git a/gnucash/report/html-fonts.scm b/gnucash/report/html-fonts.scm
index ee1598948a..5b27e02edf 100644
--- a/gnucash/report/html-fonts.scm
+++ b/gnucash/report/html-fonts.scm
@@ -24,10 +24,23 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-fonts))
+
+(eval-when (compile load eval expand)
+  (load-extension "libgnc-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
 (use-modules (gnucash core-utils))
+(use-modules (gnucash app-utils options))
+(use-modules (gnucash report html-document))
 (use-modules (ice-9 regex))
 
+;; html-fonts.scm
+
+(export register-font-options)
+(export add-css-information-to-doc)
+(export font-name-to-style-info)
+
 (define (string-strip s1 s2)
   (let ((idx (string-contains-ci s1 s2)))
     (string-append
diff --git a/gnucash/report/html-linechart.scm b/gnucash/report/html-linechart.scm
index 56135e051b..b4652e4b7a 100644
--- a/gnucash/report/html-linechart.scm
+++ b/gnucash/report/html-linechart.scm
@@ -24,6 +24,69 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-linechart))
+
+(use-modules (srfi srfi-1))
+(use-modules (gnucash utilities))
+(use-modules (gnucash report html-chart)
+             (gnucash report report-utilities))
+
+(export <html-linechart>)
+(export gnc:html-linechart? )
+(export gnc:make-html-linechart-internal)
+(export gnc:make-html-linechart)
+(export gnc:html-linechart-data)
+(export gnc:html-linechart-set-data!)
+(export gnc:html-linechart-width)
+(export gnc:html-linechart-set-width!)
+(export gnc:html-linechart-height)
+(export gnc:html-linechart-set-height!)
+(export gnc:html-linechart-x-axis-label)
+(export gnc:html-linechart-set-x-axis-label!)
+(export gnc:html-linechart-y-axis-label)
+(export gnc:html-linechart-set-y-axis-label!)
+(export gnc:html-linechart-row-labels)
+(export gnc:html-linechart-set-row-labels!)
+(export gnc:html-linechart-row-labels-rotated?)
+(export gnc:html-linechart-set-row-labels-rotated?!)
+(export gnc:html-linechart-stacked?)
+(export gnc:html-linechart-set-stacked?!)
+(export gnc:html-linechart-markers?)
+(export gnc:html-linechart-set-markers?!)
+(export gnc:html-linechart-major-grid?)
+(export gnc:html-linechart-set-major-grid?!)
+(export gnc:html-linechart-minor-grid?)
+(export gnc:html-linechart-set-minor-grid?!)
+(export gnc:html-linechart-col-labels)
+(export gnc:html-linechart-set-col-labels!)
+(export gnc:html-linechart-col-colors)
+(export gnc:html-linechart-set-col-colors!)
+(export gnc:html-linechart-legend-reversed?)
+(export gnc:html-linechart-set-legend-reversed?!)
+(export gnc:html-linechart-title)
+(export gnc:html-linechart-set-title!)
+(export gnc:html-linechart-subtitle)
+(export gnc:html-linechart-set-subtitle!)
+(export gnc:html-linechart-button-1-line-urls)
+(export gnc:html-linechart-set-button-1-line-urls!)
+(export gnc:html-linechart-button-2-line-urls)
+(export gnc:html-linechart-set-button-2-line-urls!)
+(export gnc:html-linechart-button-3-line-urls)
+(export gnc:html-linechart-set-button-3-line-urls!)
+(export gnc:html-linechart-button-1-legend-urls)
+(export gnc:html-linechart-set-button-1-legend-urls!)
+(export gnc:html-linechart-button-2-legend-urls)
+(export gnc:html-linechart-set-button-2-legend-urls!)
+(export gnc:html-linechart-button-3-legend-urls)
+(export gnc:html-linechart-set-button-3-legend-urls!)
+(export gnc:html-linechart-append-row!)
+(export gnc:html-linechart-prepend-row!)
+(export gnc:html-linechart-append-column!)
+(export gnc:html-linechart-prepend-column!)
+(export gnc:html-linechart-render linechart)
+(export gnc:html-linechart-set-line-width!)
+(export gnc:html-linechart-line-width)
+
 (define <html-linechart>
   (make-record-type '<html-linechart>
                     '(width
diff --git a/gnucash/report/html-piechart.scm b/gnucash/report/html-piechart.scm
index 2bc56d1dce..103dce3f5b 100644
--- a/gnucash/report/html-piechart.scm
+++ b/gnucash/report/html-piechart.scm
@@ -21,6 +21,44 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-piechart))
+
+(use-modules (gnucash utilities))
+(use-modules (gnucash report html-chart)
+             (gnucash report report-utilities))
+
+(export <html-piechart>)
+(export gnc:html-piechart?)
+(export gnc:make-html-piechart-internal)
+(export gnc:make-html-piechart)
+(export gnc:html-piechart-data)
+(export gnc:html-piechart-set-data!)
+(export gnc:html-piechart-width)
+(export gnc:html-piechart-set-width!)
+(export gnc:html-piechart-height)
+(export gnc:html-piechart-set-height!)
+(export gnc:html-piechart-labels)
+(export gnc:html-piechart-set-labels!)
+(export gnc:html-piechart-colors)
+(export gnc:html-piechart-set-colors!)
+(export gnc:html-piechart-title)
+(export gnc:html-piechart-set-title!)
+(export gnc:html-piechart-subtitle)
+(export gnc:html-piechart-set-subtitle!)
+(export gnc:html-piechart-button-1-slice-urls)
+(export gnc:html-piechart-set-button-1-slice-urls!)
+(export gnc:html-piechart-button-2-slice-urls)
+(export gnc:html-piechart-set-button-2-slice-urls!)
+(export gnc:html-piechart-button-3-slice-urls)
+(export gnc:html-piechart-set-button-3-slice-urls!)
+(export gnc:html-piechart-button-1-legend-urls)
+(export gnc:html-piechart-set-button-1-legend-urls!)
+(export gnc:html-piechart-button-2-legend-urls)
+(export gnc:html-piechart-set-button-2-legend-urls!)
+(export gnc:html-piechart-button-3-legend-urls)
+(export gnc:html-piechart-set-button-3-legend-urls!)
+(export gnc:html-piechart-render)
+
 (define <html-piechart>
   (make-record-type '<html-piechart>
                     '(width
diff --git a/gnucash/report/html-scatter.scm b/gnucash/report/html-scatter.scm
index 77ebf5aa83..f8f6f38c0a 100644
--- a/gnucash/report/html-scatter.scm
+++ b/gnucash/report/html-scatter.scm
@@ -24,6 +24,37 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-scatter))
+
+(use-modules (gnucash utilities))
+(use-modules (gnucash report html-chart)
+             (gnucash report report-utilities))
+
+(export <html-scatter>)
+(export gnc:html-scatter-add-datapoint!)
+(export gnc:html-scatter-data)
+(export gnc:html-scatter-height)
+(export gnc:html-scatter-marker)
+(export gnc:html-scatter-markercolor)
+(export gnc:html-scatter-render)
+(export gnc:html-scatter-set-data!)
+(export gnc:html-scatter-set-height!)
+(export gnc:html-scatter-set-marker!)
+(export gnc:html-scatter-set-markercolor!)
+(export gnc:html-scatter-set-subtitle!)
+(export gnc:html-scatter-set-title!)
+(export gnc:html-scatter-set-width!)
+(export gnc:html-scatter-set-x-axis-label!)
+(export gnc:html-scatter-set-y-axis-label!)
+(export gnc:html-scatter-subtitle)
+(export gnc:html-scatter-title)
+(export gnc:html-scatter-width)
+(export gnc:html-scatter-x-axis-label)
+(export gnc:html-scatter-y-axis-label)
+(export gnc:html-scatter?)
+(export gnc:make-html-scatter)
+(export gnc:make-html-scatter-internal)
+
 (define <html-scatter>
   (make-record-type '<html-scatter>
                     '(width
diff --git a/gnucash/report/html-style-info.scm b/gnucash/report/html-style-info.scm
index 0c58671ece..90dad70597 100644
--- a/gnucash/report/html-style-info.scm
+++ b/gnucash/report/html-style-info.scm
@@ -21,8 +21,59 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-style-info))
+
 (use-modules (ice-9 match))
 (use-modules (srfi srfi-9))
+(use-modules (gnucash utilities))
+(use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
+
+(export <html-data-style-info>)
+(export <html-markup-style-info>)
+(export <html-style-table>)
+(export gnc:default-html-gnc-monetary-renderer)
+(export gnc:default-html-gnc-numeric-renderer)
+(export gnc:default-html-number-renderer)
+(export gnc:default-html-string-renderer)
+(export gnc:html-data-style-info-data)
+(export gnc:html-data-style-info-inheritable?)
+(export gnc:html-data-style-info-merge)
+(export gnc:html-data-style-info-renderer)
+(export gnc:html-data-style-info-set-data!)
+(export gnc:html-data-style-info-set-inheritable?!)
+(export gnc:html-data-style-info-set-renderer!)
+(export gnc:html-data-style-info?)
+(export gnc:html-data-style-info?)
+(export gnc:html-markup-style-info-attributes)
+(export gnc:html-markup-style-info-inheritable?)
+(export gnc:html-markup-style-info-merge)
+(export gnc:html-markup-style-info-set!)
+(export gnc:html-markup-style-info-set-attribute!)
+(export gnc:html-markup-style-info-set-attributes!)
+(export gnc:html-markup-style-info-set-inheritable?!)
+(export gnc:html-markup-style-info-set-tag!)
+(export gnc:html-markup-style-info-tag)
+(export gnc:html-markup-style-info?)
+(export gnc:html-style-info-merge)
+(export gnc:html-style-table-compile)
+(export gnc:html-style-table-compiled)
+(export gnc:html-style-table-compiled?)
+(export gnc:html-style-table-fetch)
+(export gnc:html-style-table-inheritable)
+(export gnc:html-style-table-primary)
+(export gnc:html-style-table-set!)
+(export gnc:html-style-table-set-compiled!)
+(export gnc:html-style-table-set-inheritable!)
+(export gnc:html-style-table-uncompile)
+(export gnc:html-style-table?)
+(export gnc:make-html-data-style-info)
+(export gnc:make-html-data-style-info-internal)
+(export gnc:make-html-markup-style-info)
+(export gnc:make-html-markup-style-info-internal)
+(export gnc:make-html-style-table)
+(export gnc:make-html-style-table-internal)
+(export gnc:default-price-renderer)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; <html-markup-style-info> class 
diff --git a/gnucash/report/html-style-sheet.scm b/gnucash/report/html-style-sheet.scm
index 1d0d4dff0f..2748d92286 100644
--- a/gnucash/report/html-style-sheet.scm
+++ b/gnucash/report/html-style-sheet.scm
@@ -21,9 +21,51 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-style-sheet))
+
 (use-modules (srfi srfi-9))
 (use-modules (ice-9 match))
 (use-modules (gnucash core-utils))
+(use-modules (gnucash engine))
+(use-modules (gnucash utilities))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report html-document))
+(use-modules (gnucash report html-style-info))
+
+(export <html-style-sheet-template>)
+(export gnc:html-style-sheet-template?)
+(export gnc:html-style-sheet-template-version)
+(export gnc:html-style-sheet-template-set-version!)
+(export gnc:html-style-sheet-template-name)
+(export gnc:html-style-sheet-template-set-name!)
+(export gnc:html-style-sheet-template-options-generator)
+(export gnc:html-style-sheet-template-set-options-generator!)
+(export gnc:html-style-sheet-template-renderer)
+(export gnc:html-style-sheet-template-set-renderer!)
+(export gnc:html-style-sheet-template-find)
+(export gnc:define-html-style-sheet)
+(export <html-style-sheet>)
+(export gnc:html-style-sheet?)
+(export gnc:html-style-sheet-name)
+(export gnc:html-style-sheet-set-name!)
+(export gnc:html-style-sheet-type)
+(export gnc:html-style-sheet-set-type!)
+(export gnc:html-style-sheet-options)
+(export gnc:html-style-sheet-set-options!)
+(export gnc:html-style-sheet-renderer)
+(export gnc:html-style-sheet-set-renderer!)
+(export gnc:make-html-style-sheet-internal)
+(export gnc:html-style-sheet-style)
+(export gnc:html-style-sheet-set-style!)
+(export gnc:make-html-style-sheet)
+(export gnc:restore-html-style-sheet)
+(export gnc:html-style-sheet-apply-changes)
+(export gnc:html-style-sheet-render)
+(export gnc:get-html-style-sheets)
+(export gnc:get-html-templates)
+(export gnc:html-style-sheet-find)
+(export gnc:save-style-sheet-options)
+(export gnc:html-style-sheet-remove)
 
 (define *gnc:_style-sheet-templates_* (make-hash-table 23))
 (define *gnc:_style-sheets_* (make-hash-table 23))
diff --git a/gnucash/report/html-table.scm b/gnucash/report/html-table.scm
index 40e12d7ec6..91d535cac2 100644
--- a/gnucash/report/html-table.scm
+++ b/gnucash/report/html-table.scm
@@ -23,8 +23,82 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-table))
+
 (use-modules (srfi srfi-2))
 (use-modules (srfi srfi-9))
+(use-modules (gnucash engine))
+(use-modules (gnucash report html-style-info))
+(use-modules (gnucash report html-document))
+(use-modules (gnucash report report-utilities))
+
+(export <html-table>)
+(export gnc:html-table?)
+(export <html-table-cell>)
+(export gnc:make-html-table-cell-internal)
+(export gnc:make-html-table-cell)
+(export gnc:make-html-table-cell/size)
+(export gnc:make-html-table-cell/markup)
+(export gnc:make-html-table-cell/size/markup)
+(export gnc:make-html-table-header-cell)
+(export gnc:make-html-table-header-cell/markup)
+(export gnc:make-html-table-header-cell/size)
+(export gnc:make-html-table-cell/min-width)
+(export gnc:html-table-cell?)
+(export gnc:html-table-cell-rowspan)
+(export gnc:html-table-cell-set-rowspan!)
+(export gnc:html-table-cell-colspan)
+(export gnc:html-table-cell-set-colspan!)
+(export gnc:html-table-cell-tag)
+(export gnc:html-table-cell-set-tag!)
+(export gnc:html-table-cell-data)
+(export gnc:html-table-cell-set-data-internal!)
+(export gnc:html-table-cell-style)
+(export gnc:html-table-cell-set-style-internal!)
+(export gnc:html-table-cell-set-style!)
+(export gnc:html-table-cell-append-objects!)
+(export gnc:html-table-cell-render)
+(export gnc:make-html-table-internal)
+(export gnc:make-html-table)
+(export gnc:html-table-data)
+(export gnc:html-table-set-data!)
+(export gnc:html-table-caption)
+(export gnc:html-table-set-caption!)
+(export gnc:html-table-set-col-headers!)
+(export gnc:html-table-multirow-col-headers)
+(export gnc:html-table-set-multirow-col-headers!)
+(export gnc:html-table-style)
+(export gnc:html-table-set-style-internal!)
+(export gnc:html-table-row-styles)
+(export gnc:html-table-set-row-styles!)
+(export gnc:html-table-row-markup-table)
+(export gnc:html-table-row-markup)
+(export gnc:html-table-set-row-markup-table!)
+(export gnc:html-table-set-row-markup!)
+(export gnc:html-table-col-styles)
+(export gnc:html-table-set-col-styles!)
+(export gnc:html-table-col-headers-style)
+(export gnc:html-table-set-col-headers-style!)
+(export gnc:html-table-row-headers-style)
+(export gnc:html-table-set-row-headers-style!)
+(export gnc:html-table-set-last-row-style!)
+(export gnc:html-table-set-style!)
+(export gnc:html-table-set-col-style!)
+(export gnc:html-table-set-row-style!)
+(export gnc:html-table-row-style)
+(export gnc:html-table-col-style)
+(export gnc:html-table-num-rows)
+(export gnc:html-table-set-num-rows-internal!)
+(export gnc:html-table-num-columns)
+(export gnc:html-table-append-row/markup!)
+(export gnc:html-table-prepend-row/markup!)
+(export gnc:html-table-append-row!)
+(export gnc:html-table-prepend-row!)
+(export gnc:html-table-get-cell)
+(export gnc:html-table-set-cell!)
+(export gnc:html-table-set-cell/tag!)
+(export gnc:html-table-append-column!)
+(export gnc:html-table-render)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; 
diff --git a/gnucash/report/html-text.scm b/gnucash/report/html-text.scm
index 3837a7eda2..729ff491e8 100644
--- a/gnucash/report/html-text.scm
+++ b/gnucash/report/html-text.scm
@@ -21,9 +21,49 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-text))
+
+(use-modules (gnucash core-utils))
+(use-modules (gnucash report html-style-info))
+(use-modules (gnucash report html-document))
 (use-modules (srfi srfi-9))
 (use-modules (ice-9 match))
 
+(export <html-text>)
+(export gnc:html-text?)
+(export gnc:make-html-text-internal)
+(export gnc:make-html-text)
+(export gnc:html-text?)
+(export gnc:html-text-body)
+(export gnc:html-text-set-body-internal!)
+(export gnc:html-text-set-body!)
+(export gnc:html-text-style)
+(export gnc:html-text-set-style-internal!)
+(export gnc:html-text-set-style!)
+(export gnc:html-text-append!)
+(export gnc:html-markup)
+(export gnc:html-markup/attr)
+(export gnc:html-markup/no-end)
+(export gnc:html-markup/attr/no-end)
+(export gnc:html-markup/format)
+(export gnc:html-markup-p)
+(export gnc:html-markup-tt)
+(export gnc:html-markup-em)
+(export gnc:html-markup-b)
+(export gnc:html-markup-i)
+(export gnc:html-markup-h1)
+(export gnc:html-markup-h2)
+(export gnc:html-markup-h3)
+(export gnc:html-markup-br)
+(export gnc:html-markup-hr)
+(export gnc:html-markup-ol)
+(export gnc:html-markup-ul)
+(export gnc:html-markup-anchor)
+(export gnc:html-markup-img)
+(export gnc:html-text-render)
+(export gnc:html-text-render-markup)
+(export gnc:html-markup/open-tag-only)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  <html-text> class
 ;;  just plain-old text.  some utilities to add markup.
diff --git a/gnucash/report/html-utilities.scm b/gnucash/report/html-utilities.scm
index ca6a2941d4..dcb45ca108 100644
--- a/gnucash/report/html-utilities.scm
+++ b/gnucash/report/html-utilities.scm
@@ -22,10 +22,55 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report html-utilities))
+
+(use-modules (gnucash core-utils))
 (use-modules (gnucash engine))
 (use-modules (gnucash utilities))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash html))
+(use-modules (gnucash report report-core))
+(use-modules (gnucash report report-utilities))
+(use-modules (gnucash report html-style-info))
+(use-modules (gnucash report html-text))
+(use-modules (gnucash report html-table))
 (use-modules (ice-9 match))
 
+(export gnc:html-make-empty-cell)
+(export gnc:html-make-empty-cells)
+(export gnc:account-anchor-text)
+(export gnc:split-anchor-text)
+(export gnc:transaction-anchor-text)
+(export gnc:transaction-doclink-anchor-text)
+(export gnc:report-anchor-text)
+(export gnc:make-report-anchor)
+(export gnc:html-account-anchor)
+(export gnc:html-split-anchor)
+(export gnc:html-transaction-anchor)
+(export gnc:html-transaction-doclink-anchor)
+(export gnc:html-invoice-doclink-anchor)
+(export gnc:html-price-anchor)
+(export gnc:customer-anchor-text)
+(export gnc:job-anchor-text)
+(export gnc:vendor-anchor-text)
+(export gnc:invoice-anchor-text)
+(export gnc:owner-anchor-text)
+(export gnc:owner-report-text)
+(export gnc:assign-colors)
+(export gnc:html-table-append-ruler!)
+(export gnc:html-make-exchangerates)
+(export gnc:html-make-rates-table)
+(export gnc:html-render-options-changed)
+(export gnc:html-make-generic-warning)
+(export gnc:html-make-no-account-warning)
+(export gnc:html-make-generic-budget-warning)
+(export gnc:html-make-generic-options-warning)
+(export gnc:html-make-generic-simple-warning)
+(export gnc:html-make-empty-data-warning)
+(export gnc:html-make-options-link)
+(export gnc:html-js-include)
+(export gnc:html-css-include)
+
 ;; returns a list with n #f (empty cell) values 
 (define (gnc:html-make-empty-cell) #f)
 (define (gnc:html-make-empty-cells n)
diff --git a/gnucash/report/options-utilities.scm b/gnucash/report/options-utilities.scm
index dfef6dc1bf..60f4d5d82f 100644
--- a/gnucash/report/options-utilities.scm
+++ b/gnucash/report/options-utilities.scm
@@ -21,7 +21,22 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report options-utilities))
+
 (use-modules (gnucash core-utils))
+(use-modules (gnucash app-utils))
+
+(export gnc:options-add-report-date!)
+(export gnc:options-add-date-interval!)
+(export gnc:options-add-interval-choice!)
+(export gnc:options-add-account-levels!)
+(export gnc:options-add-account-selection!)
+(export gnc:options-add-currency!)
+(export gnc:options-add-price-source!)
+(export gnc:options-add-plot-size!)
+(export gnc:options-add-marker-choice!)
+(export gnc:options-add-sort-method!)
+(export gnc:options-add-subtotal-view!)
 
 ;; These are just a bunch of options which were useful in several
 ;; reports and hence they got defined in a separate function.
diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index 649bdc1b38..3b56f04e61 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -19,21 +19,100 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define-module (gnucash report report-core))
+
+(eval-when (compile load eval expand)
+  (load-extension "libgnc-report" "scm_init_sw_report_module"))
 
 (use-modules (gnucash engine))
 (use-modules (gnucash utilities))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(eval-when (compile load eval expand)
-  (load-extension "libgnc-report" "scm_init_sw_report_module"))
-(use-modules (sw_report))
-
+(use-modules (gnucash gnome-utils))
 (use-modules (ice-9 match))
+(use-modules (srfi srfi-1))
 (use-modules (srfi srfi-9))
+(use-modules (gnucash report report-register-hooks))
+(use-modules (gnucash report html-style-sheet))
+(use-modules (gnucash report html-document))
+(use-modules (gnucash report html-utilities))
 
-; Export the swig-wrapped symbols in the public interface of this module
-(let ((i (module-public-interface (current-module))))
-     (module-use! i (resolve-interface '(sw_report))))
+(load-and-reexport (sw_report))
+
+(export <report>)
+(export gnc:all-report-template-guids)
+(export gnc:custom-report-template-guids)
+(export gnc:define-report)
+(export gnc:delete-report)
+(export gnc:find-report-template)
+(export gnc:is-custom-report-type)
+(export gnc:make-report)
+(export gnc:make-report-options)
+(export gnc:menuname-asset-liability)
+(export gnc:menuname-budget)
+(export gnc:menuname-business-reports)
+(export gnc:menuname-custom)
+(export gnc:menuname-example)
+(export gnc:menuname-experimental)
+(export gnc:menuname-income-expense)
+(export gnc:menuname-multicolumn)
+(export gnc:menuname-reports)
+(export gnc:menuname-taxes)
+(export gnc:optname-invoice-number)
+(export gnc:optname-reportname)
+(export gnc:pagename-accounts)
+(export gnc:pagename-display)
+(export gnc:pagename-general)
+(export gnc:rename-report)
+(export gnc:report-ctext)
+(export gnc:report-dirty?)
+(export gnc:report-editor-widget)
+(export gnc:report-embedded-list)
+(export gnc:report-export-thunk)
+(export gnc:report-export-types)
+(export gnc:report-id)
+(export gnc:report-menu-name)
+(export gnc:report-name)
+(export gnc:report-needs-save?)
+(export gnc:report-options)
+(export gnc:report-render-html)
+(export gnc:report-run)
+(export gnc:report-serialize)
+(export gnc:report-set-ctext!)
+(export gnc:report-set-dirty?!)
+(export gnc:report-set-editor-widget!)
+(export gnc:report-set-id!)
+(export gnc:report-set-needs-save?!)
+(export gnc:report-set-options!)
+(export gnc:report-set-stylesheet!)
+(export gnc:report-set-type!)
+(export gnc:report-stylesheet)
+(export gnc:report-template-export-thunk)
+(export gnc:report-template-export-types)
+(export gnc:report-template-has-unique-name?)
+(export gnc:report-template-in-menu?)
+(export gnc:report-template-is-custom/template-guid?)
+(export gnc:report-template-menu-name)
+(export gnc:report-template-menu-name/report-guid)
+(export gnc:report-template-menu-path)
+(export gnc:report-template-menu-tip)
+(export gnc:report-template-name)
+(export gnc:report-template-new-options)
+(export gnc:report-template-new-options/report-guid)
+(export gnc:report-template-options-changed-cb)
+(export gnc:report-template-options-cleanup-cb)
+(export gnc:report-template-options-generator)
+(export gnc:report-template-renderer)
+(export gnc:report-template-renderer/report-guid)
+(export gnc:report-template-report-guid)
+(export gnc:report-template-set-report-guid!)
+(export gnc:report-template-version)
+(export gnc:report-templates-for-each)
+(export gnc:report-to-template-new)
+(export gnc:report-to-template-update)
+(export gnc:report-type)
+(export gnc:restore-report-by-guid)
+(export gnc:restore-report-by-guid-with-custom-template)
 
 ;; Terminology in this file:
 ;; report-template: a report definition of some form. This can be a report
diff --git a/gnucash/report/report-register-hooks.scm b/gnucash/report/report-register-hooks.scm
index d86bf1dc1f..b9cce154b3 100644
--- a/gnucash/report/report-register-hooks.scm
+++ b/gnucash/report/report-register-hooks.scm
@@ -23,8 +23,14 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report report-register-hooks))
+
+(use-modules (gnucash utilities))
 (use-modules (srfi srfi-9))
 
+(export gnc:register-report-hook)
+(export gnc:lookup-register-report)
+
 (define gnc:*register-report-hash* (make-hash-table 23))
 
 ;; Keep a hash-table of records, keyed off the account type.  Each
diff --git a/gnucash/report/report-utilities.scm b/gnucash/report/report-utilities.scm
index f48cbdf94a..cb3240a0b3 100644
--- a/gnucash/report/report-utilities.scm
+++ b/gnucash/report/report-utilities.scm
@@ -17,11 +17,93 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
-(use-modules (srfi srfi-26))
+(define-module (gnucash report report-utilities))
+
+(use-modules (srfi srfi-1))
 (use-modules (srfi srfi-13))
+(use-modules (srfi srfi-26))
 (use-modules (ice-9 format))
 (use-modules (ice-9 match))
 
+(use-modules (gnucash utilities))
+(use-modules (gnucash core-utils))
+(use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report html-text))
+(use-modules (gnucash report html-acct-table))
+(use-modules (gnucash gnome-utils))
+
+(export list-ref-safe)
+(export list-set-safe!)
+(export gnc:monetary->string)
+(export gnc:not-all-zeros)
+(export gnc:account-has-shares?)
+(export gnc:account-is-stock?)
+(export gnc:account-is-inc-exp?)
+(export gnc:account-full-name<?)
+(export gnc:accounts-get-children-depth)
+(export gnc:filter-accountlist-type)
+(export gnc:decompose-accountlist)
+(export gnc:account-get-type-string-plural)
+(export gnc:accounts-get-commodities)
+(export gnc:get-current-account-tree-depth)
+(export gnc:accounts-and-all-descendants)
+(export gnc:make-value-collector)
+(export gnc:make-commodity-collector)
+(export gnc:collector+)
+(export gnc:collector-)
+(export gnc:commodity-collector-get-negated)
+(export gnc:account-accumulate-at-dates)
+(export gnc:account-get-balance-at-date)
+(export gnc:account-get-balances-at-dates)
+(export gnc:account-get-comm-balance-at-date)
+(export gnc:account-get-comm-value-interval)
+(export gnc:account-get-comm-value-at-date)
+(export gnc:accounts-get-balance-helper)
+(export gnc:accounts-get-comm-total-profit)
+(export gnc:accounts-get-comm-total-income)
+(export gnc:accounts-get-comm-total-expense)
+(export gnc:accounts-get-comm-total-assets)
+(export gnc:account-get-balance-interval)
+(export gnc:account-get-comm-balance-interval)
+(export gnc:accountlist-get-comm-balance-interval)
+(export gnc:accountlist-get-comm-balance-interval-with-closing)
+(export gnc:accountlist-get-comm-balance-at-date)
+(export gnc:accountlist-get-comm-balance-at-date-with-closing)
+(export gnc:query-set-match-non-voids-only!)
+(export gnc:query-set-match-voids-only!)
+(export gnc:split-voided?)
+(export gnc:report-starting)
+(export gnc:report-render-starting)
+(export gnc:report-percent-done)
+(export gnc:report-finished)
+(export gnc:accounts-count-splits)
+(export gnc-commodity-collector-allzero?)
+(export gnc:monetary+)
+(export gnc:monetaries-add)
+(export gnc:account-get-trans-type-balance-interval)
+(export gnc:account-get-trans-type-balance-interval-with-closing)
+(export gnc:account-get-trans-type-splits-interval)
+(export gnc:budget-get-start-date)
+(export gnc:budget-get-end-date)
+(export gnc:budget-account-get-net)
+(export gnc:budget-accountlist-get-net)
+(export gnc:budget-account-get-initial-balance)
+(export gnc:budget-accountlist-get-initial-balance)
+(export budget-account-sum budget)
+(export gnc:get-account-period-rolledup-budget-value)
+(export gnc:budget-account-get-rolledup-net)
+(export gnc:get-assoc-account-balances)
+(export gnc:select-assoc-account-balance)
+(export gnc:get-assoc-account-balances-total)
+(export gnc:multiline-to-html-text)
+(export make-file-url)
+(export gnc:strify)
+(export gnc:pk)
+(export gnc:dump-book)
+(export gnc:dump-invoices)
+(export gnc:dump-lot)
+
 (define (list-ref-safe list elt)
   (and (> (length list) elt)
        (list-ref list elt)))
diff --git a/gnucash/report/report.scm b/gnucash/report/report.scm
index 44956efe29..c8083ab770 100644
--- a/gnucash/report/report.scm
+++ b/gnucash/report/report.scm
@@ -33,756 +33,38 @@
 (use-modules (gnucash engine))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gnome-utils))
-(use-modules (gnucash html))
 
-;; commodity-utilities.scm
-(export gnc:get-match-commodity-splits)
-(export gnc:get-match-commodity-splits-sorted)
-(export gnc:get-all-commodity-splits )
-(export gnc:exchange-by-euro-numeric)
-(export gnc:get-commodity-totalavg-prices)
-(export gnc:get-commoditylist-totalavg-prices)
-(export gnc:get-commodity-inst-prices)
-(export gnc:pricelist-price-find-nearest)
-(export gnc:pricealist-lookup-nearest-in-time)
-(export gnc:resolve-unknown-comm)
-(export gnc:get-exchange-totals)
-(export gnc:get-exchange-cost-totals)
-(export gnc:make-exchange-alist)
-(export gnc:make-exchange-cost-alist)
-(export gnc:exchange-by-euro)
-(export gnc:exchange-if-same)
-(export gnc:make-exchange-function)
-(export gnc:exchange-by-pricedb-latest )
-(export gnc:exchange-by-pricedb-nearest)
-(export gnc:exchange-by-pricealist-nearest)
-(export gnc:case-exchange-fn)
-(export gnc:case-exchange-time-fn)
-(export gnc:case-price-fn)
-(export gnc:sum-collector-commodity)
-
-;; options-utilities.scm
-
-(export gnc:options-add-report-date!)
-(export gnc:options-add-date-interval!)
-(export gnc:options-add-interval-choice!)
-(export gnc:options-add-account-levels!)
-(export gnc:options-add-account-selection!)
-(export gnc:options-add-currency!)
-(export gnc:options-add-price-source!)
-(export gnc:options-add-plot-size!)
-(export gnc:options-add-marker-choice!)
-(export gnc:options-add-sort-method!)
-(export gnc:options-add-subtotal-view!)
-
-;; html-fonts.scm
-
-(export register-font-options)
-(export add-css-information-to-doc)
-
-;; html-utilities.scm
-
-(export gnc:html-make-empty-cell)
-(export gnc:html-make-empty-cells)
-(export gnc:account-anchor-text)
-(export gnc:split-anchor-text)
-(export gnc:transaction-anchor-text)
-(export gnc:transaction-doclink-anchor-text)
-(export gnc:report-anchor-text)
-(export gnc:make-report-anchor)
-(export gnc:html-account-anchor)
-(export gnc:html-split-anchor)
-(export gnc:html-transaction-anchor)
-(export gnc:html-transaction-doclink-anchor)
-(export gnc:html-invoice-doclink-anchor)
-(export gnc:html-price-anchor)
-(export gnc:customer-anchor-text)
-(export gnc:job-anchor-text)
-(export gnc:vendor-anchor-text)
-(export gnc:invoice-anchor-text)
-(export gnc:owner-anchor-text)
-(export gnc:owner-report-text)
-(export gnc:assign-colors)
-(export gnc:html-table-append-ruler!)
-(export gnc:html-make-exchangerates)
-(export gnc:html-make-rates-table)
-(export gnc:html-render-options-changed)
-(export gnc:html-make-generic-warning)
-(export gnc:html-make-no-account-warning)
-(export gnc:html-make-generic-budget-warning)
-(export gnc:html-make-generic-options-warning)
-(export gnc:html-make-generic-simple-warning)
-(export gnc:html-make-empty-data-warning)
-(export gnc:html-make-options-link)
-(export gnc:html-js-include)
-(export gnc:html-css-include)
-
-;; report-core.scm
-(export gnc:menuname-reports)
-(export gnc:menuname-asset-liability)
-(export gnc:menuname-income-expense)
-(export gnc:menuname-budget)
-(export gnc:menuname-taxes)
-(export gnc:menuname-example)
-(export gnc:menuname-multicolumn)
-(export gnc:menuname-experimental)
-(export gnc:menuname-custom)
-(export gnc:menuname-business-reports)
-(export gnc:pagename-general)
-(export gnc:pagename-accounts)
-(export gnc:pagename-display)
-(export gnc:optname-reportname)
-(export gnc:optname-invoice-number)
-
-(export gnc:define-report)
-(export <report>)
-(export gnc:report-template-new-options/report-guid)
-(export gnc:report-template-menu-name/report-guid)
-(export gnc:report-template-renderer/report-guid)
-(export gnc:report-template-new-options)
-(export gnc:report-template-version)
-(export gnc:report-template-name)
-(export gnc:report-template-report-guid)
-(export gnc:report-template-set-report-guid!)
-(export gnc:report-template-options-generator)
-(export gnc:report-template-options-cleanup-cb)
-(export gnc:report-template-options-changed-cb)
-(export gnc:report-template-renderer)
-(export gnc:report-template-in-menu?)
-(export gnc:report-template-menu-path)
-(export gnc:report-template-menu-name)
-(export gnc:report-template-menu-tip)
-(export gnc:report-template-export-types)
-(export gnc:report-template-export-thunk)
-(export gnc:report-template-has-unique-name?)
-(export gnc:report-type)
-(export gnc:report-set-type!)
-(export gnc:report-id)
-(export gnc:report-set-id!)
-(export gnc:report-options)
-(export gnc:report-set-options!)
-(export gnc:report-needs-save?)
-(export gnc:report-set-needs-save?!)
-(export gnc:report-dirty?)
-(export gnc:report-set-dirty?!)
-(export gnc:report-editor-widget)
-(export gnc:report-set-editor-widget!)
-(export gnc:report-ctext)
-(export gnc:report-set-ctext!)
-(export gnc:make-report)
-(export gnc:restore-report-by-guid)
-(export gnc:restore-report-by-guid-with-custom-template)
-(export gnc:make-report-options)
-(export gnc:report-export-types)
-(export gnc:report-export-thunk)
-(export gnc:report-menu-name)
-(export gnc:report-name)
-(export gnc:report-stylesheet)
-(export gnc:report-set-stylesheet!)
-(export gnc:all-report-template-guids)
-(export gnc:custom-report-template-guids)
-(export gnc:delete-report)
-(export gnc:rename-report)
-(export gnc:find-report-template)
-(export gnc:report-serialize)
-(export gnc:report-to-template-new)
-(export gnc:report-to-template-update)
-(export gnc:report-render-html)
-(export gnc:report-run)
-(export gnc:report-templates-for-each)
-(export gnc:report-embedded-list)
-(export gnc:report-template-is-custom/template-guid?)
-(export gnc:is-custom-report-type)
-
-;; html-barchart.scm
-
-(export <html-barchart>)
-(export gnc:html-barchart? )
-(export gnc:make-html-barchart-internal)
-(export gnc:make-html-barchart)
-(export gnc:html-barchart-data)
-(export gnc:html-barchart-set-data!)
-(export gnc:html-barchart-width)
-(export gnc:html-barchart-set-width!)
-(export gnc:html-barchart-height)
-(export gnc:html-barchart-set-height!)
-(export gnc:html-barchart-x-axis-label)
-(export gnc:html-barchart-set-x-axis-label!)
-(export gnc:html-barchart-y-axis-label)
-(export gnc:html-barchart-set-y-axis-label!)
-(export gnc:html-barchart-row-labels)
-(export gnc:html-barchart-set-row-labels!)
-(export gnc:html-barchart-row-labels-rotated?)
-(export gnc:html-barchart-set-row-labels-rotated?!)
-(export gnc:html-barchart-stacked?)
-(export gnc:html-barchart-set-stacked?!)
-(export gnc:html-barchart-col-labels)
-(export gnc:html-barchart-set-col-labels!)
-(export gnc:html-barchart-col-colors)
-(export gnc:html-barchart-set-col-colors!)
-(export gnc:html-barchart-legend-reversed?)
-(export gnc:html-barchart-set-legend-reversed?!)
-(export gnc:html-barchart-title)
-(export gnc:html-barchart-set-title!)
-(export gnc:html-barchart-subtitle)
-(export gnc:html-barchart-set-subtitle!)
-(export gnc:html-barchart-button-1-bar-urls)
-(export gnc:html-barchart-set-button-1-bar-urls!)
-(export gnc:html-barchart-button-2-bar-urls)
-(export gnc:html-barchart-set-button-2-bar-urls!)
-(export gnc:html-barchart-button-3-bar-urls)
-(export gnc:html-barchart-set-button-3-bar-urls!)
-(export gnc:html-barchart-button-1-legend-urls)
-(export gnc:html-barchart-set-button-1-legend-urls!)
-(export gnc:html-barchart-button-2-legend-urls)
-(export gnc:html-barchart-set-button-2-legend-urls!)
-(export gnc:html-barchart-button-3-legend-urls)
-(export gnc:html-barchart-set-button-3-legend-urls!)
-(export gnc:html-barchart-append-row!)
-(export gnc:html-barchart-prepend-row!)
-(export gnc:html-barchart-append-column!)
-(export gnc:not-all-zeros)
-(export gnc:html-barchart-prepend-column!)
-(export gnc:html-barchart-render barchart)
-
-;; html-document.scm
-
-(export <html-document>)
-(export gnc:html-document?)
-(export gnc:make-html-document-internal)
-(export gnc:make-html-document)
-(export gnc:html-document-set-title!)
-(export gnc:html-document-title)
-(export gnc:html-document-set-headline!)
-(export gnc:html-document-headline)
-(export gnc:html-document-set-style-text!)
-(export gnc:html-document-style-text)
-(export gnc:html-document-set-style-sheet!)
-(export gnc:html-document-style-sheet)
-(export gnc:html-document-set-style-stack!)
-(export gnc:html-document-style-stack)
-(export gnc:html-document-set-style-internal!)
-(export gnc:html-document-style)
-(export gnc:html-document-set-objects!)
-(export gnc:html-document-objects)
-(export gnc:html-document?)
-(export gnc:html-document-set-style!)
-(export gnc:html-document-tree-collapse)
-(export gnc:html-document-render)
-(export gnc:html-document-push-style)
-(export gnc:html-document-pop-style)
-(export gnc:html-document-add-object!)
-(export gnc:html-document-append-objects!)
-(export gnc:html-document-fetch-markup-style)
-(export gnc:html-document-fetch-data-style)
-(export gnc:html-document-markup-start)
-(export gnc:html-document-markup-end)
-(export gnc:html-document-render-data)
-(export gnc:html-document-export-string)
-(export gnc:html-document-set-export-string)
-(export gnc:html-document-export-error)
-(export gnc:html-document-set-export-error)
-(export <html-object>)
-(export gnc:html-object?)
-(export gnc:make-html-object-internal)
-(export gnc:make-html-object)
-(export gnc:html-object-renderer)
-(export gnc:html-object-set-renderer!)
-(export gnc:html-object-data)
-(export gnc:html-object-set-data!)
-(export gnc:html-object-render)
-
-;; html-piechart.scm
-
-(export <html-piechart>)
-(export gnc:html-piechart?)
-(export gnc:make-html-piechart-internal)
-(export gnc:make-html-piechart)
-(export gnc:html-piechart-data)
-(export gnc:html-piechart-set-data!)
-(export gnc:html-piechart-width)
-(export gnc:html-piechart-set-width!)
-(export gnc:html-piechart-height)
-(export gnc:html-piechart-set-height!)
-(export gnc:html-piechart-labels)
-(export gnc:html-piechart-set-labels!)
-(export gnc:html-piechart-colors)
-(export gnc:html-piechart-set-colors!)
-(export gnc:html-piechart-title)
-(export gnc:html-piechart-set-title!)
-(export gnc:html-piechart-subtitle)
-(export gnc:html-piechart-set-subtitle!)
-(export gnc:html-piechart-button-1-slice-urls)
-(export gnc:html-piechart-set-button-1-slice-urls!)
-(export gnc:html-piechart-button-2-slice-urls)
-(export gnc:html-piechart-set-button-2-slice-urls!)
-(export gnc:html-piechart-button-3-slice-urls)
-(export gnc:html-piechart-set-button-3-slice-urls!)
-(export gnc:html-piechart-button-1-legend-urls)
-(export gnc:html-piechart-set-button-1-legend-urls!)
-(export gnc:html-piechart-button-2-legend-urls)
-(export gnc:html-piechart-set-button-2-legend-urls!)
-(export gnc:html-piechart-button-3-legend-urls)
-(export gnc:html-piechart-set-button-3-legend-urls!)
-(export gnc:html-piechart-render)
-
-;; html-scatter.scm
-
-(export <html-scatter>)
-(export gnc:html-scatter?)
-(export gnc:make-html-scatter-internal)
-(export gnc:make-html-scatter)
-(export gnc:html-scatter-width)
-(export gnc:html-scatter-set-width!)
-(export gnc:html-scatter-height)
-(export gnc:html-scatter-set-height!)
-(export gnc:html-scatter-title)
-(export gnc:html-scatter-set-title!)
-(export gnc:html-scatter-subtitle)
-(export gnc:html-scatter-set-subtitle!)
-(export gnc:html-scatter-x-axis-label)
-(export gnc:html-scatter-set-x-axis-label!)
-(export gnc:html-scatter-y-axis-label)
-(export gnc:html-scatter-set-y-axis-label!)
-(export gnc:html-scatter-data)
-(export gnc:html-scatter-set-data!)
-(export gnc:html-scatter-marker)
-(export gnc:html-scatter-set-marker!)
-(export gnc:html-scatter-markercolor)
-(export gnc:html-scatter-set-markercolor!)
-(export gnc:html-scatter-add-datapoint!)
-(export gnc:html-scatter-render)
-
-;; html-linechart.scm
-
-(export <html-linechart>)
-(export gnc:html-linechart? )
-(export gnc:make-html-linechart-internal)
-(export gnc:make-html-linechart)
-(export gnc:html-linechart-data)
-(export gnc:html-linechart-set-data!)
-(export gnc:html-linechart-width)
-(export gnc:html-linechart-set-width!)
-(export gnc:html-linechart-height)
-(export gnc:html-linechart-set-height!)
-(export gnc:html-linechart-x-axis-label)
-(export gnc:html-linechart-set-x-axis-label!)
-(export gnc:html-linechart-y-axis-label)
-(export gnc:html-linechart-set-y-axis-label!)
-(export gnc:html-linechart-row-labels)
-(export gnc:html-linechart-set-row-labels!)
-(export gnc:html-linechart-row-labels-rotated?)
-(export gnc:html-linechart-set-row-labels-rotated?!)
-(export gnc:html-linechart-stacked?)
-(export gnc:html-linechart-set-stacked?!)
-(export gnc:html-linechart-markers?)
-(export gnc:html-linechart-set-markers?!)
-(export gnc:html-linechart-major-grid?)
-(export gnc:html-linechart-set-major-grid?!)
-(export gnc:html-linechart-minor-grid?)
-(export gnc:html-linechart-set-minor-grid?!)
-(export gnc:html-linechart-col-labels)
-(export gnc:html-linechart-set-col-labels!)
-(export gnc:html-linechart-col-colors)
-(export gnc:html-linechart-set-col-colors!)
-(export gnc:html-linechart-legend-reversed?)
-(export gnc:html-linechart-set-legend-reversed?!)
-(export gnc:html-linechart-title)
-(export gnc:html-linechart-set-title!)
-(export gnc:html-linechart-subtitle)
-(export gnc:html-linechart-set-subtitle!)
-(export gnc:html-linechart-button-1-line-urls)
-(export gnc:html-linechart-set-button-1-line-urls!)
-(export gnc:html-linechart-button-2-line-urls)
-(export gnc:html-linechart-set-button-2-line-urls!)
-(export gnc:html-linechart-button-3-line-urls)
-(export gnc:html-linechart-set-button-3-line-urls!)
-(export gnc:html-linechart-button-1-legend-urls)
-(export gnc:html-linechart-set-button-1-legend-urls!)
-(export gnc:html-linechart-button-2-legend-urls)
-(export gnc:html-linechart-set-button-2-legend-urls!)
-(export gnc:html-linechart-button-3-legend-urls)
-(export gnc:html-linechart-set-button-3-legend-urls!)
-(export gnc:html-linechart-append-row!)
-(export gnc:html-linechart-prepend-row!)
-(export gnc:html-linechart-append-column!)
-(export gnc:html-linechart-prepend-column!)
-(export gnc:html-linechart-render linechart)
-(export gnc:html-linechart-set-line-width!)
-(export gnc:html-linechart-line-width)
-
-;; html-style-info.scm
-
-(export <html-markup-style-info>)
-(export gnc:html-markup-style-info?)
-(export gnc:make-html-markup-style-info-internal)
-(export gnc:make-html-markup-style-info)
-(export gnc:html-markup-style-info-set!)
-(export gnc:html-markup-style-info-tag)
-(export gnc:html-markup-style-info-set-tag!)
-(export gnc:html-markup-style-info-attributes)
-(export gnc:html-markup-style-info-set-attributes!)
-(export gnc:html-markup-style-info-inheritable?)
-(export gnc:html-markup-style-info-set-inheritable?!)
-(export gnc:html-markup-style-info-set-attribute!)
-(export gnc:html-markup-style-info-merge)
-(export gnc:html-style-info-merge)
-(export gnc:html-data-style-info-merge)
-(export <html-data-style-info>)
-(export gnc:html-data-style-info?)
-(export gnc:make-html-data-style-info-internal)
-(export gnc:make-html-data-style-info)
-(export gnc:html-data-style-info?)
-(export gnc:html-data-style-info-renderer)
-(export gnc:html-data-style-info-set-renderer!)
-(export gnc:html-data-style-info-data)
-(export gnc:html-data-style-info-set-data!)
-(export gnc:html-data-style-info-inheritable?)
-(export gnc:html-data-style-info-set-inheritable?!)
-(export gnc:default-html-string-renderer)
-(export gnc:default-html-gnc-numeric-renderer)
-(export gnc:default-html-gnc-monetary-renderer)
-(export gnc:default-html-number-renderer)
-(export <html-style-table>)
-(export gnc:html-style-table?)
-(export gnc:make-html-style-table-internal)
-(export gnc:make-html-style-table)
-(export gnc:html-style-table-primary)
-(export gnc:html-style-table-compiled)
-(export gnc:html-style-table-set-compiled!)
-(export gnc:html-style-table-inheritable)
-(export gnc:html-style-table-set-inheritable!)
-(export gnc:html-style-table-compiled?)
-(export gnc:html-style-table-compile)
-(export gnc:html-style-table-uncompile)
-(export gnc:html-style-table-fetch)
-(export gnc:html-style-table-set!)
-
-;; html-style-sheet.scm
-
-(export <html-style-sheet-template>)
-(export gnc:html-style-sheet-template?)
-(export gnc:html-style-sheet-template-version)
-(export gnc:html-style-sheet-template-set-version!)
-(export gnc:html-style-sheet-template-name)
-(export gnc:html-style-sheet-template-set-name!)
-(export gnc:html-style-sheet-template-options-generator)
-(export gnc:html-style-sheet-template-set-options-generator!)
-(export gnc:html-style-sheet-template-renderer)
-(export gnc:html-style-sheet-template-set-renderer!)
-(export gnc:html-style-sheet-template-find)
-(export gnc:define-html-style-sheet)
-(export <html-style-sheet>)
-(export gnc:html-style-sheet?)
-(export gnc:html-style-sheet-name)
-(export gnc:html-style-sheet-set-name!)
-(export gnc:html-style-sheet-type)
-(export gnc:html-style-sheet-set-type!)
-(export gnc:html-style-sheet-options)
-(export gnc:html-style-sheet-set-options!)
-(export gnc:html-style-sheet-renderer)
-(export gnc:html-style-sheet-set-renderer!)
-(export gnc:make-html-style-sheet-internal)
-(export gnc:html-style-sheet-style)
-(export gnc:html-style-sheet-set-style!)
-(export gnc:make-html-style-sheet)
-(export gnc:restore-html-style-sheet)
-(export gnc:html-style-sheet-apply-changes)
-(export gnc:html-style-sheet-render)
-(export gnc:get-html-style-sheets)
-(export gnc:get-html-templates)
-(export gnc:html-style-sheet-find)
-(export gnc:html-style-sheet-remove)
-
-;; html-acct-table.scm
-
-(export <html-acct-table>)
-(export gnc:html-acct-table?)
-(export gnc:_make-html-acct-table_)
-(export gnc:make-html-acct-table)
-(export gnc:make-html-acct-table/env)
-(export gnc:make-html-acct-table/env/accts)
-(export gnc:_html-acct-table-matrix_)
-(export gnc:_html-acct-table-set-matrix!_)
-(export gnc:_html-acct-table-env_)
-(export gnc:_html-acct-table-set-env!_)
-(export gnc:html-acct-table-add-accounts!)
-(export gnc:html-acct-table-num-rows)
-(export gnc:html-acct-table-get-row)
-(export gnc:html-acct-table-get-cell)
-(export gnc:html-acct-table-set-cell!)
-(export gnc:html-acct-table-get-row-env)
-(export gnc:html-acct-table-set-row-env!)
-(export gnc:account-code-less-p)
-(export gnc:account-name-less-p)
-(export gnc:account-path-less-p)
-(export gnc:html-table-add-labeled-amount-line!)
-(export gnc:html-table-add-account-balances)
-(export gnc-commodity-table)
-(export gnc:uniform-commodity?)
-
-;; html-chart.scm
-
-(export gnc:html-chart?)
-(export gnc:make-html-chart)
-(export gnc:html-chart-data)
-(export gnc:html-chart-set-data!)
-(export gnc:html-chart-width)
-(export gnc:html-chart-set-width!)
-(export gnc:html-chart-height)
-(export gnc:html-chart-set-height!)
-(export gnc:html-chart-type)
-(export gnc:html-chart-set-type!)
-(export gnc:html-chart-title)
-(export gnc:html-chart-get)
-(export gnc:html-chart-set!)
-(export gnc:html-chart-currency-iso)
-(export gnc:html-chart-set-currency-iso!)
-(export gnc:html-chart-currency-symbol)
-(export gnc:html-chart-set-currency-symbol!)
-(export gnc:html-chart-render)
-(export gnc:html-chart-set-custom-x-axis-ticks?!)
-(export gnc:html-chart-set-custom-y-axis-ticks?!)
-
-;; html-table.scm
-
-(export <html-table>)
-(export gnc:html-table?)
-(export <html-table-cell>)
-(export gnc:make-html-table-cell-internal)
-(export gnc:make-html-table-cell)
-(export gnc:make-html-table-cell/size)
-(export gnc:make-html-table-cell/markup)
-(export gnc:make-html-table-cell/size/markup)
-(export gnc:make-html-table-header-cell)
-(export gnc:make-html-table-header-cell/markup)
-(export gnc:make-html-table-header-cell/size)
-(export gnc:make-html-table-cell/min-width)
-(export gnc:html-table-cell?)
-(export gnc:html-table-cell-rowspan)
-(export gnc:html-table-cell-set-rowspan!)
-(export gnc:html-table-cell-colspan)
-(export gnc:html-table-cell-set-colspan!)
-(export gnc:html-table-cell-tag)
-(export gnc:html-table-cell-set-tag!)
-(export gnc:html-table-cell-data)
-(export gnc:html-table-cell-set-data-internal!)
-(export gnc:html-table-cell-style)
-(export gnc:html-table-cell-set-style-internal!)
-(export gnc:html-table-cell-set-style!)
-(export gnc:html-table-cell-append-objects!)
-(export gnc:html-table-cell-render)
-(export gnc:make-html-table-internal)
-(export gnc:make-html-table)
-(export gnc:html-table-data)
-(export gnc:html-table-set-data!)
-(export gnc:html-table-caption)
-(export gnc:html-table-set-caption!)
-(export gnc:html-table-set-col-headers!)
-(export gnc:html-table-multirow-col-headers)
-(export gnc:html-table-set-multirow-col-headers!)
-(export gnc:html-table-style)
-(export gnc:html-table-set-style-internal!)
-(export gnc:html-table-row-styles)
-(export gnc:html-table-set-row-styles!)
-(export gnc:html-table-row-markup-table)
-(export gnc:html-table-row-markup)
-(export gnc:html-table-set-row-markup-table!)
-(export gnc:html-table-set-row-markup!)
-(export gnc:html-table-col-styles)
-(export gnc:html-table-set-col-styles!)
-(export gnc:html-table-col-headers-style)
-(export gnc:html-table-set-col-headers-style!)
-(export gnc:html-table-row-headers-style)
-(export gnc:html-table-set-row-headers-style!)
-(export gnc:html-table-set-last-row-style!)
-(export gnc:html-table-set-style!)
-(export gnc:html-table-set-col-style!)
-(export gnc:html-table-set-row-style!)
-(export gnc:html-table-row-style)
-(export gnc:html-table-col-style)
-(export gnc:html-table-num-rows)
-(export gnc:html-table-set-num-rows-internal!)
-(export gnc:html-table-num-columns)
-(export gnc:html-table-append-row/markup!)
-(export gnc:html-table-prepend-row/markup!)
-(export gnc:html-table-append-row!)
-(export gnc:html-table-prepend-row!)
-(export gnc:html-table-get-cell)
-(export gnc:html-table-set-cell!)
-(export gnc:html-table-set-cell/tag!)
-(export gnc:html-table-append-column!)
-(export gnc:html-table-render)
-
-;; html-anytag.scm
-(export <html-anytag>)
-(export html-anytag?)
-(export gnc:html-anytag-data)
-(export gnc:html-anytag-set-data!)
-(export gnc:html-anytag-style)
-(export gnc:html-anytag-append-data!)
-(export gnc:html-anytag-set-style!)
-(export gnc:html-anytag-render div doc)
-(export gnc:make-html-div)
-(export gnc:make-html-div/markup)
-(export gnc:make-html-span)
-(export gnc:make-html-span/markup)
-
-;; html-text.scm
-
-(export <html-text>)
-(export gnc:html-text?)
-(export gnc:make-html-text-internal)
-(export gnc:make-html-text)
-(export gnc:html-text?)
-(export gnc:html-text-body)
-(export gnc:html-text-set-body-internal!)
-(export gnc:html-text-set-body!)
-(export gnc:html-text-style)
-(export gnc:html-text-set-style-internal!)
-(export gnc:html-text-set-style!)
-(export gnc:html-text-append!)
-(export gnc:html-markup)
-(export gnc:html-markup/attr)
-(export gnc:html-markup/no-end)
-(export gnc:html-markup/attr/no-end)
-(export gnc:html-markup/format)
-(export gnc:html-markup-p)
-(export gnc:html-markup-tt)
-(export gnc:html-markup-em)
-(export gnc:html-markup-b)
-(export gnc:html-markup-i)
-(export gnc:html-markup-h1)
-(export gnc:html-markup-h2)
-(export gnc:html-markup-h3)
-(export gnc:html-markup-br)
-(export gnc:html-markup-hr)
-(export gnc:html-markup-ol)
-(export gnc:html-markup-ul)
-(export gnc:html-markup-anchor)
-(export gnc:html-markup-img)
-(export gnc:html-text-render)
-(export gnc:html-text-render-markup)
-
-;; report-utilities.scm
-
-(export list-ref-safe)
-(export list-set-safe!)
-(export gnc:monetary->string)
-(export gnc:account-has-shares?)
-(export gnc:account-is-stock?)
-(export gnc:account-is-inc-exp?)
-(export gnc:account-full-name<?)
-(export gnc:accounts-get-children-depth)
-(export gnc:filter-accountlist-type)
-(export gnc:decompose-accountlist)
-(export gnc:account-get-type-string-plural)
-(export gnc:accounts-get-commodities)
-(export gnc:get-current-account-tree-depth)
-(export gnc:accounts-and-all-descendants)
-(export gnc:make-value-collector)
-(export gnc:make-commodity-collector)
-(export gnc:collector+)
-(export gnc:collector-)
-(export gnc:commodity-collector-get-negated)
-(export gnc:account-accumulate-at-dates)
-(export gnc:account-get-balance-at-date)
-(export gnc:account-get-balances-at-dates)
-(export gnc:account-get-comm-balance-at-date)
-(export gnc:account-get-comm-value-interval)
-(export gnc:account-get-comm-value-at-date)
-(export gnc:accounts-get-balance-helper)
-(export gnc:accounts-get-comm-total-profit)
-(export gnc:accounts-get-comm-total-income)
-(export gnc:accounts-get-comm-total-expense)
-(export gnc:accounts-get-comm-total-assets)
-(export gnc:account-get-balance-interval)
-(export gnc:account-get-comm-balance-interval)
-(export gnc:accountlist-get-comm-balance-interval)
-(export gnc:accountlist-get-comm-balance-interval-with-closing)
-(export gnc:accountlist-get-comm-balance-at-date)
-(export gnc:accountlist-get-comm-balance-at-date-with-closing)
-(export gnc:query-set-match-non-voids-only!)
-(export gnc:query-set-match-voids-only!)
-(export gnc:split-voided?)
-(export gnc:report-starting)
-(export gnc:report-render-starting)
-(export gnc:report-percent-done)
-(export gnc:report-finished)
-(export gnc:accounts-count-splits)
-(export gnc-commodity-collector-allzero?)
-(export gnc:monetary+)
-(export gnc:monetaries-add)
-(export gnc:account-get-trans-type-balance-interval)
-(export gnc:account-get-trans-type-balance-interval-with-closing)
-(export gnc:account-get-trans-type-splits-interval)
-(export gnc:budget-get-start-date)
-(export gnc:budget-get-end-date)
-(export gnc:budget-account-get-net)
-(export gnc:budget-accountlist-get-net)
-(export gnc:budget-account-get-initial-balance)
-(export gnc:budget-accountlist-get-initial-balance)
-(export budget-account-sum budget)
-(export gnc:get-account-period-rolledup-budget-value)
-(export gnc:budget-account-get-rolledup-net)
-(export gnc:get-assoc-account-balances)
-(export gnc:select-assoc-account-balance)
-(export gnc:get-assoc-account-balances-total)
-(export gnc:multiline-to-html-text)
-(export gnc:default-price-renderer)
-(export make-file-url)
-(export gnc:strify)
-(export gnc:pk)
-(export gnc:dump-book)
-(export gnc:dump-invoices)
-(export gnc:dump-lot)
-
-;; trep-engine.scm
-(export gnc:trep-options-generator)
-(export gnc:trep-renderer)
-(export gnc:lists->csv)
-
-;; report-register-hooks.scm
-
-(export gnc:register-report-hook)
-(export gnc:lookup-register-report)
-
-
-(load-from-path "gnucash/report/commodity-utilities")
-(load-from-path "gnucash/report/html-chart")
-(load-from-path "gnucash/report/html-barchart")
-(load-from-path "gnucash/report/html-document")
-(load-from-path "gnucash/report/html-piechart")
-(load-from-path "gnucash/report/html-scatter")
-(load-from-path "gnucash/report/html-linechart")
-(load-from-path "gnucash/report/html-style-info")
-(load-from-path "gnucash/report/html-fonts")
-
-(load-from-path "gnucash/report/html-style-sheet")
-(load-from-path "gnucash/report/html-anytag")
-(load-from-path "gnucash/report/html-table")
-(load-from-path "gnucash/report/html-text")
-(load-from-path "gnucash/report/html-acct-table")
-(load-from-path "gnucash/report/html-utilities")
-(load-from-path "gnucash/report/options-utilities")
-(load-from-path "gnucash/report/report-utilities")
-(load-from-path "gnucash/report/report-register-hooks")
-(load-from-path "gnucash/report/report-core")
-(load-from-path "gnucash/report/trep-engine")
+(load-and-reexport (gnucash html)
+                   (gnucash report html-style-sheet)
+                   (gnucash report report-register-hooks)
+                   (gnucash report html-utilities)
+                   (gnucash report commodity-utilities)
+                   (gnucash report report-utilities)
+                   (gnucash report options-utilities)
+                   (gnucash report html-chart)
+                   (gnucash report html-fonts)
+                   (gnucash report html-text)
+                   (gnucash report html-anytag)
+                   (gnucash report html-document)
+                   (gnucash report html-table)
+                   (gnucash report html-acct-table)
+                   (gnucash report html-style-info)
+                   (gnucash report trep-engine)
+                   (gnucash report report-core))
 
 ;; Report uuids used for the category barcharts
 
-(export category-barchart-income-uuid
-        category-barchart-expense-uuid
-        category-barchart-asset-uuid
-        category-barchart-liability-uuid)
+(export report-module-loader)
+(export category-barchart-income-uuid)
+(export category-barchart-expense-uuid)
+(export category-barchart-asset-uuid)
+(export category-barchart-liability-uuid)
 
 (define category-barchart-income-uuid "44f81bee049b4b3ea908f8dac9a9474e")
 (define category-barchart-expense-uuid "b1f15b2052c149df93e698fe85a81ea6")
 (define category-barchart-asset-uuid "e9cf815f79db44bcb637d0295093ae3d")
 (define category-barchart-liability-uuid "faf410e8f8da481fbc09e4763da40bcc")
 
-(export report-module-loader)
 ;; Given a list of module prefixes, load all guile modules with these prefixes
 ;; This assumes the modules are located on the file system in a
 ;; path matching the module prefix
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index 9154a927d2..0b6aa2a5fe 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -25,6 +25,7 @@
 
 
 (define-module (gnucash reports))
+
 (use-modules (srfi srfi-13))
 (use-modules (srfi srfi-8))
 (use-modules (gnucash app-utils))
diff --git a/gnucash/report/test/test-html-fonts.scm b/gnucash/report/test/test-html-fonts.scm
index d5abc1827d..ac96027cd3 100644
--- a/gnucash/report/test/test-html-fonts.scm
+++ b/gnucash/report/test/test-html-fonts.scm
@@ -1,6 +1,6 @@
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
-(load-from-path "gnucash/report/html-fonts")
+(use-modules (gnucash report html-fonts))
 
 (setlocale LC_ALL "C")
 
diff --git a/gnucash/report/test/test-report-html.scm b/gnucash/report/test/test-report-html.scm
index c9792fe78e..7e5b75c7c8 100644
--- a/gnucash/report/test/test-report-html.scm
+++ b/gnucash/report/test/test-report-html.scm
@@ -1,7 +1,12 @@
+
+(eval-when (compile load eval expand)
+  (load-extension "libgnc-report" "scm_init_sw_report_module"))
+
 (use-modules (gnucash engine))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (gnucash report stylesheets plain))
+(use-modules (gnucash report html-style-sheet))
 (use-modules (srfi srfi-64))
 (use-modules (ice-9 pretty-print))
 (use-modules (sxml simple))
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index 0731f93a93..f6e1a31ee4 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -39,11 +39,29 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash report trep-engine))
+
 (use-modules (gnucash core-utils))
+(use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash utilities))
+(use-modules (gnucash report report-core)
+             (gnucash report report-utilities)
+             (gnucash report options-utilities)
+             (gnucash report commodity-utilities)
+             (gnucash report html-document)
+             (gnucash report html-style-info)
+             (gnucash report html-utilities)
+             (gnucash report html-table)
+             (gnucash report html-text))
 (use-modules (srfi srfi-11))
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 match))
 
+(export gnc:trep-options-generator)
+(export gnc:trep-renderer)
+(export gnc:lists->csv)
+
 ;; Define the strings here to avoid typos and make changes easier.
 
 ;;Accounts