diff --git a/libgnucash/tax/de_DE/tax.scm b/libgnucash/tax/de_DE/tax.scm
index 77f6eede5e..b791f200fd 100644
--- a/libgnucash/tax/de_DE/tax.scm
+++ b/libgnucash/tax/de_DE/tax.scm
@@ -19,29 +19,7 @@
 
 (define-module (gnucash locale de_DE tax))
 
-(use-modules (gnucash engine))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash core-utils))
 
-(export gnc:txf-get-payer-name-source)
-(export gnc:txf-get-form)
-(export gnc:txf-get-description)
-(export gnc:txf-get-format)
-(export gnc:txf-get-multiple)
-(export gnc:txf-get-category-key)
-(export gnc:txf-get-line-data)
-(export gnc:txf-get-last-year)
-(export gnc:txf-get-help)
-(export gnc:txf-get-codes)
-(export gnc:txf-get-tax-entity-type)
-(export gnc:txf-get-tax-entity-type-description)
-(export gnc:txf-get-tax-entity-type-codes)
-(export gnc:txf-get-code-info)
-(export txf-help-categories)
-
-(export txf-income-categories)
-(export txf-expense-categories)
-(export txf-asset-categories)
-(export txf-liab-eq-categories)
-
-(load-from-path "gnucash/locale/de_DE/tax/txf")
-(load-from-path "gnucash/locale/de_DE/tax/txf-help")
+(load-and-reexport (gnucash locale de_DE tax txf)
+                   (gnucash locale de_DE tax txf-help))
diff --git a/libgnucash/tax/de_DE/txf-help.scm b/libgnucash/tax/de_DE/txf-help.scm
index dfc6b2449e..a6acfc1b8b 100644
--- a/libgnucash/tax/de_DE/txf-help.scm
+++ b/libgnucash/tax/de_DE/txf-help.scm
@@ -32,6 +32,9 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash locale de_DE tax txf-help))
+
+(export txf-help-strings)
 
 (define txf-help-strings
   '(
diff --git a/libgnucash/tax/de_DE/txf.scm b/libgnucash/tax/de_DE/txf.scm
index 92b3d89b75..ecd143f873 100644
--- a/libgnucash/tax/de_DE/txf.scm
+++ b/libgnucash/tax/de_DE/txf.scm
@@ -44,9 +44,33 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash locale de_DE tax txf))
 
 (use-modules (gnucash app-utils))
 (use-modules (srfi srfi-2))
+(use-modules (gnucash locale de_DE tax txf-help))
+
+(export gnc:tax-type-txf-get-code-info)
+(export gnc:txf-get-category-key)
+(export gnc:txf-get-code-info)
+(export gnc:txf-get-codes)
+(export gnc:txf-get-description)
+(export gnc:txf-get-form)
+(export gnc:txf-get-format)
+(export gnc:txf-get-help)
+(export gnc:txf-get-last-year)
+(export gnc:txf-get-line-data)
+(export gnc:txf-get-multiple)
+(export gnc:txf-get-payer-name-source)
+(export gnc:txf-get-tax-entity-type)
+(export gnc:txf-get-tax-entity-type-codes)
+(export gnc:txf-get-tax-entity-type-description)
+(export txf-asset-categories)
+(export txf-expense-categories)
+(export txf-help-categories)
+(export txf-income-categories)
+(export txf-liab-eq-categories)
+(export txf-tax-entity-types)
 
 (define txf-tax-entity-types
   (list
diff --git a/libgnucash/tax/us/tax.scm b/libgnucash/tax/us/tax.scm
index 14d70021ec..734b198df4 100644
--- a/libgnucash/tax/us/tax.scm
+++ b/libgnucash/tax/us/tax.scm
@@ -19,26 +19,7 @@
 
 (define-module (gnucash locale us tax))
 
-(export gnc:txf-get-payer-name-source)
-(export gnc:txf-get-form)
-(export gnc:txf-get-description)
-(export gnc:txf-get-format)
-(export gnc:txf-get-multiple)
-(export gnc:txf-get-category-key)
-(export gnc:txf-get-line-data)
-(export gnc:txf-get-last-year)
-(export gnc:txf-get-help)
-(export gnc:txf-get-codes)
-(export gnc:txf-get-tax-entity-type)
-(export gnc:txf-get-tax-entity-type-description)
-(export gnc:txf-get-tax-entity-type-codes)
-(export gnc:txf-get-code-info)
-(export txf-help-categories)
+(use-modules (gnucash core-utils))
 
-(export txf-income-categories)
-(export txf-expense-categories)
-(export txf-asset-categories)
-(export txf-liab-eq-categories)
-
-(load-from-path "gnucash/locale/us/tax/txf")
-(load-from-path "gnucash/locale/us/tax/txf-help")
+(load-and-reexport (gnucash locale us tax txf)
+                   (gnucash locale us tax txf-help))
diff --git a/libgnucash/tax/us/txf-help.scm b/libgnucash/tax/us/txf-help.scm
index e3c2e2dcfd..756c94466d 100644
--- a/libgnucash/tax/us/txf-help.scm
+++ b/libgnucash/tax/us/txf-help.scm
@@ -26,7 +26,9 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash locale us tax txf-help))
 
+(export txf-help-strings)
 (define txf-help-strings
   '(
     (H001 . "Categories marked with a \"<\" or a \"^\", require a Payer identification to be exported.  \"<\" indicates that the name of this account is exported as this Payer ID.  Typically, this is a bank, stock, or mutual fund name.")
diff --git a/libgnucash/tax/us/txf.scm b/libgnucash/tax/us/txf.scm
index cf24785ec6..5312a9d01e 100644
--- a/libgnucash/tax/us/txf.scm
+++ b/libgnucash/tax/us/txf.scm
@@ -39,11 +39,35 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-module (gnucash locale us tax txf))
 
 (use-modules (gnucash engine))
 (use-modules (gnucash core-utils))
 (use-modules (gnucash app-utils))
 (use-modules (srfi srfi-2))
+(use-modules (gnucash locale us tax txf-help))
+
+(export gnc:tax-type-txf-get-code-info)
+(export gnc:txf-get-category-key)
+(export gnc:txf-get-code-info)
+(export gnc:txf-get-codes)
+(export gnc:txf-get-description)
+(export gnc:txf-get-form)
+(export gnc:txf-get-format)
+(export gnc:txf-get-help)
+(export gnc:txf-get-last-year)
+(export gnc:txf-get-line-data)
+(export gnc:txf-get-multiple)
+(export gnc:txf-get-payer-name-source)
+(export gnc:txf-get-tax-entity-type)
+(export gnc:txf-get-tax-entity-type-codes)
+(export gnc:txf-get-tax-entity-type-description)
+(export txf-asset-categories)
+(export txf-expense-categories)
+(export txf-help-categories)
+(export txf-income-categories)
+(export txf-liab-eq-categories)
+(export txf-tax-entity-types)
 
 (define txf-tax-entity-types
   (list