gnucash master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Fri Apr 24 16:35:26 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/f7f4f421 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/bbeb9a2b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/abf29aa1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/03d7ae8f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8e40f400 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/968e979e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4b51c630 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/468f3447 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/01a00afe (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8a764f23 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/debb5468 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/58c6993c (commit)
	from  https://github.com/Gnucash/gnucash/commit/0cfb40ef (commit)



commit f7f4f42145cabb5e0855752fb61fda510c77ef2c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 22:34:57 2020 +0200

    Drop several test-link type tests
    
    They were intended to test whether a gnc-module could be loaded
    correctly. However several were not even properly implemented
    and for the others the gnc-modules have been converted to
    ordinary libraries. Testing whether a library can be linked to
    is not a useful test. Link issues are triggered at build time
    already.

diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt
index 9936f7f72..0a70fe023 100644
--- a/gnucash/import-export/qif-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-
-set(QIF_IMP_TEST_INCLUDE_DIRS)
-set(QIF_IMP_TEST_LIBS)
-
 set(scm_qifimp_test_with_srfi64_SOURCES
   test-qif-imp.scm
   test-qif-parse.scm
@@ -16,7 +12,6 @@ set (GUILE_DEPENDS
   scm-core-utils
   scm-qif-import
 )
-gnc_add_test(test-link-qif-imp test-link.c QIF_IMP_TEST_INCLUDE_DIRS QIF_IMP_TEST_LIBS)
 
 if (HAVE_SRFI64)
   gnc_add_scheme_tests("${scm_qifimp_test_with_srfi64_SOURCES}")
@@ -28,5 +23,5 @@ if (HAVE_SRFI64)
   add_dependencies(check scm-qif-import-2 scm-qif-import)
 endif()
 
-set_dist_list(test_qif_import_DIST CMakeLists.txt test-link.c
+set_dist_list(test_qif_import_DIST CMakeLists.txt
   ${scm_qifimp_test_with_srfi64_SOURCES})
diff --git a/gnucash/import-export/qif-imp/test/test-link.c b/gnucash/import-export/qif-imp/test/test-link.c
deleted file mode 100644
index e1c54dcc5..000000000
--- a/gnucash/import-export/qif-imp/test/test-link.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-int
-main(int argc, char ** argv)
-{
-    return 0;
-}
-
diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
index 2db22cfba..eab7a7252 100644
--- a/gnucash/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -15,9 +15,6 @@ set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gnc-test-engine test-core)
 gnc_add_test_with_guile(test-import-parse test-import-parse.c
   GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS
 )
-gnc_add_test(test-link-generic-import test-link.c
-  GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS
-)
 gnc_add_test(test-import-pending-matches test-import-pending-matches.cpp
   GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS
 )
@@ -38,5 +35,5 @@ gnc_add_test(test-import-account-matcher gtest-import-account-matcher.cpp
   IMPORT_ACCOUNT_MATCHER_TEST_INCLUDE_DIRS IMPORT_ACCOUNT_MATCHER_TEST_LIBS)
 
 set_dist_list(test_generic_import_DIST CMakeLists.txt
-  test-link.c test-import-parse.c test-import-pending-matches.cpp
+  test-import-parse.c test-import-pending-matches.cpp
   gtest-import-account-matcher.cpp)
diff --git a/gnucash/import-export/test/test-link.c b/gnucash/import-export/test/test-link.c
deleted file mode 100644
index e1c54dcc5..000000000
--- a/gnucash/import-export/test/test-link.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-int
-main(int argc, char ** argv)
-{
-    return 0;
-}
-
diff --git a/gnucash/register/ledger-core/test/CMakeLists.txt b/gnucash/register/ledger-core/test/CMakeLists.txt
index 69a2eade7..5a7a5fdd8 100644
--- a/gnucash/register/ledger-core/test/CMakeLists.txt
+++ b/gnucash/register/ledger-core/test/CMakeLists.txt
@@ -1,11 +1,4 @@
 
-set(LEDGER_CORE_TEST_INCLUDE_DIRS "")
-set(LEDGER_CORE_TEST_LIBS)
-
-gnc_add_test(test-link-module-ledger-core test-link-module.c
-  LEDGER_CORE_TEST_INCLUDE_DIRS LEDGER_CORE_TEST_LIBS
-)
-
 set(SPLIT_REG_TEST_SOURCES
     test-split-register.c
     utest-split-register-copy-ops.c
@@ -30,4 +23,4 @@ gnc_add_test(test-split-register-copy-ops
     SPLIT_REG_TEST_LIBS
 )
 
-set_dist_list(test_ledger_core_DIST CMakeLists.txt test-link-module.c ${SPLIT_REG_TEST_SOURCES})
+set_dist_list(test_ledger_core_DIST CMakeLists.txt ${SPLIT_REG_TEST_SOURCES})
diff --git a/gnucash/register/ledger-core/test/test-link-module.c b/gnucash/register/ledger-core/test/test-link-module.c
deleted file mode 100644
index fe944de9f..000000000
--- a/gnucash/register/ledger-core/test/test-link-module.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include <stdlib.h>
-
-int
-main(int argc, char ** argv)
-{
-    exit(0);
-}
diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt
index 64527e9a4..51fa9110c 100644
--- a/gnucash/register/register-core/CMakeLists.txt
+++ b/gnucash/register/register-core/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(test)
-
 set (register_core_SOURCES
   basiccell.c
   cell-factory.c
diff --git a/gnucash/register/register-core/test/CMakeLists.txt b/gnucash/register/register-core/test/CMakeLists.txt
deleted file mode 100644
index bbed19bc3..000000000
--- a/gnucash/register/register-core/test/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-set(REGISTER_CORE_TEST_INCLUDE_DIRS "")
-set(REGISTER_CORE_TEST_LIBS)
-
-gnc_add_test(test-link-module-register-core test-link-module.c
-  REGISTER_CORE_TEST_INCLUDE_DIRS REGISTER_CORE_TEST_LIBS
-)
-
-set_dist_list(test_register_core_DIST CMakeLists.txt test-link-module.c)
\ No newline at end of file
diff --git a/gnucash/register/register-core/test/test-link-module.c b/gnucash/register/register-core/test/test-link-module.c
deleted file mode 100644
index fe944de9f..000000000
--- a/gnucash/register/register-core/test/test-link-module.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include <stdlib.h>
-
-int
-main(int argc, char ** argv)
-{
-    exit(0);
-}
diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt
index 80014e019..14ee2ce0e 100644
--- a/gnucash/register/register-gnome/CMakeLists.txt
+++ b/gnucash/register/register-gnome/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(test)
 include(CheckSymbolExists)
 
 set (register_gnome_SOURCES
diff --git a/gnucash/register/register-gnome/test/CMakeLists.txt b/gnucash/register/register-gnome/test/CMakeLists.txt
deleted file mode 100644
index 8870c26cd..000000000
--- a/gnucash/register/register-gnome/test/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-set(REGISTER_GNOME_TEST_INCLUDE_DIRS "")
-set(REGISTER_GNOME_TEST_LIBS)
-
-gnc_add_test(test-link-module-register-gnome test-link-module.c
-  REGISTER_GNOME_TEST_INCLUDE_DIRS REGISTER_GNOME_TEST_LIBS
-)
-
-set_dist_list(test_register_gnome_DIST CMakeLists.txt test-link-module.c)
\ No newline at end of file
diff --git a/gnucash/register/register-gnome/test/test-link-module.c b/gnucash/register/register-gnome/test/test-link-module.c
deleted file mode 100644
index fe944de9f..000000000
--- a/gnucash/register/register-gnome/test/test-link-module.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include <stdlib.h>
-
-int
-main(int argc, char ** argv)
-{
-    exit(0);
-}
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 08ff72b4f..8e44172ff 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -15,13 +15,6 @@ macro(add_engine_test _TARGET _SOURCE_FILES)
   gnc_add_test(${_TARGET} "${_SOURCE_FILES}" ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)
 endmacro()
 
-# Not via macro because of unique link requirements
-
-add_executable(test-link EXCLUDE_FROM_ALL test-link.c)
-target_link_libraries(test-link gnc-core-utils)
-add_test(NAME test-link COMMAND test-link CONFIGURATIONS Debug;Release)
-add_dependencies(check test-link)
-
 #################################################
 
 add_engine_test(test-load-engine test-load-engine.c)
@@ -227,7 +220,6 @@ set(test_engine_SOURCES_DIST
         test-job.c
         test-kvp-value.cpp
         test-kvp-frame.cpp
-        test-link.c
         test-load-engine.c
         test-lots.cpp
         test-numeric.cpp
diff --git a/libgnucash/engine/test/test-link.c b/libgnucash/engine/test/test-link.c
deleted file mode 100644
index 3945a265a..000000000
--- a/libgnucash/engine/test/test-link.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-int
-main(int argc, char ** argv)
-{
-    return 0;
-}

commit bbeb9a2b62ec1174aa2075d9053f37713747e1bd
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 22:16:24 2020 +0200

    Drop all gnc-module dependencies and includes from compilation units that no longer use it
    
    This also drops the python wrapper for gnc-module. As for the guile wrappers,
    python should use other means of loading our shared libraries.
    
    This commit required a few tweaks to the dependency chain as some units
    inherited dependency information from gnc-module's public dependency
    interface.

diff --git a/bindings/guile/test/test-scm-query.cpp b/bindings/guile/test/test-scm-query.cpp
index d4b3bc8cf..8ded44992 100644
--- a/bindings/guile/test/test-scm-query.cpp
+++ b/bindings/guile/test/test-scm-query.cpp
@@ -26,7 +26,6 @@ extern "C"
 #include <glib.h>
 
 #include "gnc-engine-guile.h"
-#include "gnc-module.h"
 #include "test-engine-stuff.h"
 #include "test-stuff.h"
 #include "Query.h"
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index b41f5a215..8c5884e3a 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -13,7 +13,6 @@ set(GNUCASH_CORE_C_INCLUDES
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/guid.h
-    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module/gnc-module.h
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-engine.h
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h
     ${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h
@@ -65,10 +64,8 @@ if(WITH_PYTHON)
     ${CMAKE_SOURCE_DIR}/libgnucash/engine
     ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
     ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
-    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
     ${CMAKE_SOURCE_DIR}/gnucash/gnome
     ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
-    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
     ${GLIB_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
   )
@@ -76,7 +73,7 @@ if(WITH_PYTHON)
   add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
   target_include_directories(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
 
-  target_link_libraries(gnucash_core_c gnc-app-utils gnc-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
+  target_link_libraries(gnucash_core_c gnc-app-utils gnc-engine ${GLIB_LIBS} ${PYTHON_LIBRARIES})
   set_target_properties(gnucash_core_c PROPERTIES PREFIX "_")
   target_compile_options(gnucash_core_c PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
   if (HAVE_STRINGOP_TRUNCATION)
@@ -84,7 +81,7 @@ if(WITH_PYTHON)
   endif()
 
   add_executable(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C})
-  target_link_libraries(sqlite3test gnc-app-utils gnc-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
+  target_link_libraries(sqlite3test gnc-app-utils gnc-engine ${GLIB_LIBS} ${PYTHON_LIBRARIES})
   target_include_directories(sqlite3test PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
   target_compile_options(sqlite3test PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
   if (HAVE_STRINGOP_TRUNCATION)
diff --git a/bindings/python/gnucash_core.i b/bindings/python/gnucash_core.i
index a00ed4e79..bbaf15d1f 100644
--- a/bindings/python/gnucash_core.i
+++ b/bindings/python/gnucash_core.i
@@ -56,7 +56,6 @@
 #include "guid.h"
 #include "qofquery.h"
 #include "qofquerycore.h"
-#include "gnc-module.h"
 #include "gnc-engine.h"
 #include "Transaction.h"
 #include "Split.h"
@@ -221,7 +220,6 @@ gnc_environment_setup();
 qof_log_init();
 qof_init();
 qof_query_init();
-gnc_module_system_init();
 char * no_args[1] = { NULL };
 gnc_engine_init(0, no_args);
 gnc_prefs_init();
diff --git a/bindings/python/sqlite3test.c b/bindings/python/sqlite3test.c
index 08f22b332..40b2720fe 100644
--- a/bindings/python/sqlite3test.c
+++ b/bindings/python/sqlite3test.c
@@ -26,7 +26,6 @@ int main()
     const char* testurl = "sqlite3://" TESTFILE;
     qof_log_init();
     qof_init();
-    gnc_module_system_init();
     char * no_args[1] = { NULL };
     gnc_engine_init(0, no_args);
 
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 8db0ce7d9..ac2d7783f 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -252,7 +252,7 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
 
 # Scheme
 
-set(GUILE_DEPENDS      gnc-gnome-utils scm-gnc-module scm-engine scm-app-utils)
+set(GUILE_DEPENDS      gnc-gnome-utils scm-engine scm-app-utils)
 
 gnc_add_scheme_targets(scm-gnome-utils-1
     SOURCES gnome-utils.scm
diff --git a/gnucash/gnome-utils/assistant-xml-encoding.c b/gnucash/gnome-utils/assistant-xml-encoding.c
index c2287efe4..4acc2af95 100644
--- a/gnucash/gnome-utils/assistant-xml-encoding.c
+++ b/gnucash/gnome-utils/assistant-xml-encoding.c
@@ -33,7 +33,6 @@
 #include "gnc-backend-xml.h"
 #include "gnc-component-manager.h"
 #include "gnc-uri-utils.h"
-#include "gnc-module.h"
 #include "gnc-ui.h"
 
 /* The following are copied from src/backend/xml/io-gncxml2-v2.h as a temporary
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index b01f120ae..b037b854d 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -1,20 +1,13 @@
 
-set(GNOME_UTILS_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
-  ${GLIB2_INCLUDE_DIRS}
-  ${GUILE_INCLUDE_DIRS}
-)
-set(GNOME_UTILS_TEST_LIBS gnc-module test-core)
-
-
 set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
-  ${GNOME_UTILS_TEST_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/common
   ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${GLIB2_INCLUDE_DIRS}
+  ${GUILE_INCLUDE_DIRS}
 )
 set(GNOME_UTILS_GUI_TEST_LIBS
-  ${GNOME_UTILS_TEST_LIBS}
+  test-core
   gnc-gnome-utils
 )
 #This is a GUI test
@@ -23,7 +16,6 @@ set(GNOME_UTILS_GUI_TEST_LIBS
 #  GNOME_UTILS_GUI_TEST_LIBS
 #
 set(GUILE_DEPENDS
-  scm-gnc-module
   scm-gnome-utils
   test-core
   gnc-test-engine
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 4b0366e4b..01cdc055c 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -246,7 +246,6 @@ set(GUILE_DEPENDS
     scm-engine
     scm-core-utils
     scm-gnome-utils
-    scm-gnc-module
     scm-report
     scm-reports
 )
diff --git a/gnucash/gnome/dialog-tax-info.c b/gnucash/gnome/dialog-tax-info.c
index 787ba6e2a..6c68c3daf 100644
--- a/gnucash/gnome/dialog-tax-info.c
+++ b/gnucash/gnome/dialog-tax-info.c
@@ -31,7 +31,6 @@
 #include <libguile.h>
 #include "guile-mappings.h"
 #include "gnc-guile-utils.h"
-#include "gnc-module.h"
 
 #include "Account.h"
 #include "gnc-ui-util.h"
diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
index a743ef58d..170659246 100644
--- a/gnucash/html/CMakeLists.txt
+++ b/gnucash/html/CMakeLists.txt
@@ -51,7 +51,7 @@ add_library (gnc-html
   ${html_HEADERS}
 )
 
-target_link_libraries(gnc-html gnc-engine gnc-module gnc-gnome-utils
+target_link_libraries(gnc-html gnc-engine gnc-gnome-utils
   PkgConfig::GTK3 PkgConfig::WEBKIT ${GUILE_LDFLAGS})
 
 target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index fa867e75e..e29c531d0 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -55,7 +55,7 @@ if(WITH_AQBANKING)
   endif()
 
   target_link_libraries(gncmod-aqbanking gnc-gnome gnc-gnome-utils
-         gnc-generic-import gnc-register-core
+         gnc-generic-import gnc-register-core gnc-module
          gnc-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
          ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
          ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 61a6119c0..53b0c2ed5 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(gnc-bi-import
   gnc-app-utils
   gnc-engine
   gnc-core-utils
-  gnc-module
   gnc-gnome
 )
 
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 3ef5160b1..be9555001 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -17,8 +17,15 @@ set(csv_export_noinst_HEADERS
 
 add_library(gnc-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
-target_link_libraries(gnc-csv-export gnc-register-gnome gnc-register-core gnc-ledger-core gnc-engine
-                         gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
+target_link_libraries(gnc-csv-export
+    gnc-register-gnome
+    gnc-register-core
+    gnc-ledger-core
+    gnc-engine
+    gnc-gnome-utils
+    gnc-gnome
+    gnc-app-utils
+    gnc-core-utils)
 
 target_include_directories(gnc-csv-export
     PUBLIC
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 7d2879ee1..e7bb7ecb2 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -69,8 +69,7 @@ target_link_libraries(
   gnc-gnome-utils
   gnc-app-utils
   gnc-engine
-  gnc-core-utils
-  gnc-module)
+  gnc-core-utils)
 
 
 target_compile_definitions(gnc-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index b0f7073ea..cdc3ec2e7 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -16,8 +16,13 @@ set(customer_import_noinst_HEADERS
 
 add_library(gnc-customer-import ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
 
-target_link_libraries(gnc-customer-import gnc-gnome gnc-gnome-utils gnc-app-utils
-     gnc-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS})
+target_link_libraries(gnc-customer-import
+    gnc-gnome
+    gnc-gnome-utils
+    gnc-app-utils
+    gnc-engine
+    gnc-core-utils
+    ${GLIB2_LDFLAGS})
 
 target_include_directories(gnc-customer-import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index bcf5872cc..742c3dc7b 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -14,8 +14,12 @@ set(log_replay_noinst_HEADERS
 
 add_library(gnc-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
 
-target_link_libraries(gnc-log-replay gnc-gnome-utils gnc-app-utils gnc-engine
-     gnc-core-utils gnc-module PkgConfig::GTK3)
+target_link_libraries(gnc-log-replay
+    gnc-gnome-utils
+    gnc-app-utils
+    gnc-engine
+    gnc-core-utils
+    PkgConfig::GTK3)
 
 target_compile_definitions(gnc-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
 
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 27de14df9..2f6f30a86 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -21,7 +21,7 @@ if (WITH_OFX)
   add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
 
   target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils
-                    gnc-gnome-utils ${LIBOFX_LDFLAGS})
+                    gnc-gnome-utils gnc-module ${LIBOFX_LDFLAGS})
 
   target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
 
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 86b35899a..b3ca2363a 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -69,7 +69,6 @@ set(GUILE_DEPENDS
   gnc-qif-import
   gnc-gnome
   scm-core-utils
-  scm-gnc-module
   scm-app-utils
   scm-engine
   scm-gnome-utils
diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt
index cbf33eeb1..9936f7f72 100644
--- a/gnucash/import-export/qif-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt
@@ -10,7 +10,6 @@ set(scm_qifimp_test_with_srfi64_SOURCES
   )
 
 set (GUILE_DEPENDS
-  scm-gnc-module
   scm-app-utils
   scm-engine
   scm-test-engine
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 2e3c9daf5..a1fe3aae6 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -26,7 +26,6 @@ add_library (gnc-report
 target_compile_definitions(gnc-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
 
 target_link_libraries(gnc-report
-    gnc-module
     gnc-app-utils
     gnucash-guile
     PkgConfig::GTK3
@@ -92,7 +91,6 @@ set(GUILE_DEPENDS
   gnc-report
   scm-app-utils
   scm-engine
-  scm-gnc-module
   guile-json
   )
 
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 22b1fcc26..44281d387 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -87,7 +87,6 @@ set(scm_rpts_GUILE_DEPENDS
   scm-engine
   scm-gnome-utils
   scm-app-utils
-  scm-gnc-module
   scm-report
   )
 
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 4f6601376..9793973fb 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -28,7 +28,6 @@ set(scm_test_with_textual_ports_SOURCES
 )
 
 set(GUILE_DEPENDS
-  scm-gnc-module
   scm-app-utils
   scm-engine
   scm-test-engine
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 1dae163cc..65377d0a1 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -7,7 +7,6 @@ set(stylesheets_SCHEME
 )
 
 set(GUILE_DEPENDS
-  scm-gnc-module
   scm-core-utils
   scm-core-utils
   scm-engine
diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt
index 467fcaaef..ebabb972e 100644
--- a/gnucash/report/test/CMakeLists.txt
+++ b/gnucash/report/test/CMakeLists.txt
@@ -15,7 +15,6 @@ set (scm_test_report_with_srfi64_SOURCES
   )
 
 set(GUILE_DEPENDS
-  scm-gnc-module
   scm-app-utils
   scm-core-utils
   scm-core-utils
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 225c14de7..4eb513167 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -73,7 +73,6 @@ set_source_files_properties (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
 set(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
 set(app_utils_ALL_LIBRARIES
     gnc-engine
-    gnc-module
     gnc-locale-tax
     gnucash-guile
     ${GIO_LDFLAGS}
@@ -98,8 +97,11 @@ add_library (gnc-app-utils ${app_utils_ALL_SOURCES} ${SWIG_APP_UTILS_GUILE_C})
 target_link_libraries(gnc-app-utils ${app_utils_ALL_LIBRARIES})
 
 target_include_directories (gnc-app-utils
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE ${app_utils_ALL_INCLUDES}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${GLIB2_INCLUDE_DIRS}
+    PRIVATE
+        ${app_utils_ALL_INCLUDES}
 )
 target_compile_definitions (gnc-app-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\")
 
@@ -168,11 +170,9 @@ set (app_utils_SCHEME_2
 )
 
 set(GUILE_DEPENDS
-  gnc-app-utils
-  scm-core-utils
-  scm-engine
-  scm-gnc-module
-  )
+    gnc-app-utils
+    scm-core-utils
+    scm-engine)
 
 gnc_add_scheme_targets(scm-app-utils-1
     SOURCES "${app_utils_SCHEME_1}"
diff --git a/libgnucash/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c
index 9dacea87d..5cc8d65b4 100644
--- a/libgnucash/app-utils/gnc-ui-util.c
+++ b/libgnucash/app-utils/gnc-ui-util.c
@@ -47,7 +47,6 @@
 #include "qof.h"
 #include "guile-mappings.h"
 #include "gnc-prefs.h"
-#include "gnc-module.h"
 #include "Account.h"
 #include "Transaction.h"
 #include "gnc-engine.h"
diff --git a/libgnucash/backend/xml/test/test-load-example-account.cpp b/libgnucash/backend/xml/test/test-load-example-account.cpp
index 352b79084..af0c43777 100644
--- a/libgnucash/backend/xml/test/test-load-example-account.cpp
+++ b/libgnucash/backend/xml/test/test-load-example-account.cpp
@@ -32,7 +32,6 @@ extern "C"
 #include <unistd.h>
 #include <dirent.h>
 
-#include "gnc-module.h"
 #include "gnc-engine.h"
 #include "test-engine-stuff.h"
 }
diff --git a/libgnucash/backend/xml/test/test-xml-commodity.cpp b/libgnucash/backend/xml/test/test-xml-commodity.cpp
index 71a306052..6ff7e7656 100644
--- a/libgnucash/backend/xml/test/test-xml-commodity.cpp
+++ b/libgnucash/backend/xml/test/test-xml-commodity.cpp
@@ -26,7 +26,6 @@ extern "C"
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "gnc-module.h"
 #include "qof.h"
 #include "test-engine-stuff.h"
 
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index beca640bb..e03a5f01d 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -216,7 +216,6 @@ add_dependencies (gnc-engine iso-4217-c)
 
 target_link_libraries(gnc-engine
     gnc-core-utils
-    gnc-module
     ${Boost_DATE_TIME_LIBRARIES}
     ${Boost_REGEX_LIBRARIES}
     ${ICU4C_I18N_LDFLAGS}
diff --git a/libgnucash/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt
index 675707b15..117003435 100644
--- a/libgnucash/engine/test-core/CMakeLists.txt
+++ b/libgnucash/engine/test-core/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(gnc-test-engine STATIC ${libgnc_test_engine_SOURCES})
 
 target_include_directories(gnc-test-engine PRIVATE
   ${GMODULE_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${CMAKE_BINARY_DIR}/common # for config.h
   ${CMAKE_SOURCE_DIR}/common
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
diff --git a/libgnucash/engine/test/test-business.c b/libgnucash/engine/test/test-business.c
index d2cd08d21..ac73add85 100644
--- a/libgnucash/engine/test/test-business.c
+++ b/libgnucash/engine/test/test-business.c
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include "qof.h"
-#include "gnc-module.h"
 
 #include "gncBusiness.h"
 #include "test-stuff.h"
diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
index 1afdc6349..3c89f0a8d 100644
--- a/libgnucash/tax/CMakeLists.txt
+++ b/libgnucash/tax/CMakeLists.txt
@@ -6,11 +6,16 @@ set(locale_tax_SOURCES gnc-locale-tax.c gnc-locale-tax.h)
 set_source_files_properties (${locale_tax_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 add_library(gnc-locale-tax ${locale_tax_SOURCES})
-target_link_libraries(gnc-locale-tax gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS})
+target_link_libraries(gnc-locale-tax
+    ${GLIB2_LDFLAGS}
+    ${GUILE_LDFLAGS})
 
 target_include_directories(gnc-locale-tax
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS})
+    PRIVATE
+        ${CMAKE_BINARY_DIR}/common
+        ${GUILE_INCLUDE_DIRS}
+        ${GLIB2_INCLUDE_DIRS})
 
 if (APPLE)
   set_target_properties (gnc-locale-tax PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -30,7 +35,7 @@ set(gncmod_tax_us_SCHEME_2 us/tax.scm)
 set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf.scm de_DE/txf-help.scm)
 set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax.scm)
 
-set(GUILE_DEPENDS scm-app-utils scm-gnc-module)
+set(GUILE_DEPENDS scm-app-utils)
 
 gnc_add_scheme_targets(scm-tax-us-1
     SOURCES "${gncmod_tax_us_SCHEME_1}"
diff --git a/util/src-count/count.sh b/util/src-count/count.sh
index 5d67fadfb..a6a18922c 100644
--- a/util/src-count/count.sh
+++ b/util/src-count/count.sh
@@ -136,4 +136,4 @@ wc $(find .. \( -path '*.svn' -prune \) -o \
                -name '*.dtd' \)                -a \
              -print | sort ) | wc
 
-cd -
\ No newline at end of file
+cd -

commit abf29aa196ea242c4343e6cd2b02ffc827458eb7
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 21:29:20 2020 +0200

    Drop the gnc-module wrapper around the test-engine library
    
    It's not adding anything

diff --git a/bindings/guile/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt
index 5ab1c6863..9382136c9 100644
--- a/bindings/guile/test/CMakeLists.txt
+++ b/bindings/guile/test/CMakeLists.txt
@@ -12,7 +12,7 @@ set(ENGINE_TEST_INCLUDE_DIRS
 
 set(ENGINE_TEST_LIBS
     gnc-engine
-    gncmod-test-engine
+    gnc-test-engine
     test-core
     gnucash-guile
     ${LIBXML2_LDFLAGS}
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 63c0bcded..b01f120ae 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -26,7 +26,7 @@ set(GUILE_DEPENDS
   scm-gnc-module
   scm-gnome-utils
   test-core
-  gncmod-test-engine
+  gnc-test-engine
   gnc-app-utils
   gnc-core-utils
   gnc-engine
diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
index 09d6c61d1..2db22cfba 100644
--- a/gnucash/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -10,7 +10,7 @@ set(GENERIC_IMPORT_TEST_INCLUDE_DIRS
   ${GUILE_INCLUDE_DIRS}
 )
 
-set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gncmod-test-engine test-core)
+set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gnc-test-engine test-core)
 
 gnc_add_test_with_guile(test-import-parse test-import-parse.c
   GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 96fab0369..b738202fd 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -9,7 +9,7 @@ set(APP_UTILS_TEST_INCLUDE_DIRS
   ${GUILE_INCLUDE_DIRS}
 )
 
-set(APP_UTILS_TEST_LIBS gnc-app-utils gncmod-test-engine test-core ${GIO_LDFLAGS} ${GUILE_LDFLAGS})
+set(APP_UTILS_TEST_LIBS gnc-app-utils gnc-test-engine test-core ${GIO_LDFLAGS} ${GUILE_LDFLAGS})
 
 set(test_app_utils_SOURCES test-app-utils.c test-option-util.cpp test-gnc-ui-util.c)
 
diff --git a/libgnucash/backend/dbi/test/CMakeLists.txt b/libgnucash/backend/dbi/test/CMakeLists.txt
index f6c0b96ac..1705c30e5 100644
--- a/libgnucash/backend/dbi/test/CMakeLists.txt
+++ b/libgnucash/backend/dbi/test/CMakeLists.txt
@@ -10,7 +10,7 @@ set(BACKEND_DBI_TEST_INCLUDE_DIRS
   ${LIBDBI_INCLUDE_PATH}
   ${GLIB2_INCLUDE_DIRS}
 )
-set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gnc-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
+set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gnc-engine gnc-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
 
 set(test_dbi_backend_SOURCES
   test-backend-dbi.cpp
diff --git a/libgnucash/backend/xml/test/CMakeLists.txt b/libgnucash/backend/xml/test/CMakeLists.txt
index b9536b560..78effe61e 100644
--- a/libgnucash/backend/xml/test/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/CMakeLists.txt
@@ -14,7 +14,7 @@ set(XML_TEST_INCLUDE_DIRS
 )
 
 
-set(XML_TEST_LIBS gnc-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
+set(XML_TEST_LIBS gnc-engine gnc-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
 
 function(add_xml_test _TARGET _SOURCE_FILES)
   gnc_add_test(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})
diff --git a/libgnucash/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt
index 0be8b23de..675707b15 100644
--- a/libgnucash/engine/test-core/CMakeLists.txt
+++ b/libgnucash/engine/test-core/CMakeLists.txt
@@ -1,12 +1,12 @@
 
 
-set(libgncmod_test_engine_SOURCES
-  gncmod-test-engine.c test-engine-stuff.cpp
+set(libgnc_test_engine_SOURCES
+    test-engine-stuff.cpp
 )
 
-add_library(gncmod-test-engine STATIC ${libgncmod_test_engine_SOURCES})
+add_library(gnc-test-engine STATIC ${libgnc_test_engine_SOURCES})
 
-target_include_directories(gncmod-test-engine PRIVATE
+target_include_directories(gnc-test-engine PRIVATE
   ${GMODULE_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${CMAKE_BINARY_DIR}/common # for config.h
@@ -15,5 +15,5 @@ target_include_directories(gncmod-test-engine PRIVATE
   ${CMAKE_SOURCE_DIR}/common/test-core
 )
 
-set_dist_list(engine_test_core_DIST CMakeLists.txt ${libgncmod_test_engine_SOURCES}
+set_dist_list(engine_test_core_DIST CMakeLists.txt ${libgnc_test_engine_SOURCES}
         test-engine-stuff.h test-engine-strings.h)
diff --git a/libgnucash/engine/test-core/gncmod-test-engine.c b/libgnucash/engine/test-core/gncmod-test-engine.c
deleted file mode 100644
index 45e86a110..000000000
--- a/libgnucash/engine/test-core/gncmod-test-engine.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*********************************************************************
- * gncmod-test-engine.c
- * module definition/initialization for the engine test infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <stdio.h>
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_test_engine)
-
-/* version of the gnc module system interface we require */
-int libgncmod_test_engine_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_test_engine_gnc_module_current  = 0;
-int libgncmod_test_engine_gnc_module_revision = 0;
-int libgncmod_test_engine_gnc_module_age      = 0;
-
-
-char *
-libgncmod_test_engine_gnc_module_path(void)
-{
-    return g_strdup("gnucash/engine/test");
-}
-
-char *
-libgncmod_test_engine_gnc_module_description(void)
-{
-    return g_strdup("GnuCash Engine test infrastructure.");
-}
-
-int
-libgncmod_test_engine_gnc_module_init(int refcount)
-{
-    return TRUE;
-}
-
-int
-libgncmod_test_engine_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 95b342d74..08ff72b4f 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -9,7 +9,7 @@ set(ENGINE_TEST_INCLUDE_DIRS
   ${GLIB2_INCLUDE_DIRS}
 )
 
-set(ENGINE_TEST_LIBS gnc-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lm)
+set(ENGINE_TEST_LIBS gnc-engine gnc-test-engine test-core ${LIBXML2_LDFLAGS} -lm)
 
 macro(add_engine_test _TARGET _SOURCE_FILES)
   gnc_add_test(${_TARGET} "${_SOURCE_FILES}" ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)

commit 03d7ae8fd0afa532c4daf7403ec4523e0f927d15
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 21:17:13 2020 +0200

    Convert gncmod-report into an ordinary library
    
    An init function has been added to be called once before using the library.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 460ea577f..79523cefa 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -52,9 +52,9 @@ endif()
 
 target_link_libraries (gnucash
    gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
-   gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
+   gnc-engine gnc-module gnc-core-utils gnucash-guile
    gnc-qif-import gnc-csv-import gnc-csv-export gnc-log-replay
-   gnc-bi-import gnc-customer-import
+   gnc-bi-import gnc-customer-import gnc-report
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 6c57f5f91..4b0366e4b 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -139,7 +139,7 @@ add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_G
 target_link_libraries(gnc-gnome
     gnc-gnome-search
     gnc-ledger-core
-    gncmod-report
+    gnc-report
     gnc-register-gnome
     gnc-register-core
     gnc-gnome-utils
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 026c6469c..5b71bd2a9 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -508,7 +508,6 @@ load_gnucash_modules()
     {
         { "gnucash/import-export/ofx", 0, TRUE },
         { "gnucash/import-export/aqbanking", 0, TRUE },
-        { "gnucash/report", 0, FALSE },
         { "gnucash/python", 0, TRUE },
     };
 
@@ -623,6 +622,7 @@ inner_main (void *closure, int argc, char **argv)
     gnc_search_core_initialize ();
     gnc_hook_add_dangler(HOOK_UI_SHUTDOWN, (GFunc)gnc_search_core_finalize, NULL, NULL);
     gnucash_register_add_cell_types ();
+    gnc_report_init ();
 
     load_gnucash_plugins();
     load_gnucash_modules();
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 1a18276e5..2e3c9daf5 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -14,35 +14,34 @@ gnc_add_swig_guile_command (swig-report-c
 )
 
 set (report_SOURCES
-  gncmod-report.c
   gnc-report.c
 )
 
-add_library (gncmod-report
+add_library (gnc-report
   ${report_SOURCES}
   ${report_HEADERS}
   ${SWIG_REPORT_C}
 )
 
-target_compile_definitions(gncmod-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
+target_compile_definitions(gnc-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
 
-target_link_libraries(gncmod-report
+target_link_libraries(gnc-report
     gnc-module
     gnc-app-utils
     gnucash-guile
     PkgConfig::GTK3
     ${GUILE_LDFLAGS})
 
-target_include_directories (gncmod-report
+target_include_directories (gnc-report
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 
 if (APPLE)
-  set_target_properties (gncmod-report PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-report PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-report
+install(TARGETS gnc-report
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -90,7 +89,7 @@ set (report_eguile_SCHEME
 set(GUILE_DEPENDS
   scm-gnc-html
   scm-gnome-utils
-  gncmod-report
+  gnc-report
   scm-app-utils
   scm-engine
   scm-gnc-module
diff --git a/gnucash/report/gnc-report.c b/gnucash/report/gnc-report.c
index 2395bf89f..94d4ba9be 100644
--- a/gnucash/report/gnc-report.c
+++ b/gnucash/report/gnc-report.c
@@ -42,12 +42,23 @@
 #include "gnc-report.h"
 #include "gnc-engine.h"
 
+extern SCM scm_init_sw_report_module(void);
+
 static QofLogModule log_module = GNC_MOD_GUI;
 
 /* Fow now, this is global, like it was in guile.  It _should_ be per-book. */
 static GHashTable *reports = NULL;
 static gint report_next_serial_id = 0;
 
+void
+gnc_report_init (void)
+{
+    scm_init_sw_report_module();
+    scm_c_use_module ("gnucash report");
+    scm_c_eval_string("(report-module-loader (list '(gnucash report stylesheets)))");
+}
+
+
 static void
 gnc_report_init_table(void)
 {
diff --git a/gnucash/report/gnc-report.h b/gnucash/report/gnc-report.h
index 99fe2c9a4..4bf597288 100644
--- a/gnucash/report/gnc-report.h
+++ b/gnucash/report/gnc-report.h
@@ -31,6 +31,13 @@
 #define SAVED_REPORTS_FILE "saved-reports-2.8"
 #define SAVED_REPORTS_FILE_OLD_REV "saved-reports-2.4"
 
+/** Initialize report library.
+ *
+ *  Should be called once before using any of its features.
+ */
+void gnc_report_init (void);
+
+
 gboolean gnc_run_report (gint report_id, char ** data);
 gboolean gnc_run_report_id_string (const char * id_string, char **data);
 
diff --git a/gnucash/report/gncmod-report.c b/gnucash/report/gncmod-report.c
deleted file mode 100644
index e65236ee6..000000000
--- a/gnucash/report/gncmod-report.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*********************************************************************
- * gncmod-report.c
- * module definition/initialization for the report infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <config.h>
-#include <gmodule.h>
-#include <libguile.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_report)
-
-/* version of the gnc module system interface we require */
-int libgncmod_report_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_report_gnc_module_current  = 0;
-int libgncmod_report_gnc_module_revision = 0;
-int libgncmod_report_gnc_module_age      = 0;
-
-
-char *
-libgncmod_report_gnc_module_path(void)
-{
-    return g_strdup("gnucash/report");
-}
-
-char *
-libgncmod_report_gnc_module_description(void)
-{
-    return g_strdup("Core components of GnuCash report generation system");
-}
-
-extern SCM scm_init_sw_report_module(void);
-
-int
-libgncmod_report_gnc_module_init(int refcount)
-{
-    scm_init_sw_report_module();
-
-    scm_c_use_module ("gnucash report");
-
-    /* if this is the first time the module's being loaded, initialize
-     * the relative date system */
-    if (refcount == 0)
-    {
-        scm_c_eval_string("(report-module-loader (list '(gnucash report stylesheets)))");
-    }
-
-    return TRUE;
-}
-
-int
-libgncmod_report_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index b62539bf2..077c2965c 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -25,7 +25,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
 (eval-when (compile load eval expand)
-  (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+  (load-extension "libgnc-report" "scm_init_sw_report_module"))
 (use-modules (sw_report))
 
 (use-modules (ice-9 match))
diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt
index 33a5dfc34..467fcaaef 100644
--- a/gnucash/report/test/CMakeLists.txt
+++ b/gnucash/report/test/CMakeLists.txt
@@ -1,14 +1,4 @@
 
-set(REPORT_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
-  ${GUILE_INCLUDE_DIRS}
-)
-set(REPORT_TEST_LIBS gnc-module)
-
-gnc_add_test_with_guile(test-link-module-report test-link-module.c
-  REPORT_TEST_INCLUDE_DIRS REPORT_TEST_LIBS
-)
-
 set(scm_test_report_SOURCES
   test-load-report-module.scm
   test-test-extras.scm
@@ -57,12 +47,12 @@ gnc_add_scheme_test_targets(scm-test-report-2
     DEPENDS "scm-test-report")
 
 add_dependencies(check scm-test-report)
+
 set_dist_list(test_report_DIST
   CMakeLists.txt
   ${scm_test_report_with_srfi64_SOURCES}
   ${scm_test_report_SOURCES}
   test-report-extras.scm
-  test-link-module.c
 )
 
 # Module interfaces deprecated in 4.x, will be removed for 5.x
diff --git a/gnucash/report/test/test-link-module.c b/gnucash/report/test/test-link-module.c
deleted file mode 100644
index 8a5183bc8..000000000
--- a/gnucash/report/test/test-link-module.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include <stdlib.h>
-#include <libguile.h>
-#include <gnc-module.h>
-
-static void
-guile_main(void *closure, int argc, char ** argv)
-{
-    GNCModule mod;
-    gnc_module_system_init();
-    mod = gnc_module_load("gnucash/report", 0);
-
-    exit(mod == NULL);
-}
-
-int
-main(int argc, char ** argv)
-{
-    g_setenv ("GNC_UNINSTALLED", "1", TRUE);
-    scm_boot_guile(argc, argv, guile_main, NULL);
-    return 0;
-}
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5243cf87..0701f6119 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -400,7 +400,6 @@ gnucash/report/commodity-utilities.scm
 gnucash/report/eguile-html-utilities.scm
 gnucash/report/eguile.scm
 gnucash/report/eguile-utilities.scm
-gnucash/report/gncmod-report.c
 gnucash/report/gnc-report.c
 gnucash/report/html-acct-table.scm
 gnucash/report/html-anytag.scm

commit 8e40f400ad52bfbf19a26ec7bfc05c9b3db94118
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 20:14:27 2020 +0200

    Convert gncmod-bi/customer-import into ordinary libraries
    
    As with qif-import use gnucash plugin interface to initialize the code.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index cacbe3473..460ea577f 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -54,6 +54,7 @@ target_link_libraries (gnucash
    gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
    gnc-qif-import gnc-csv-import gnc-csv-export gnc-log-replay
+   gnc-bi-import gnc-customer-import
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 050a8a72d..026c6469c 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -50,8 +50,10 @@
 #include "gnc-main-window.h"
 #include "gnc-splash.h"
 #include "gnc-gnome-utils.h"
+#include "gnc-plugin-bi-import.h"
 #include "gnc-plugin-csv-export.h"
 #include "gnc-plugin-csv-import.h"
+#include "gnc-plugin-customer-import.h"
 #include "gnc-plugin-file-history.h"
 #include "gnc-plugin-log-replay.h"
 #include "gnc-plugin-qif-import.h"
@@ -485,10 +487,12 @@ gnc_parse_command_line(int *argc, char ***argv)
 static void
 load_gnucash_plugins()
 {
-    gnc_plugin_csv_export_create_plugin();
+    gnc_plugin_bi_import_create_plugin ();
+    gnc_plugin_csv_export_create_plugin ();
     gnc_plugin_csv_import_create_plugin();
+    gnc_plugin_customer_import_create_plugin ();
     gnc_plugin_qif_import_create_plugin ();
-    gnc_plugin_log_replay_create_plugin();
+    gnc_plugin_log_replay_create_plugin ();
 }
 
 static void
@@ -504,8 +508,6 @@ load_gnucash_modules()
     {
         { "gnucash/import-export/ofx", 0, TRUE },
         { "gnucash/import-export/aqbanking", 0, TRUE },
-        { "gnucash/import-export/bi-import", 0, TRUE},
-        { "gnucash/import-export/customer-import", 0, TRUE},
         { "gnucash/report", 0, FALSE },
         { "gnucash/python", 0, TRUE },
     };
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 18aa9591d..61a6119c0 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(bi_import_SOURCES
   gnc-plugin-bi-import.c
-  gncmod-bi-import.c
   dialog-bi-import-gui.c
   dialog-bi-import-helper.c
   dialog-bi-import.c
@@ -16,9 +15,9 @@ set(bi_import_noinst_HEADERS
   dialog-bi-import.h
 )
 
-add_library(gncmod-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
+add_library(gnc-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
 
-target_link_libraries(gncmod-bi-import
+target_link_libraries(gnc-bi-import
   gnc-gnome-utils
   gnc-gnome-search
   gnc-app-utils
@@ -28,18 +27,18 @@ target_link_libraries(gncmod-bi-import
   gnc-gnome
 )
 
-target_include_directories(gncmod-bi-import
+target_include_directories(gnc-bi-import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
-target_compile_definitions(gncmod-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
+target_compile_definitions(gnc-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
 
 if (APPLE)
-  set_target_properties (gncmod-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-bi-import
+install(TARGETS gnc-bi-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
index eb55e2651..7b202050c 100644
--- a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
+++ b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
@@ -36,6 +36,7 @@
 
 #include "gnc-plugin-bi-import.h"
 #include "dialog-bi-import-gui.h"
+#include "gnc-plugin-manager.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = G_LOG_DOMAIN;
@@ -99,6 +100,18 @@ gnc_plugin_bi_import_finalize (GObject *object)
 {
 }
 
+/************************************************************
+*                    Plugin Bootstrapping                   *
+************************************************************/
+
+void
+gnc_plugin_bi_import_create_plugin (void)
+{
+    GncPlugin *plugin = gnc_plugin_bi_import_new ();
+
+    gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (), plugin);
+}
+
 /************************************************************
  *                    Command Callbacks                     *
  ************************************************************/
diff --git a/gnucash/import-export/bi-import/gncmod-bi-import.c b/gnucash/import-export/bi-import/gncmod-bi-import.c
deleted file mode 100644
index 6806a84c4..000000000
--- a/gnucash/import-export/bi-import/gncmod-bi-import.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*********************************************************************
- * gncmod-bi-import.c
- * module definition/initialization for the bi-import GNOME UI module
- *
- * Copyright (c) 2009 Sebastian Held <sebastian.held at gmx.de>
- * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation           Voice:  +1-617-542-5942
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
- * Boston, MA  02110-1301,  USA       gnu at gnu.org
- *
- *********************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gmodule.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
-#include "gnc-hooks.h"
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "gnc-plugin-manager.h"
-#include "gnc-plugin-bi-import.h"
-
-GNC_MODULE_API_DECL(libgncmod_bi_import);
-
-/* version of the gnc module system interface we require */
-int libgncmod_bi_import_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_bi_import_gnc_module_current  = 0;
-int libgncmod_bi_import_gnc_module_revision = 0;
-int libgncmod_bi_import_gnc_module_age      = 0;
-
-
-char *
-libgncmod_bi_import_gnc_module_path (void)
-{
-    return g_strdup("gnucash/import-export/bi-import");
-}
-
-char *
-libgncmod_bi_import_gnc_module_description (void)
-{
-    return g_strdup("The GnuCash bi-import plugin");
-}
-
-int
-libgncmod_bi_import_gnc_module_init (int refcount)
-{
-    if (refcount == 0)
-    {
-        /* this is the first time the module is loaded */
-
-        gnc_plugin_manager_add_plugin ( gnc_plugin_manager_get (),
-                                        gnc_plugin_bi_import_new ());
-    }
-
-    return TRUE;
-}
-
-int
-libgncmod_bi_import_gnc_module_end (int refcount)
-{
-    if (refcount == 0)
-    {
-        /* this is the last time the module is unloaded */
-    }
-
-    return TRUE;
-}
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index 1fe9040ce..b0f7073ea 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(customer_import_SOURCES
   gnc-plugin-customer-import.c
-  gncmod-customer-import.c
   dialog-customer-import-gui.c
   dialog-customer-import.c
 )
@@ -15,23 +14,23 @@ set(customer_import_noinst_HEADERS
   dialog-customer-import.h
 )
 
-add_library(gncmod-customer-import ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
+add_library(gnc-customer-import ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
 
-target_link_libraries(gncmod-customer-import gnc-gnome gnc-gnome-utils gnc-app-utils
+target_link_libraries(gnc-customer-import gnc-gnome gnc-gnome-utils gnc-app-utils
      gnc-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS})
 
-target_include_directories(gncmod-customer-import
+target_include_directories(gnc-customer-import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
-target_compile_definitions(gncmod-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\")
+target_compile_definitions(gnc-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\")
 
 if (APPLE)
-  set_target_properties (gncmod-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-customer-import
+install(TARGETS gnc-customer-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
index 0586a746c..744575530 100644
--- a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
+++ b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
@@ -36,6 +36,7 @@
 
 #include "gnc-plugin-customer-import.h"
 #include "dialog-customer-import-gui.h"
+#include "gnc-plugin-manager.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = G_LOG_DOMAIN;
@@ -100,6 +101,18 @@ gnc_plugin_customer_import_finalize (GObject *object)
 {
 }
 
+/************************************************************
+ *                    Plugin Bootstrapping                   *
+ ************************************************************/
+
+void
+gnc_plugin_customer_import_create_plugin (void)
+{
+    GncPlugin *plugin = gnc_plugin_customer_import_new ();
+
+    gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (), plugin);
+}
+
 /************************************************************
  *                    Command Callbacks                     *
  ************************************************************/
diff --git a/gnucash/import-export/customer-import/gncmod-customer-import.c b/gnucash/import-export/customer-import/gncmod-customer-import.c
deleted file mode 100644
index e28b01344..000000000
--- a/gnucash/import-export/customer-import/gncmod-customer-import.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*********************************************************************
- * gncmod-customer-import.c
- * module definition/initialization for the customer_import GNOME UI module
- *
- * Copyright (c) 2009 Sebastian Held <sebastian.held at gmx.de>
- * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation           Voice:  +1-617-542-5942
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
- * Boston, MA  02110-1301,  USA       gnu at gnu.org
- *
- *********************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gmodule.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
-#include "gnc-hooks.h"
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "gnc-plugin-manager.h"
-#include "gnc-plugin-customer-import.h"
-
-GNC_MODULE_API_DECL(libgncmod_customer_import);
-
-/* version of the gnc module system interface we require */
-int libgncmod_customer_import_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_customer_import_gnc_module_current  = 0;
-int libgncmod_customer_import_gnc_module_revision = 0;
-int libgncmod_customer_import_gnc_module_age      = 0;
-
-
-char *
-libgncmod_customer_import_gnc_module_path (void)
-{
-    return g_strdup("gnucash/import-export/customer-import");
-}
-
-char *
-libgncmod_customer_import_gnc_module_description (void)
-{
-    return g_strdup("The GnuCash customer_import plugin");
-}
-
-int
-libgncmod_customer_import_gnc_module_init (int refcount)
-{
-    if (refcount == 0)
-    {
-        /* this is the first time the module is loaded */
-
-        gnc_plugin_manager_add_plugin ( gnc_plugin_manager_get (),
-                                        gnc_plugin_customer_import_new ());
-    }
-
-    return TRUE;
-}
-
-int
-libgncmod_customer_import_gnc_module_end (int refcount)
-{
-    if (refcount == 0)
-    {
-        /* this is the last time the module is unloaded */
-    }
-
-    return TRUE;
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 37d85044e..c5243cf87 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -291,7 +291,6 @@ gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.i
 gnucash/import-export/bi-import/dialog-bi-import.c
 gnucash/import-export/bi-import/dialog-bi-import-gui.c
 gnucash/import-export/bi-import/dialog-bi-import-helper.c
-gnucash/import-export/bi-import/gncmod-bi-import.c
 gnucash/import-export/bi-import/gnc-plugin-bi-import.c
 gnucash/import-export/csv-exp/assistant-csv-export.c
 gnucash/import-export/csv-exp/csv-transactions-export.c
@@ -317,7 +316,6 @@ gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
 gnucash/import-export/customer-import/dialog-customer-import.c
 gnucash/import-export/customer-import/dialog-customer-import-gui.c
-gnucash/import-export/customer-import/gncmod-customer-import.c
 gnucash/import-export/customer-import/gnc-plugin-customer-import.c
 gnucash/import-export/import-account-matcher.c
 gnucash/import-export/import-backend.c

commit 968e979e8333fabad264d78a091180dd44c765ff
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 18:31:40 2020 +0200

    Convert gncmod-log-replay into an ordinary library
    
    As with qif-import use gnucash plugin interface to initialize the code.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 2cbc4b235..cacbe3473 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 target_link_libraries (gnucash
    gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
-   gnc-qif-import gnc-csv-import gnc-csv-export
+   gnc-qif-import gnc-csv-import gnc-csv-export gnc-log-replay
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index a74a28bad..050a8a72d 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -53,6 +53,7 @@
 #include "gnc-plugin-csv-export.h"
 #include "gnc-plugin-csv-import.h"
 #include "gnc-plugin-file-history.h"
+#include "gnc-plugin-log-replay.h"
 #include "gnc-plugin-qif-import.h"
 #include "gnc-plugin-report-system.h"
 #include "dialog-new-user.h"
@@ -487,6 +488,7 @@ load_gnucash_plugins()
     gnc_plugin_csv_export_create_plugin();
     gnc_plugin_csv_import_create_plugin();
     gnc_plugin_qif_import_create_plugin ();
+    gnc_plugin_log_replay_create_plugin();
 }
 
 static void
@@ -501,7 +503,6 @@ load_gnucash_modules()
     } modules[] =
     {
         { "gnucash/import-export/ofx", 0, TRUE },
-        { "gnucash/import-export/log-replay", 0, TRUE },
         { "gnucash/import-export/aqbanking", 0, TRUE },
         { "gnucash/import-export/bi-import", 0, TRUE},
         { "gnucash/import-export/customer-import", 0, TRUE},
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index 008231a7b..bcf5872cc 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -2,7 +2,6 @@
 set(log_replay_SOURCES
   gnc-log-replay.c
   gnc-plugin-log-replay.c
-  gncmod-log-replay.c
 )
 
 # Add dependency on config.h
@@ -13,18 +12,23 @@ set(log_replay_noinst_HEADERS
   gnc-plugin-log-replay.h
 )
 
-add_library(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
+add_library(gnc-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
 
-target_link_libraries(gncmod-log-replay gnc-gnome-utils gnc-app-utils gnc-engine
+target_link_libraries(gnc-log-replay gnc-gnome-utils gnc-app-utils gnc-engine
      gnc-core-utils gnc-module PkgConfig::GTK3)
 
-target_compile_definitions(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
+target_compile_definitions(gnc-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
+
+target_include_directories(gnc-log-replay
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
 if (APPLE)
-  set_target_properties (gncmod-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-log-replay
+install(TARGETS gnc-log-replay
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/import-export/log-replay/gncmod-log-replay.c b/gnucash/import-export/log-replay/gncmod-log-replay.c
deleted file mode 100644
index 58730b5ff..000000000
--- a/gnucash/import-export/log-replay/gncmod-log-replay.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
-\********************************************************************/
-/** @addtogroup Import_Export
-    @{ */
-/**@internal
- at file gncmod-log-replay.c
- at brief module definition/initialization for the log replay module
- at author Copyright (c) 2003 Benoit Grégoire bock at step.polymtl.ca
-*/
-#include <config.h>
-
-#include <gmodule.h>
-
-#include "gnc-log-replay.h"
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-#include "gnc-plugin-log-replay.h"
-
-GNC_MODULE_API_DECL(libgncmod_log_replay)
-
-/* version of the gnc module system interface we require */
-int libgncmod_log_replay_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_log_replay_gnc_module_current  = 0;
-int libgncmod_log_replay_gnc_module_revision = 0;
-int libgncmod_log_replay_gnc_module_age      = 0;
-
-//static GNCModule bus_core;
-//static GNCModule file;
-
-
-char *
-libgncmod_log_replay_gnc_module_path(void)
-{
-    return g_strdup("gnucash/import-export/log-replay");
-}
-
-char *
-libgncmod_log_replay_gnc_module_description(void)
-{
-    return g_strdup("C code for log file replay");
-}
-
-int
-libgncmod_log_replay_gnc_module_init(int refcount)
-{
-    /* Add menu items with C callbacks */
-    gnc_plugin_log_replay_create_plugin();
-
-    return TRUE;
-}
-
-int
-libgncmod_log_replay_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
-/** @}*/
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1ce316731..37d85044e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -330,7 +330,6 @@ gnucash/import-export/import-pending-matches.c
 gnucash/import-export/import-settings.c
 gnucash/import-export/import-utilities.c
 gnucash/import-export/log-replay/gnc-log-replay.c
-gnucash/import-export/log-replay/gncmod-log-replay.c
 gnucash/import-export/log-replay/gnc-plugin-log-replay.c
 gnucash/import-export/ofx/gncmod-ofx-import.c
 gnucash/import-export/ofx/gnc-ofx-import.c

commit 4b51c630f478bdb732fcead2b03156eb9657d543
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 18:14:40 2020 +0200

    Convert gncmod-csv-import/export into ordinary libraries
    
    As with qif-import use gnucash plugin interface to initialize the code.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 827a6e2e7..2cbc4b235 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 target_link_libraries (gnucash
    gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
-   gnc-qif-import
+   gnc-qif-import gnc-csv-import gnc-csv-export
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 27eee0c4c..a74a28bad 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -50,6 +50,8 @@
 #include "gnc-main-window.h"
 #include "gnc-splash.h"
 #include "gnc-gnome-utils.h"
+#include "gnc-plugin-csv-export.h"
+#include "gnc-plugin-csv-import.h"
 #include "gnc-plugin-file-history.h"
 #include "gnc-plugin-qif-import.h"
 #include "gnc-plugin-report-system.h"
@@ -482,6 +484,8 @@ gnc_parse_command_line(int *argc, char ***argv)
 static void
 load_gnucash_plugins()
 {
+    gnc_plugin_csv_export_create_plugin();
+    gnc_plugin_csv_import_create_plugin();
     gnc_plugin_qif_import_create_plugin ();
 }
 
@@ -497,8 +501,6 @@ load_gnucash_modules()
     } modules[] =
     {
         { "gnucash/import-export/ofx", 0, TRUE },
-        { "gnucash/import-export/csv-import", 0, TRUE },
-        { "gnucash/import-export/csv-export", 0, TRUE },
         { "gnucash/import-export/log-replay", 0, TRUE },
         { "gnucash/import-export/aqbanking", 0, TRUE },
         { "gnucash/import-export/bi-import", 0, TRUE},
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 0da151bae..3ef5160b1 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(csv_export_SOURCES
-  gncmod-csv-export.c
   gnc-plugin-csv-export.c
   assistant-csv-export.c
   csv-tree-export.c
@@ -16,18 +15,23 @@ set(csv_export_noinst_HEADERS
   csv-transactions-export.h
 )
 
-add_library(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
+add_library(gnc-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
-target_link_libraries(gncmod-csv-export gnc-register-gnome gnc-register-core gnc-ledger-core gnc-engine
+target_link_libraries(gnc-csv-export gnc-register-gnome gnc-register-core gnc-ledger-core gnc-engine
                          gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
 
-target_compile_definitions(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
+target_include_directories(gnc-csv-export
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_compile_definitions(gnc-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
 
 if (APPLE)
-  set_target_properties (gncmod-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-csv-export
+install(TARGETS gnc-csv-export
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/import-export/csv-exp/gncmod-csv-export.c b/gnucash/import-export/csv-exp/gncmod-csv-export.c
deleted file mode 100644
index 37c89f813..000000000
--- a/gnucash/import-export/csv-exp/gncmod-csv-export.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
-\********************************************************************/
-/** @addtogroup Import_Export
-    @{ */
-/**@internal
- at file gncmod-csv-export.c
- at brief module definition/initialization for the csv exporter
- at author Copyright (c) 2012 Robert Fewell
-*/
-#include <config.h>
-
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-#include "gnc-plugin-csv-export.h"
-
-GNC_MODULE_API_DECL(libgncmod_csv_export)
-
-/* version of the gnc module system interface we require */
-int libgncmod_csv_export_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_csv_export_gnc_module_current  = 0;
-int libgncmod_csv_export_gnc_module_revision = 0;
-int libgncmod_csv_export_gnc_module_age      = 0;
-
-//static GNCModule bus_core;
-//static GNCModule file;
-
-char *
-libgncmod_csv_export_gnc_module_path(void)
-{
-    return g_strdup("gnucash/import-export/csv-export");
-}
-
-char *
-libgncmod_csv_export_gnc_module_description(void)
-{
-    return g_strdup("Gnome GUI and C code for CSV exporter.");
-}
-
-int
-libgncmod_csv_export_gnc_module_init(int refcount)
-{
-    /* Add menu items with C callbacks */
-    gnc_plugin_csv_export_create_plugin();
-
-    return TRUE;
-}
-
-int
-libgncmod_csv_export_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
-/** @}*/
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 05fb5ad2f..7d2879ee1 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -7,7 +7,6 @@ set(csv_import_remote_SOURCES
 )
 
 set(csv_import_SOURCES
-  gncmod-csv-import.c
   assistant-csv-account-import.c
   assistant-csv-price-import.cpp
   assistant-csv-trans-import.cpp
@@ -58,12 +57,12 @@ set(csv_import_noinst_HEADERS
   gnc-tokenizer-fw.hpp
 )
 
-add_library(gncmod-csv-import ${csv_import_noinst_HEADERS}
+add_library(gnc-csv-import ${csv_import_noinst_HEADERS}
   ${csv_import_remote_HEADERS} ${csv_import_remote_SOURCES} ${csv_import_SOURCES}
 )
 
 target_link_libraries(
-  gncmod-csv-import
+  gnc-csv-import
   ${Boost_LIBRARIES}
   ${ICU4C_I18N_LDFLAGS}
   gnc-generic-import
@@ -74,18 +73,21 @@ target_link_libraries(
   gnc-module)
 
 
-target_compile_definitions(gncmod-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
+target_compile_definitions(gnc-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
 
-target_include_directories(gncmod-csv-import PRIVATE
-     ${ICU4C_I18N_INCLUDE_DIRS}
-     ${CMAKE_SOURCE_DIR}/borrowed/goffice
+target_include_directories(gnc-csv-import
+    PRIVATE
+        ${ICU4C_I18N_INCLUDE_DIRS}
+        ${CMAKE_SOURCE_DIR}/borrowed/goffice
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 if (APPLE)
-  set_target_properties (gncmod-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-csv-import
+install(TARGETS gnc-csv-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/import-export/csv-imp/gncmod-csv-import.c b/gnucash/import-export/csv-imp/gncmod-csv-import.c
deleted file mode 100644
index 34241db7f..000000000
--- a/gnucash/import-export/csv-imp/gncmod-csv-import.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
-\********************************************************************/
-/** @addtogroup Import_Export
-    @{ */
-/**@internal
- at file gncmod-csv-import.c
- at brief module definition/initialization for the csv importer
- at author Copyright (c) 2012 Robert Fewell
-*/
-#include <config.h>
-
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-#include "gnc-plugin-csv-import.h"
-
-GNC_MODULE_API_DECL(libgncmod_csv_import)
-
-/* version of the gnc module system interface we require */
-int libgncmod_csv_import_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_csv_import_gnc_module_current  = 0;
-int libgncmod_csv_import_gnc_module_revision = 0;
-int libgncmod_csv_import_gnc_module_age      = 0;
-
-//static GNCModule bus_core;
-//static GNCModule file;
-
-char *
-libgncmod_csv_import_gnc_module_path(void)
-{
-    return g_strdup("gnucash/import-export/csv-import");
-}
-
-char *
-libgncmod_csv_import_gnc_module_description(void)
-{
-    return g_strdup("Gnome GUI and C code for CSV importer.");
-}
-
-int
-libgncmod_csv_import_gnc_module_init(int refcount)
-{
-    /* Add menu items with C callbacks */
-    gnc_plugin_csv_import_create_plugin();
-
-    return TRUE;
-}
-
-int
-libgncmod_csv_import_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
-/** @}*/
diff --git a/gnucash/import-export/csv-imp/test/CMakeLists.txt b/gnucash/import-export/csv-imp/test/CMakeLists.txt
index 9a6b342d0..953f64d6d 100644
--- a/gnucash/import-export/csv-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/test/CMakeLists.txt
@@ -6,12 +6,12 @@ set(CSV_IMP_TEST_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/common/test-core
   ${GLIB2_INCLUDE_DIRS}
 )
-set(CSV_IMP_TEST_LIBS gncmod-csv-import gnc-engine test-core)
+set(CSV_IMP_TEST_LIBS gnc-csv-import gnc-engine test-core)
 
 # This test does not run in Win32
 if (NOT WIN32)
   set(MODULEPATH ${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp)
-  set(gtest_csv_imp_LIBS gncmod-csv-import ${GLIB2_LDFLAGS} gtest)
+  set(gtest_csv_imp_LIBS gnc-csv-import ${GLIB2_LDFLAGS} gtest)
   set(gtest_csv_imp_INCLUDES
     ${MODULEPATH}
     ${CSV_IMP_TEST_INCLUDE_DIRS})
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b6b1934c3..1ce316731 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -296,7 +296,6 @@ gnucash/import-export/bi-import/gnc-plugin-bi-import.c
 gnucash/import-export/csv-exp/assistant-csv-export.c
 gnucash/import-export/csv-exp/csv-transactions-export.c
 gnucash/import-export/csv-exp/csv-tree-export.c
-gnucash/import-export/csv-exp/gncmod-csv-export.c
 gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
 gnucash/import-export/csv-imp/assistant-csv-account-import.c
 gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -311,7 +310,6 @@ gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
 gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
 gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
 gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
-gnucash/import-export/csv-imp/gncmod-csv-import.c
 gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp

commit 468f34477aaadc3662ea87e2f15b3b731b544c62
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 17:47:50 2020 +0200

    Convert gncmod-qif-import into an ordinary library
    
    All importers have a have a gnucash plugin interface so that will be used
    to add the importers.

diff --git a/ChangeLog.2001 b/ChangeLog.2001
index f8794e6b5..b1b0bdb4f 100644
--- a/ChangeLog.2001
+++ b/ChangeLog.2001
@@ -2357,7 +2357,7 @@
 
 	* src/guile/gnc-helpers.c: fix warnings
 
-	* src/import-export/qif-import/gncmod-qif-import.c: include api
+	* src/import-export/qif-import/gnc-qif-import.c: include api
 	header
 
 	* src/register/register-gnome/gncmod-register-gnome.c: include api
diff --git a/ChangeLog.2002 b/ChangeLog.2002
index 89b314fb7..155d43375 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -3750,7 +3750,7 @@ v	  fix the print_info
 
 	* src/gnome/window-main.c:
 	* src/import-export/qif-import/druid-qif-import.[ch]:
-	* src/import-export/qif-import/gncmod-qif-import.c: Create the
+	* src/import-export/qif-import/gnc-qif-import.c: Create the
 	"Import QIF" menu item from within the QIF module.
 
 2002-06-21  Derek Atkins   <derek at ihtfp.com>
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index 67e727beb..018b2a473 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -1172,7 +1172,7 @@
 	* src/import-export/qif-import/druid-qif-import.c:
 	(gnc_ui_qif_import_create_plugin):
 	* src/import-export/qif-import/druid-qif-import.h:
-	* src/import-export/qif-import/gncmod-qif-import.c:
+	* src/import-export/qif-import/gnc-qif-import.c:
 	(libgncmod_qif_import_LTX_gnc_module_init):
 	* src/import-export/qif-import/gnc-plugin-qif-import.[ch]:
 	* src/import-export/qif-import/gnc-plugin-qif-import-ui.xml:
diff --git a/ChangeLog.2006 b/ChangeLog.2006
index 6c3eec125..86e962429 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -576,7 +576,7 @@
 	  branches/reshuffle-modules/src/import-export/hbci/gncmod-hbci.c,
 	  branches/reshuffle-modules/src/import-export/log-replay/gncmod-log-replay.c,
 	  branches/reshuffle-modules/src/import-export/ofx/gncmod-ofx-import.c,
-	  branches/reshuffle-modules/src/import-export/qif-import/gncmod-qif-import.c,
+	  branches/reshuffle-modules/src/import-export/qif-import/gnc-qif-import.c,
 	  branches/reshuffle-modules/src/import-export/qif-io-core/gncmod-qifiocore.c,
 	  branches/reshuffle-modules/src/network-utils/gncmod-network-utils.c,
 	  branches/reshuffle-modules/src/register/ledger-core/gncmod-ledger-core.c,
@@ -8053,7 +8053,7 @@
 2006-07-04 20:35  cstim
 
 	* [r14465] trunk/ChangeLog, trunk/po/de.po: Proof-read and
-	  improved German translation by feedback from Andi Köhler.
+	  improved German translation by feedback from Andi K�hler.
 
 2006-07-04 16:32  jsled
 
@@ -9216,7 +9216,7 @@
 2006-06-01 23:06  warlord
 
 	* [r14289] trunk/ChangeLog, trunk/po/nb.po: * po/nb.po: updated
-	  Norwegian Bokmål translation by Sigve Indregard
+	  Norwegian Bokm�l translation by Sigve Indregard
 
 2006-06-01 21:02  warlord
 
@@ -9964,7 +9964,7 @@
 2006-05-21 12:59  cstim
 
 	* [r14144] trunk/po/sk.po: Updated Slovak translation by Zdenko
-	  Podobný
+	  Podobn�
 
 2006-05-21 12:58  cstim
 
@@ -11186,7 +11186,7 @@
 2006-04-22 19:04  cstim
 
 	* [r13831] trunk/ChangeLog, trunk/src/gnome/gnc-split-reg.c: Mark
-	  string for translation as pointed out by Andreas Köhler.
+	  string for translation as pointed out by Andreas K�hler.
 
 2006-04-22 05:14  chris
 
@@ -14348,7 +14348,7 @@
 2006-03-01 03:28  hampton
 
 	* [r13428] trunk/ChangeLog, trunk/src/app-utils/options.scm:
-	  Andreas Köhler's patch to correctly build a html color value.
+	  Andreas K�hler's patch to correctly build a html color value.
 	  Fixes 328933.
 
 2006-02-28 23:13  jsled
@@ -14816,7 +14816,7 @@
 
 	* [r13364] trunk/ChangeLog,
 	  trunk/src/gnome/gnc-plugin-page-register.c,
-	  trunk/src/gtk-compat.h: Cleanup patch from Andreas Köhler.
+	  trunk/src/gtk-compat.h: Cleanup patch from Andreas K�hler.
 
 2006-02-22 21:52  chris
 
@@ -14901,14 +14901,14 @@
 
 	* [r13354] trunk/ChangeLog,
 	  trunk/src/gnome/gnc-plugin-page-register.c: Fix from Andreas
-	  Köhler to deactivate the toolbar split button in an auto-split
+	  K�hler to deactivate the toolbar split button in an auto-split
 	  register. Fixes 330621.
 
 2006-02-21 23:58  hampton
 
 	* [r13353] trunk/ChangeLog,
 	  trunk/src/gnome-utils/gnc-tree-model-account.c: Two fixes from
-	  Andreas Köhler. One fixes 331183, the problem where editing a
+	  Andreas K�hler. One fixes 331183, the problem where editing a
 	  top-level account doesn't set the current parent.
 
 2006-02-21 23:10  jsled
@@ -14981,7 +14981,7 @@
 
 	* [r13340] trunk/ChangeLog,
 	  trunk/src/register/register-gnome/gnucash-date-picker.c: Andreas
-	  Köhler's patch to prevent a crash in the register date picker
+	  K�hler's patch to prevent a crash in the register date picker
 	  widget when using gtk 2.8.
 
 2006-02-21 03:44  hampton
@@ -14996,7 +14996,7 @@
 
 	* [r13338] trunk/src/gnome-utils/gtktreedatalist.c: Use glib's
 	  slice allocator in favor of GMemChunks for glib >= 2.9. Patch by
-	  Andreas Köhler <andi5.py at gmx.net>.
+	  Andreas K�hler <andi5.py at gmx.net>.
 
 2006-02-21 00:14  hampton
 
@@ -15498,7 +15498,7 @@
 	  GncTreeModelAccountTypes - now, every accessible account-types
 	  TreeModel is a new GtkTreeModelFilter, and their ref-counting is
 	  always the same. Add some tweaks to
-	  gnc-tree-model-account-types.[ch] from Andreas Köhler
+	  gnc-tree-model-account-types.[ch] from Andreas K�hler
 	  <andi5.py at gmx.net>, plus the conversion of the Account Dialog's
 	  account-types field to use the filtered GncTreeModelAccountTypes
 	  instead of a GtkListStore, but simplified to use the AccountType
@@ -15606,14 +15606,14 @@
 
 	* [r13259] trunk/ChangeLog,
 	  trunk/src/gnome-utils/dialog-account.c,
-	  trunk/src/gnome/glade/account.glade: Andreas Köhler's patch to
+	  trunk/src/gnome/glade/account.glade: Andreas K�hler's patch to
 	  convert the account types list in the account edit dialog to a
 	  GtkTreeView/GtkListStore.
 
 2006-02-13 23:21  hampton
 
 	* [r13258] trunk/ChangeLog,
-	  trunk/src/gnome/gnc-plugin-page-register.c: Andreas Köhler's
+	  trunk/src/gnome/gnc-plugin-page-register.c: Andreas K�hler's
 	  patch to prevent crash when voiding a transaction.
 
 2006-02-13 16:23  warlord
@@ -15625,7 +15625,7 @@
 2006-02-13 15:42  hampton
 
 	* [r13256] trunk/ChangeLog, trunk/src/gnome/glade/account.glade,
-	  trunk/src/gnome/glade/sched-xact.glade: Andreas Köhler's patch
+	  trunk/src/gnome/glade/sched-xact.glade: Andreas K�hler's patch
 	  to wrap label text in a couple of dialogs.
 
 2006-02-13 14:06  codehelp
@@ -16530,7 +16530,7 @@
 	  trunk/src/gnome-utils/gnc-tree-view-account.c,
 	  trunk/src/gnome-utils/gnc-tree-view-commodity.c,
 	  trunk/src/gnome-utils/gnc-tree-view-price.c,
-	  trunk/src/gnome-utils/gnc-tree-view.c: Andreas Köhler's patch to
+	  trunk/src/gnome-utils/gnc-tree-view.c: Andreas K�hler's patch to
 	  perform the i18n on column headers before calling the generic
 	  tree view code instead of performing it a couple steps removed.
 	  It also introduces the translatable strings "P" (placeholder)
@@ -16634,7 +16634,7 @@
 
 	* [r13086] trunk/ChangeLog, trunk/src/gnome-utils/gnc-tree-view.c,
 	  trunk/src/gnome-utils/gnc-tree-view.h,
-	  trunk/src/gnome/glade/account.glade: Andreas Köhler's patch to
+	  trunk/src/gnome/glade/account.glade: Andreas K�hler's patch to
 	  allow explicit specification of which columns in a tree view
 	  expand. Updated to automatically mark a column as expandable if
 	  it is the only visible column.
@@ -16997,7 +16997,7 @@
 2006-01-29 23:19  hampton
 
 	* [r13039] trunk/ChangeLog,
-	  trunk/src/gnome-utils/gnc-main-window.c: Andreas Köhler's patch
+	  trunk/src/gnome-utils/gnc-main-window.c: Andreas K�hler's patch
 	  to fix a problem where switching windows repeatedly confusing
 	  the Windows menu.
 
@@ -17010,7 +17010,7 @@
 
 	* [r13037] trunk/ChangeLog,
 	  trunk/src/gnome-utils/gnc-tree-model-commodity.c: Andreas
-	  Köhler's patch to fix commodity editor warnings/crash.
+	  K�hler's patch to fix commodity editor warnings/crash.
 
 2006-01-29 19:32  jsled
 
@@ -18764,7 +18764,7 @@
 	  branches/cashutil/src/import-export/log-replay/gncmod-log-replay.c,
 	  branches/cashutil/src/import-export/mt940/gncmod-mt940-import.c,
 	  branches/cashutil/src/import-export/ofx/gncmod-ofx-import.c,
-	  branches/cashutil/src/import-export/qif-import/gncmod-qif-import.c,
+	  branches/cashutil/src/import-export/qif-import/gnc-qif-import.c,
 	  branches/cashutil/src/register/ledger-core/gncmod-ledger-core.c,
 	  branches/cashutil/src/register/register-core/gncmod-register-core.c,
 	  branches/cashutil/src/report/report-system/gncmod-report-system.c:
diff --git a/ChangeLog.2007 b/ChangeLog.2007
index 53ec79f02..14b5f030b 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -6971,7 +6971,7 @@
 	  branches/remove-group2/src/import-export/qif-import/Makefile.am,
 	  branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c,
 	  branches/remove-group2/src/import-export/qif-import/druid-qif-import.c,
-	  branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c,
+	  branches/remove-group2/src/import-export/qif-import/gnc-qif-import.c,
 	  branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm,
 	  branches/remove-group2/src/import-export/qif-import/qif-import.scm,
 	  branches/remove-group2/src/import-export/qif-import/qif-parse.scm,
@@ -9017,7 +9017,7 @@
 	  src/import-export/hbci/gncmod-hbci.c,
 	  src/import-export/log-replay/gncmod-log-replay.c,
 	  src/import-export/ofx/gncmod-ofx-import.c,
-	  src/import-export/qif-import/gncmod-qif-import.c,
+	  src/import-export/qif-import/gnc-qif-import.c,
 	  src/import-export/qif-io-core/gncmod-qifiocore.c,
 	  src/import-export/qif-io-core/test/Makefile.am,
 	  src/import-export/test/Makefile.am,
diff --git a/ChangeLog.2010 b/ChangeLog.2010
index 99e019743..595849849 100644
--- a/ChangeLog.2010
+++ b/ChangeLog.2010
@@ -7581,7 +7581,7 @@
 	  src/import-export/qif-import/gnc-druid-test.h,
 	  src/import-export/qif-import/gnc-plugin-qif-import.c,
 	  src/import-export/qif-import/gnc-plugin-qif-import.h,
-	  src/import-export/qif-import/gncmod-qif-import.c,
+	  src/import-export/qif-import/gnc-qif-import.c,
 	  src/import-export/qif-import/test/test-link.c,
 	  src/import-export/qif-io-core/gncmod-qifiocore.c,
 	  src/import-export/qif/qif-context.c,
@@ -10432,7 +10432,7 @@
 	  src/import-export/qif-import/gnc-druid-test.c,
 	  src/import-export/qif-import/gnc-plugin-qif-import.c,
 	  src/import-export/qif-import/gnc-plugin-qif-import.h,
-	  src/import-export/qif-import/gncmod-qif-import.c,
+	  src/import-export/qif-import/gnc-qif-import.c,
 	  src/import-export/qif-import/test/test-link.c,
 	  src/import-export/qif-io-core/gncmod-qifiocore.c,
 	  src/import-export/qif/qif-context.c,
diff --git a/ChangeLog.2011 b/ChangeLog.2011
index 13d7c587c..003fcae56 100644
--- a/ChangeLog.2011
+++ b/ChangeLog.2011
@@ -914,7 +914,7 @@
 	  src/import-export/qif-import/druid-qif-import.c,
 	  src/import-export/qif-import/druid-qif-import.h,
 	  src/import-export/qif-import/gnc-plugin-qif-import.c,
-	  src/import-export/qif-import/gncmod-qif-import.c,
+	  src/import-export/qif-import/gnc-qif-import.c,
 	  src/import-export/qif-import/qif.glade: Bug #664877 - Migrate
 	  Qif Import Druid to an Assistant Patch by Robert Fewell
 
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 4defc668c..827a6e2e7 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -53,6 +53,7 @@ endif()
 target_link_libraries (gnucash
    gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
+   gnc-qif-import
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index ce0e780f1..27eee0c4c 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -51,6 +51,7 @@
 #include "gnc-splash.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-plugin-file-history.h"
+#include "gnc-plugin-qif-import.h"
 #include "gnc-plugin-report-system.h"
 #include "dialog-new-user.h"
 #include "gnc-session.h"
@@ -478,6 +479,12 @@ gnc_parse_command_line(int *argc, char ***argv)
         file_to_load = args_remaining[0];
 }
 
+static void
+load_gnucash_plugins()
+{
+    gnc_plugin_qif_import_create_plugin ();
+}
+
 static void
 load_gnucash_modules()
 {
@@ -489,7 +496,6 @@ load_gnucash_modules()
         gboolean optional;
     } modules[] =
     {
-        { "gnucash/import-export/qif-import", 0, FALSE },
         { "gnucash/import-export/ofx", 0, TRUE },
         { "gnucash/import-export/csv-import", 0, TRUE },
         { "gnucash/import-export/csv-export", 0, TRUE },
@@ -613,6 +619,7 @@ inner_main (void *closure, int argc, char **argv)
     gnc_hook_add_dangler(HOOK_UI_SHUTDOWN, (GFunc)gnc_search_core_finalize, NULL, NULL);
     gnucash_register_add_cell_types ();
 
+    load_gnucash_plugins();
     load_gnucash_modules();
 
     /* Load the config before starting up the gui. This insures that
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index d70a6294d..86b35899a 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -6,7 +6,6 @@ set (qif_import_SOURCES
     dialog-account-picker.c
     assistant-qif-import.c
     gnc-plugin-qif-import.c
-    gncmod-qif-import.c
 )
 
 # Add dependency on config.h
@@ -18,21 +17,26 @@ set (qif_import_noinst_HEADERS
     gnc-plugin-qif-import.h
 )
 
-add_library	(gncmod-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS})
+add_library	(gnc-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS})
 
-target_link_libraries(gncmod-qif-import
+target_link_libraries(gnc-qif-import
     gnc-app-utils
     gnc-gnome-utils
     gnc-gnome
     gnucash-guile)
 
-target_compile_definitions(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
+target_include_directories(gnc-qif-import
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_compile_definitions(gnc-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
 
 if (APPLE)
-  set_target_properties (gncmod-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-qif-import
+install(TARGETS gnc-qif-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -62,7 +66,7 @@ set(qif_import_SCHEME_2
 )
 
 set(GUILE_DEPENDS
-  gncmod-qif-import
+  gnc-qif-import
   gnc-gnome
   scm-core-utils
   scm-gnc-module
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
index 756cf7c37..4b73538ce 100644
--- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
+++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "dialog-new-user.h"
 #include "dialog-preferences.h"
 #include "assistant-qif-import.h"
 #include "gnc-plugin-manager.h"
@@ -128,6 +129,11 @@ gnc_plugin_qif_import_create_plugin (void)
     GncPlugin *plugin = gnc_plugin_qif_import_new ();
     gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (), plugin);
 
+    gnc_new_user_dialog_register_qif_assistant
+        ((void (*)())gnc_file_qif_import);
+
+    scm_c_use_module("gnucash qif-import");
+
     /* Add to preferences under Online Banking */
     /* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
     gnc_preferences_add_to_page ("dialog-account-picker.glade", "prefs_table",
diff --git a/gnucash/import-export/qif-imp/gncmod-qif-import.c b/gnucash/import-export/qif-imp/gncmod-qif-import.c
deleted file mode 100644
index ab4e18780..000000000
--- a/gnucash/import-export/qif-imp/gncmod-qif-import.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*********************************************************************
- * gncmod-qif-import.c
- * module definition/initialization for old QIF importer (deprecated)
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <config.h>
-#include <gmodule.h>
-#include <libguile.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-#include "assistant-qif-import.h"
-#include "dialog-new-user.h"
-
-#include "gnc-plugin-qif-import.h"
-
-GNC_MODULE_API_DECL(libgncmod_qif_import)
-
-/* version of the gnc module system interface we require */
-int libgncmod_qif_import_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_qif_import_gnc_module_current  = 0;
-int libgncmod_qif_import_gnc_module_revision = 0;
-int libgncmod_qif_import_gnc_module_age      = 0;
-
-
-char *
-libgncmod_qif_import_gnc_module_path(void)
-{
-    return g_strdup("gnucash/import-export/qif-import");
-}
-
-char *
-libgncmod_qif_import_gnc_module_description(void)
-{
-    return g_strdup("Gnome GUI and Scheme code for QIF importer");
-}
-
-int
-libgncmod_qif_import_gnc_module_init(int refcount)
-{
-    /* If the recount == 0 then register the qif-import-assistant for the new-user
-     * dialog.
-     */
-    if (refcount == 0)
-    {
-        gnc_new_user_dialog_register_qif_assistant
-        ((void (*)())gnc_file_qif_import);
-    }
-
-    scm_c_use_module("gnucash qif-import");
-
-    gnc_plugin_qif_import_create_plugin();
-
-    return TRUE;
-}
-
-int
-libgncmod_qif_import_gnc_module_end(int refcount)
-{
-    return TRUE;
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6268cd9a6..b6b1934c3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -340,7 +340,6 @@ gnucash/import-export/ofx/gnc-plugin-ofx.c
 gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
 gnucash/import-export/qif-imp/assistant-qif-import.c
 gnucash/import-export/qif-imp/dialog-account-picker.c
-gnucash/import-export/qif-imp/gncmod-qif-import.c
 gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
 gnucash/import-export/qif-imp/qif-dialog-utils.scm
 gnucash/import-export/qif-imp/qif-file.scm

commit 01a00afe239240909253223a83dfce88e60dc00c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 17:06:12 2020 +0200

    Convert gncmod-register-gnome into an ordinary library
    
    Setting up its cell types is now initiated from gnucash-bin.c/inner_main.

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 873c79aa1..6c57f5f91 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -140,7 +140,7 @@ target_link_libraries(gnc-gnome
     gnc-gnome-search
     gnc-ledger-core
     gncmod-report
-    gncmod-register-gnome
+    gnc-register-gnome
     gnc-register-core
     gnc-gnome-utils
     gnc-engine
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 34cab744c..ce0e780f1 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -55,6 +55,7 @@
 #include "dialog-new-user.h"
 #include "gnc-session.h"
 #include "gnc-engine-guile.h"
+#include "gnucash-register.h"
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 #include "search-core-type.h"
@@ -488,7 +489,6 @@ load_gnucash_modules()
         gboolean optional;
     } modules[] =
     {
-        { "gnucash/register/register-gnome", 0, FALSE },
         { "gnucash/import-export/qif-import", 0, FALSE },
         { "gnucash/import-export/ofx", 0, TRUE },
         { "gnucash/import-export/csv-import", 0, TRUE },
@@ -611,6 +611,7 @@ inner_main (void *closure, int argc, char **argv)
     gnc_gnome_utils_init();
     gnc_search_core_initialize ();
     gnc_hook_add_dangler(HOOK_UI_SHUTDOWN, (GFunc)gnc_search_core_finalize, NULL, NULL);
+    gnucash_register_add_cell_types ();
 
     load_gnucash_modules();
 
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index c18ddd98b..fa867e75e 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -56,7 +56,7 @@ if(WITH_AQBANKING)
 
   target_link_libraries(gncmod-aqbanking gnc-gnome gnc-gnome-utils
          gnc-generic-import gnc-register-core
-         gncmod-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
+         gnc-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
          ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
          ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}
          ${GNOME_LDFLAGS} ${AQB_LIBSTDCXX})
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 8ebb8a052..0da151bae 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -18,7 +18,7 @@ set(csv_export_noinst_HEADERS
 
 add_library(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
-target_link_libraries(gncmod-csv-export gncmod-register-gnome gnc-register-core gnc-ledger-core gnc-engine
+target_link_libraries(gncmod-csv-export gnc-register-gnome gnc-register-core gnc-ledger-core gnc-engine
                          gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
 
 target_compile_definitions(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt
index 71c2fb951..c66ad1a86 100644
--- a/gnucash/register/ledger-core/CMakeLists.txt
+++ b/gnucash/register/ledger-core/CMakeLists.txt
@@ -43,7 +43,7 @@ set_source_files_properties (${ledger_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${
 
 add_library (gnc-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
 
-target_link_libraries(gnc-ledger-core gncmod-register-gnome gnc-register-core gnc-gnome-utils
+target_link_libraries(gnc-ledger-core gnc-register-gnome gnc-register-core gnc-gnome-utils
         gnc-engine gnc-core-utils PkgConfig::GTK3)
 
 target_compile_definitions (gnc-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt
index 6181d2c1f..80014e019 100644
--- a/gnucash/register/register-gnome/CMakeLists.txt
+++ b/gnucash/register/register-gnome/CMakeLists.txt
@@ -2,7 +2,6 @@ add_subdirectory(test)
 include(CheckSymbolExists)
 
 set (register_gnome_SOURCES
-  gncmod-register-gnome.c
   combocell-gnome.c
   datecell-gnome.c
   formulacell-gnome.c
@@ -43,22 +42,22 @@ set (register_gnome_noinst_HEADERS
 # Add dependency on config.h
 set_source_files_properties (${register_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-add_library (gncmod-register-gnome ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS})
+add_library (gnc-register-gnome ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS})
 
-target_link_libraries(gncmod-register-gnome gnc-register-core PkgConfig::GTK3)
+target_link_libraries(gnc-register-gnome gnc-register-core PkgConfig::GTK3)
 
-target_compile_definitions(gncmod-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.register.gnome\")
+target_compile_definitions(gnc-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.register.gnome\")
 
-target_include_directories(gncmod-register-gnome
+target_include_directories(gnc-register-gnome
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
     PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core
 )
 
 if (APPLE)
-  set_target_properties (gncmod-register-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-register-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-register-gnome
+install(TARGETS gnc-register-gnome
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/register/register-gnome/gncmod-register-gnome.c b/gnucash/register/register-gnome/gncmod-register-gnome.c
deleted file mode 100644
index 9047dbf8f..000000000
--- a/gnucash/register/register-gnome/gncmod-register-gnome.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*********************************************************************
- * gncmod-register-gnome.c
- * module definition/initialization for Gnome parts of register
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <config.h>
-
-#include <gmodule.h>
-
-#include "combocell.h"
-#include "datecell.h"
-#include "gnc-module-api.h"
-#include "gnc-module.h"
-#include "formulacell-gnome.h"
-#include "pricecell-gnome.h"
-#include "quickfillcell-gnome.h"
-#include "register-common.h"
-#include "table-gnome.h"
-
-GNC_MODULE_API_DECL(libgncmod_register_gnome)
-
-/* version of the gnc module system interface we require */
-int libgncmod_register_gnome_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_register_gnome_gnc_module_current  = 0;
-int libgncmod_register_gnome_gnc_module_revision = 0;
-int libgncmod_register_gnome_gnc_module_age      = 0;
-
-
-char *
-libgncmod_register_gnome_gnc_module_path(void)
-{
-    return g_strdup("gnucash/register/register-gnome");
-}
-
-char *
-libgncmod_register_gnome_gnc_module_description(void)
-{
-    return g_strdup("Gnome GUI for ledger-like table displays");
-}
-
-int
-libgncmod_register_gnome_gnc_module_init(int refcount)
-{
-    if (refcount == 0)
-    {
-        gnc_register_add_cell_type (COMBO_CELL_TYPE_NAME, gnc_combo_cell_new);
-
-        gnc_register_add_cell_type (DATE_CELL_TYPE_NAME, gnc_date_cell_new);
-
-        gnc_register_add_cell_type (PRICE_CELL_TYPE_NAME,
-                                    gnc_price_cell_gnome_new);
-
-        gnc_register_add_cell_type (QUICKFILL_CELL_TYPE_NAME,
-                                    gnc_quickfill_cell_gnome_new);
-
-        gnc_register_add_cell_type( FORMULA_CELL_TYPE_NAME,
-                                    gnc_formula_cell_gnome_new );
-
-        gnc_table_gnome_init ();
-    }
-
-    return TRUE;
-}
diff --git a/gnucash/register/register-gnome/gnucash-register.c b/gnucash/register/register-gnome/gnucash-register.c
index 98a57de8e..d072acc56 100644
--- a/gnucash/register/register-gnome/gnucash-register.c
+++ b/gnucash/register/register-gnome/gnucash-register.c
@@ -46,6 +46,13 @@
 #include "gnc-prefs.h"
 #include "gnc-state.h"
 
+#include "combocell.h"
+#include "datecell.h"
+#include "formulacell-gnome.h"
+#include "pricecell-gnome.h"
+#include "quickfillcell-gnome.h"
+#include "table-gnome.h"
+
 
 /* Register signals */
 enum
@@ -88,6 +95,20 @@ struct _GnucashRegisterClass
 
 /** Implementation *****************************************************/
 
+void
+gnucash_register_add_cell_types (void)
+{
+    gnc_register_add_cell_type (COMBO_CELL_TYPE_NAME, gnc_combo_cell_new);
+    gnc_register_add_cell_type (DATE_CELL_TYPE_NAME, gnc_date_cell_new);
+    gnc_register_add_cell_type (PRICE_CELL_TYPE_NAME,
+                                gnc_price_cell_gnome_new);
+    gnc_register_add_cell_type (QUICKFILL_CELL_TYPE_NAME,
+                                gnc_quickfill_cell_gnome_new);
+    gnc_register_add_cell_type( FORMULA_CELL_TYPE_NAME,
+                                gnc_formula_cell_gnome_new );
+    gnc_table_gnome_init ();
+}
+
 gboolean
 gnucash_register_has_selection (GnucashRegister *reg)
 {
diff --git a/gnucash/register/register-gnome/gnucash-register.h b/gnucash/register/register-gnome/gnucash-register.h
index fc3ceb74c..8fb4f7c1f 100644
--- a/gnucash/register/register-gnome/gnucash-register.h
+++ b/gnucash/register/register-gnome/gnucash-register.h
@@ -47,6 +47,12 @@ typedef struct _GnucashRegisterClass GnucashRegisterClass;
 
 GType gnucash_register_get_type (void);
 
+/** Add cell types defined by gnucash_register to gnc_register
+ *
+ *  Should be called before any table layout is created using
+ *  these new types */
+void gnucash_register_add_cell_types (void);
+
 /** this already has scrollbars attached */
 GtkWidget *gnucash_register_new (Table *table, gchar *state_section);
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 90fbf6538..6268cd9a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -388,7 +388,6 @@ gnucash/register/register-core/table-model.c
 gnucash/register/register-gnome/combocell-gnome.c
 gnucash/register/register-gnome/datecell-gnome.c
 gnucash/register/register-gnome/formulacell-gnome.c
-gnucash/register/register-gnome/gncmod-register-gnome.c
 gnucash/register/register-gnome/gnucash-color.c
 gnucash/register/register-gnome/gnucash-cursor.c
 gnucash/register/register-gnome/gnucash-date-picker.c

commit 8a764f23e2f07d8597badc404f05878c8e96db2e
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 15:30:57 2020 +0200

    Convert gncmod-gnome-search into an ordinary library
    
    Search initialization happens now in gnucash-bin.c/inner_main. That will also add
    a hook to finalize the search library at shutdown.

diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index b50862436..55c9ab324 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 set (gnome_search_SOURCES
-  gncmod-gnome-search.c
   gnc-general-search.c
   dialog-search.c
   search-account.c
@@ -40,23 +39,23 @@ set_local_dist(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${
         ${gnome_search_noinst_HEADERS})
 set(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
 
-add_library (gncmod-gnome-search
+add_library (gnc-gnome-search
     ${gnome_search_SOURCES}
     ${gnome_search_HEADERS}
     ${gnome_search_noinst_HEADERS}
 )
 
-target_link_libraries(gncmod-gnome-search gnc-gnome-utils PkgConfig::GTK3)
+target_link_libraries(gnc-gnome-search gnc-gnome-utils PkgConfig::GTK3)
 
-target_compile_definitions(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")
+target_compile_definitions(gnc-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")
 
-target_include_directories(gncmod-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(gnc-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (APPLE)
-  set_target_properties (gncmod-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-gnome-search
+install(TARGETS gnc-gnome-search
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/gnome-search/gncmod-gnome-search.c b/gnucash/gnome-search/gncmod-gnome-search.c
deleted file mode 100644
index 96154ec16..000000000
--- a/gnucash/gnome-search/gncmod-gnome-search.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*********************************************************************
- * gncmod-gnome-search
- * GNC Module initialization for the Gnome Search UI
- *
- * Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation           Voice:  +1-617-542-5942
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
- * Boston, MA  02110-1301,  USA       gnu at gnu.org
- *********************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "search-core-type.h"
-
-GNC_MODULE_API_DECL(libgncmod_gnome_search)
-
-/* version of the gnc module system interface we require */
-int libgncmod_gnome_search_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_gnome_search_gnc_module_current  = 0;
-int libgncmod_gnome_search_gnc_module_revision = 0;
-int libgncmod_gnome_search_gnc_module_age      = 0;
-
-
-char *
-libgncmod_gnome_search_gnc_module_path(void)
-{
-    return g_strdup("gnucash/gnome-search");
-}
-
-char *
-libgncmod_gnome_search_gnc_module_description(void)
-{
-    return g_strdup("The GnuCash Gnome Search UI");
-}
-
-int
-libgncmod_gnome_search_gnc_module_init(int refcount)
-{
-    if (refcount == 0)
-    {
-        /* initialize known types */
-        gnc_search_core_initialize ();
-    }
-
-    return TRUE;
-}
-
-int
-libgncmod_gnome_search_gnc_module_end(int refcount)
-{
-    /* XXX Unload the other modules */
-
-    if (refcount == 0)
-    {
-        /* Shutdown */
-        gnc_search_core_finalize ();
-    }
-
-    return TRUE;
-}
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 9d5ec5a93..873c79aa1 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -137,7 +137,7 @@ set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
 
 add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
 target_link_libraries(gnc-gnome
-    gncmod-gnome-search
+    gnc-gnome-search
     gnc-ledger-core
     gncmod-report
     gncmod-register-gnome
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 10fd60626..34cab744c 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -57,6 +57,7 @@
 #include "gnc-engine-guile.h"
 #include "swig-runtime.h"
 #include "guile-mappings.h"
+#include "search-core-type.h"
 #include "window-report.h"
 #ifdef __MINGW32__
 #include <Windows.h>
@@ -487,7 +488,6 @@ load_gnucash_modules()
         gboolean optional;
     } modules[] =
     {
-        { "gnucash/gnome-search", 0, FALSE },
         { "gnucash/register/register-gnome", 0, FALSE },
         { "gnucash/import-export/qif-import", 0, FALSE },
         { "gnucash/import-export/ofx", 0, TRUE },
@@ -609,6 +609,8 @@ inner_main (void *closure, int argc, char **argv)
     gnc_gsettings_version_upgrade ();
 
     gnc_gnome_utils_init();
+    gnc_search_core_initialize ();
+    gnc_hook_add_dangler(HOOK_UI_SHUTDOWN, (GFunc)gnc_search_core_finalize, NULL, NULL);
 
     load_gnucash_modules();
 
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 2eddca9f7..18aa9591d 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(gncmod-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
 
 target_link_libraries(gncmod-bi-import
   gnc-gnome-utils
-  gncmod-gnome-search
+  gnc-gnome-search
   gnc-app-utils
   gnc-engine
   gnc-core-utils
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49aedcdb2..90fbf6538 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,7 +92,6 @@ gnucash/gnome/window-reconcile.c
 gnucash/gnome/window-report.c
 gnucash/gnome-search/dialog-search.c
 gnucash/gnome-search/gnc-general-search.c
-gnucash/gnome-search/gncmod-gnome-search.c
 gnucash/gnome-search/search-account.c
 gnucash/gnome-search/search-boolean.c
 gnucash/gnome-search/search-core-type.c

commit debb5468f4a2c59fca19360b2e3fff644ccae439
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 14:51:35 2020 +0200

    Convert gncmod-gnome-utils into an ordinary library
    
    The gnc module did some inititalization stuff which is moved to a new
    function gnc_gnome_utils_init that should be called once.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index efb53961a..4defc668c 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -47,11 +47,11 @@ target_compile_definitions(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
 
 if (BUILDING_FROM_VCS)
   target_compile_definitions(gnucash PRIVATE -DGNC_VCS=\"git\")
-  target_compile_definitions(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
+  target_compile_definitions(gnc-gnome-utils PRIVATE -DGNC_VCS=\"git\")
 endif()
 
 target_link_libraries (gnucash
-   gnc-ledger-core gnc-gnome gncmod-gnome-utils gnc-app-utils
+   gnc-ledger-core gnc-gnome gnc-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index f45c0a046..b50862436 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -46,7 +46,7 @@ add_library (gncmod-gnome-search
     ${gnome_search_noinst_HEADERS}
 )
 
-target_link_libraries(gncmod-gnome-search gncmod-gnome-utils PkgConfig::GTK3)
+target_link_libraries(gncmod-gnome-search gnc-gnome-utils PkgConfig::GTK3)
 
 target_compile_definitions(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")
 
diff --git a/gnucash/gnome-search/gncmod-gnome-search.c b/gnucash/gnome-search/gncmod-gnome-search.c
index ad5829fc7..96154ec16 100644
--- a/gnucash/gnome-search/gncmod-gnome-search.c
+++ b/gnucash/gnome-search/gncmod-gnome-search.c
@@ -60,11 +60,6 @@ libgncmod_gnome_search_gnc_module_description(void)
 int
 libgncmod_gnome_search_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     if (refcount == 0)
     {
         /* initialize known types */
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 133665686..8db0ce7d9 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -102,7 +102,6 @@ set (gnome_utils_SOURCES
   gnc-tree-view-sx-list.c
   gnc-tree-view.c
   gnc-window.c
-  gncmod-gnome-utils.c
   misc-gnome-utils.c
   tree-view-utils.c
   search-param.c
@@ -198,7 +197,7 @@ set (gnome_utils_HEADERS
 
 
 
-add_library (gncmod-gnome-utils
+add_library (gnc-gnome-utils
   ${gnome_utils_SOURCES}
   ${gnome_utils_HEADERS}
   ${GNC_WARNINGS_C} ${GNC_WARNINGS_H}
@@ -206,7 +205,7 @@ add_library (gncmod-gnome-utils
   ${gnome_utils_noinst_HEADERS}
 )
 
-target_link_libraries(gncmod-gnome-utils
+target_link_libraries(gnc-gnome-utils
     gnc-app-utils
     gnc-engine
     gnc-backend-xml-utils
@@ -216,20 +215,20 @@ target_link_libraries(gncmod-gnome-utils
     ${LIBSECRET_LDFLAGS}
     ${GTK_MAC_LDFLAGS})
 
-target_compile_options(gncmod-gnome-utils PRIVATE -Wno-deprecated-declarations)
-target_compile_definitions(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
+target_compile_options(gnc-gnome-utils PRIVATE -Wno-deprecated-declarations)
+target_compile_definitions(gnc-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
   PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\")
 
 if (BUILDING_FROM_VCS)
-  target_compile_definitions(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
+  target_compile_definitions(gnc-gnome-utils PRIVATE -DGNC_VCS=\"git\")
 endif()
 
 if (MAC_INTEGRATION)
-  target_compile_options(gncmod-gnome-utils PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
-  target_link_libraries(gncmod-gnome-utils ${OSX_EXTRA_LIBRARIES})
+  target_compile_options(gnc-gnome-utils PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+  target_link_libraries(gnc-gnome-utils ${OSX_EXTRA_LIBRARIES})
 endif()
 
-target_include_directories(gncmod-gnome-utils
+target_include_directories(gnc-gnome-utils
     PUBLIC
       ${CMAKE_CURRENT_SOURCE_DIR}
     PRIVATE
@@ -240,10 +239,10 @@ target_include_directories(gncmod-gnome-utils
 
 
 if (APPLE)
-  set_target_properties (gncmod-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-gnome-utils
+install(TARGETS gnc-gnome-utils
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -253,7 +252,7 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
 
 # Scheme
 
-set(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-engine scm-app-utils)
+set(GUILE_DEPENDS      gnc-gnome-utils scm-gnc-module scm-engine scm-app-utils)
 
 gnc_add_scheme_targets(scm-gnome-utils-1
     SOURCES gnome-utils.scm
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c
index ef389cf66..494f159f1 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.c
+++ b/gnucash/gnome-utils/gnc-gnome-utils.c
@@ -29,7 +29,6 @@
 #include "gnc-prefs-utils.h"
 #include "gnc-prefs.h"
 #include "gnc-gnome-utils.h"
-//#include "gnc-html.h"
 #include "gnc-engine.h"
 #include "gnc-path.h"
 #include "gnc-ui.h"
@@ -56,6 +55,8 @@
 #import <Cocoa/Cocoa.h>
 #endif
 
+extern SCM scm_init_sw_gnome_utils_module(void);
+
 static QofLogModule log_module = GNC_MOD_GUI;
 static int gnome_is_running = FALSE;
 static int gnome_is_terminating = FALSE;
@@ -66,6 +67,18 @@ static int gnome_is_initialized = FALSE;
 
 static void gnc_book_options_help_cb (GNCOptionWin *win, gpointer dat);
 
+void
+gnc_gnome_utils_init (void)
+{
+    gnc_component_manager_init ();
+    gnc_options_ui_initialize ();
+
+    scm_init_sw_gnome_utils_module();
+    scm_c_use_module ("sw_gnome_utils");
+    scm_c_use_module("gnucash gnome-utils");
+}
+
+
 static void
 gnc_global_options_help_cb (GNCOptionWin *win, gpointer dat)
 {
@@ -787,6 +800,7 @@ gnc_gui_shutdown (void)
         map = gnc_build_userdata_path(ACCEL_MAP_NAME);
         gtk_accel_map_save(map);
         g_free(map);
+        gnc_component_manager_shutdown ();
         gtk_main_quit();
     }
 }
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.h b/gnucash/gnome-utils/gnc-gnome-utils.h
index e4a1dd636..88febe238 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.h
+++ b/gnucash/gnome-utils/gnc-gnome-utils.h
@@ -38,6 +38,11 @@
 #include <gnc-main-window.h>
 #include "dialog-options.h"
 
+/** Initialize the gnome-utils library
+ *  Should be run once before using any gnome-utils features.
+ */
+void gnc_gnome_utils_init (void);
+
 /** Load a gtk resource configuration file to customize gtk
  *  appearance and behaviour.
  */
diff --git a/gnucash/gnome-utils/gncmod-gnome-utils.c b/gnucash/gnome-utils/gncmod-gnome-utils.c
deleted file mode 100644
index 79f316411..000000000
--- a/gnucash/gnome-utils/gncmod-gnome-utils.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*********************************************************************
- * gncmod-gnome-utils.c
- * module definition/initialization for the gnome utilities
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <config.h>
-#include <libguile.h>
-
-#include "gnc-module-api.h"
-
-#include "gnc-component-manager.h"
-#include "dialog-options.h"
-
-GNC_MODULE_API_DECL(libgncmod_gnome_utils)
-
-/* version of the gnc module system interface we require */
-int libgncmod_gnome_utils_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_gnome_utils_gnc_module_current  = 0;
-int libgncmod_gnome_utils_gnc_module_revision = 0;
-int libgncmod_gnome_utils_gnc_module_age      = 0;
-
-
-char *
-libgncmod_gnome_utils_gnc_module_path(void)
-{
-    return g_strdup("gnucash/gnome-utils");
-}
-
-char *
-libgncmod_gnome_utils_gnc_module_description(void)
-{
-    return g_strdup("Utilities for using Gnome/Gtk with GnuCash");
-}
-
-extern SCM scm_init_sw_gnome_utils_module(void);
-
-int
-libgncmod_gnome_utils_gnc_module_init(int refcount)
-{
-    scm_init_sw_gnome_utils_module();
-    scm_c_use_module ("sw_gnome_utils");
-    scm_c_use_module("gnucash gnome-utils");
-
-    /* Initialize the options-ui database */
-    if (refcount == 0)
-    {
-        gnc_component_manager_init ();
-        gnc_options_ui_initialize ();
-    }
-
-    return TRUE;
-}
-
-int
-libgncmod_gnome_utils_gnc_module_end(int refcount)
-{
-    if (refcount == 0)
-        gnc_component_manager_shutdown ();
-
-    return TRUE;
-}
diff --git a/gnucash/gnome-utils/gnome-utils.scm b/gnucash/gnome-utils/gnome-utils.scm
index 25b945a71..ced0dc1d5 100644
--- a/gnucash/gnome-utils/gnome-utils.scm
+++ b/gnucash/gnome-utils/gnome-utils.scm
@@ -24,7 +24,7 @@
 (use-modules (gnucash app-utils))
 
 (eval-when (compile load eval expand)
-  (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module"))
+  (load-extension "libgnc-gnome-utils" "scm_init_sw_gnome_utils_module"))
 (use-modules (sw_gnome_utils))
 
 ; Export the swig-wrapped symbols in the public interface of this module
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 76c9f3850..63c0bcded 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -6,10 +6,6 @@ set(GNOME_UTILS_TEST_INCLUDE_DIRS
 )
 set(GNOME_UTILS_TEST_LIBS gnc-module test-core)
 
-gnc_add_test_with_guile(test-link-module-gnome-utils test-link-module.c
-  GNOME_UTILS_TEST_INCLUDE_DIRS GNOME_UTILS_TEST_LIBS
-)
-
 
 set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
   ${GNOME_UTILS_TEST_INCLUDE_DIRS}
@@ -19,7 +15,7 @@ set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
 )
 set(GNOME_UTILS_GUI_TEST_LIBS
   ${GNOME_UTILS_TEST_LIBS}
-  gncmod-gnome-utils
+  gnc-gnome-utils
 )
 #This is a GUI test
 #gnc_add_test(test-gnc-recurrence test-gnc-recurrence.c
@@ -44,4 +40,4 @@ gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
 gnc_add_scheme_tests(test-load-gnome-utils-module.scm)
 
 
-set_dist_list(test_gnome_utils_DIST CMakeLists.txt test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm)
+set_dist_list(test_gnome_utils_DIST CMakeLists.txt test-gnc-recurrence.c test-load-gnome-utils-module.scm)
diff --git a/gnucash/gnome-utils/test/test-link-module.c b/gnucash/gnome-utils/test/test-link-module.c
deleted file mode 100644
index 16b7941ee..000000000
--- a/gnucash/gnome-utils/test/test-link-module.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include <stdlib.h>
-#include <libguile.h>
-#include <gnc-module.h>
-
-static void
-guile_main(void *closure, int argc, char ** argv)
-{
-    GNCModule mod;
-    gnc_module_system_init();
-    mod = gnc_module_load("gnucash/gnome-utils", 0);
-
-    exit(mod == NULL);
-}
-
-int
-main(int argc, char ** argv)
-{
-    g_setenv ("GNC_UNINSTALLED", "1", TRUE);
-    scm_boot_guile(argc, argv, guile_main, NULL);
-    return 0;
-}
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 6a9cb20a5..9d5ec5a93 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -142,7 +142,7 @@ target_link_libraries(gnc-gnome
     gncmod-report
     gncmod-register-gnome
     gnc-register-core
-    gncmod-gnome-utils
+    gnc-gnome-utils
     gnc-engine
     gnc-html
     gnc-locale-tax
@@ -242,7 +242,7 @@ set(gnome_SCHEME
 )
 
 set(GUILE_DEPENDS
-    gncmod-gnome-utils
+    gnc-gnome-utils
     scm-engine
     scm-core-utils
     scm-gnome-utils
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 6fd5d2a4d..10fd60626 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -487,7 +487,6 @@ load_gnucash_modules()
         gboolean optional;
     } modules[] =
     {
-        { "gnucash/gnome-utils", 0, FALSE },
         { "gnucash/gnome-search", 0, FALSE },
         { "gnucash/register/register-gnome", 0, FALSE },
         { "gnucash/import-export/qif-import", 0, FALSE },
@@ -609,6 +608,8 @@ inner_main (void *closure, int argc, char **argv)
     /* Check whether the settings need a version update */
     gnc_gsettings_version_upgrade ();
 
+    gnc_gnome_utils_init();
+
     load_gnucash_modules();
 
     /* Load the config before starting up the gui. This insures that
diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
index ff978ff6e..a743ef58d 100644
--- a/gnucash/html/CMakeLists.txt
+++ b/gnucash/html/CMakeLists.txt
@@ -51,7 +51,7 @@ add_library (gnc-html
   ${html_HEADERS}
 )
 
-target_link_libraries(gnc-html gnc-engine gnc-module gncmod-gnome-utils
+target_link_libraries(gnc-html gnc-engine gnc-module gnc-gnome-utils
   PkgConfig::GTK3 PkgConfig::WEBKIT ${GUILE_LDFLAGS})
 
 target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index 84b49c8c8..9882a0234 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -50,7 +50,7 @@ add_library (gnc-generic-import
   ${generic_import_noinst_HEADERS}
 )
 
-target_link_libraries(gnc-generic-import gncmod-gnome-utils gnc-engine PkgConfig::GTK3 ${GLIB2_LDFLAGS})
+target_link_libraries(gnc-generic-import gnc-gnome-utils gnc-engine PkgConfig::GTK3 ${GLIB2_LDFLAGS})
 
 target_compile_definitions (gnc-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
 
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 2c430eb9c..c18ddd98b 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -54,7 +54,7 @@ if(WITH_AQBANKING)
     set(AQB_LIBSTDCXX "-lstdc++")
   endif()
 
-  target_link_libraries(gncmod-aqbanking gnc-gnome gncmod-gnome-utils
+  target_link_libraries(gncmod-aqbanking gnc-gnome gnc-gnome-utils
          gnc-generic-import gnc-register-core
          gncmod-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
          ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
diff --git a/gnucash/import-export/aqb/gncmod-aqbanking.c b/gnucash/import-export/aqb/gncmod-aqbanking.c
index e149acfe2..420a67d43 100644
--- a/gnucash/import-export/aqb/gncmod-aqbanking.c
+++ b/gnucash/import-export/aqb/gncmod-aqbanking.c
@@ -61,12 +61,6 @@ libgncmod_aqbanking_gnc_module_description(void)
 gint
 libgncmod_aqbanking_gnc_module_init(gint refcount)
 {
-    /* Load modules we depend on */
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* Add menu items with C callbacks */
     gnc_plugin_aqbanking_create_plugin();
 
diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
index 68cdcde32..8fd3a7098 100644
--- a/gnucash/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -20,7 +20,7 @@ set(test_aqb_INCLUDE_DIRS
 )
 
 set(test_aqb_LIBS
-  gncmod-aqbanking gnc-generic-import gnc-gnome gncmod-gnome-utils
+  gncmod-aqbanking gnc-generic-import gnc-gnome gnc-gnome-utils
   gnc-ledger-core gnc-app-utils
   gncmod-backend-xml-utils gnc-engine gnc-core-utils gnc-module
   ${GLIB2_LDFLAGS}
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 90255fea2..2eddca9f7 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -19,7 +19,7 @@ set(bi_import_noinst_HEADERS
 add_library(gncmod-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
 
 target_link_libraries(gncmod-bi-import
-  gncmod-gnome-utils
+  gnc-gnome-utils
   gncmod-gnome-search
   gnc-app-utils
   gnc-engine
diff --git a/gnucash/import-export/bi-import/gncmod-bi-import.c b/gnucash/import-export/bi-import/gncmod-bi-import.c
index b7091f4d5..6806a84c4 100644
--- a/gnucash/import-export/bi-import/gncmod-bi-import.c
+++ b/gnucash/import-export/bi-import/gncmod-bi-import.c
@@ -65,11 +65,6 @@ libgncmod_bi_import_gnc_module_description (void)
 int
 libgncmod_bi_import_gnc_module_init (int refcount)
 {
-    if (!gnc_module_load ("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     if (refcount == 0)
     {
         /* this is the first time the module is loaded */
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index f3606845b..8ebb8a052 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -19,7 +19,7 @@ set(csv_export_noinst_HEADERS
 add_library(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
 target_link_libraries(gncmod-csv-export gncmod-register-gnome gnc-register-core gnc-ledger-core gnc-engine
-                         gnc-module gncmod-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
+                         gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
 
 target_compile_definitions(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
 
diff --git a/gnucash/import-export/csv-exp/gncmod-csv-export.c b/gnucash/import-export/csv-exp/gncmod-csv-export.c
index b868b15ce..37c89f813 100644
--- a/gnucash/import-export/csv-exp/gncmod-csv-export.c
+++ b/gnucash/import-export/csv-exp/gncmod-csv-export.c
@@ -59,11 +59,6 @@ libgncmod_csv_export_gnc_module_description(void)
 int
 libgncmod_csv_export_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* Add menu items with C callbacks */
     gnc_plugin_csv_export_create_plugin();
 
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 92f6ff894..05fb5ad2f 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(
   ${Boost_LIBRARIES}
   ${ICU4C_I18N_LDFLAGS}
   gnc-generic-import
-  gncmod-gnome-utils
+  gnc-gnome-utils
   gnc-app-utils
   gnc-engine
   gnc-core-utils
diff --git a/gnucash/import-export/csv-imp/gncmod-csv-import.c b/gnucash/import-export/csv-imp/gncmod-csv-import.c
index 14992f64c..34241db7f 100644
--- a/gnucash/import-export/csv-imp/gncmod-csv-import.c
+++ b/gnucash/import-export/csv-imp/gncmod-csv-import.c
@@ -59,11 +59,6 @@ libgncmod_csv_import_gnc_module_description(void)
 int
 libgncmod_csv_import_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* Add menu items with C callbacks */
     gnc_plugin_csv_import_create_plugin();
 
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index a33e61225..1fe9040ce 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -17,7 +17,7 @@ set(customer_import_noinst_HEADERS
 
 add_library(gncmod-customer-import ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
 
-target_link_libraries(gncmod-customer-import gnc-gnome gncmod-gnome-utils gnc-app-utils
+target_link_libraries(gncmod-customer-import gnc-gnome gnc-gnome-utils gnc-app-utils
      gnc-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS})
 
 target_include_directories(gncmod-customer-import
diff --git a/gnucash/import-export/customer-import/gncmod-customer-import.c b/gnucash/import-export/customer-import/gncmod-customer-import.c
index 93cb9e433..e28b01344 100644
--- a/gnucash/import-export/customer-import/gncmod-customer-import.c
+++ b/gnucash/import-export/customer-import/gncmod-customer-import.c
@@ -65,11 +65,6 @@ libgncmod_customer_import_gnc_module_description (void)
 int
 libgncmod_customer_import_gnc_module_init (int refcount)
 {
-    if (!gnc_module_load ("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     if (refcount == 0)
     {
         /* this is the first time the module is loaded */
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index 25573c142..008231a7b 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -15,7 +15,7 @@ set(log_replay_noinst_HEADERS
 
 add_library(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
 
-target_link_libraries(gncmod-log-replay gncmod-gnome-utils gnc-app-utils gnc-engine
+target_link_libraries(gncmod-log-replay gnc-gnome-utils gnc-app-utils gnc-engine
      gnc-core-utils gnc-module PkgConfig::GTK3)
 
 target_compile_definitions(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
diff --git a/gnucash/import-export/log-replay/gncmod-log-replay.c b/gnucash/import-export/log-replay/gncmod-log-replay.c
index ef5871c0f..58730b5ff 100644
--- a/gnucash/import-export/log-replay/gncmod-log-replay.c
+++ b/gnucash/import-export/log-replay/gncmod-log-replay.c
@@ -61,11 +61,6 @@ libgncmod_log_replay_gnc_module_description(void)
 int
 libgncmod_log_replay_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* Add menu items with C callbacks */
     gnc_plugin_log_replay_create_plugin();
 
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 07f8b9ab0..27de14df9 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -21,7 +21,7 @@ if (WITH_OFX)
   add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
 
   target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils
-                    gncmod-gnome-utils ${LIBOFX_LDFLAGS})
+                    gnc-gnome-utils ${LIBOFX_LDFLAGS})
 
   target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
 
diff --git a/gnucash/import-export/ofx/gncmod-ofx-import.c b/gnucash/import-export/ofx/gncmod-ofx-import.c
index be0dd78fb..c47a0f603 100644
--- a/gnucash/import-export/ofx/gncmod-ofx-import.c
+++ b/gnucash/import-export/ofx/gncmod-ofx-import.c
@@ -61,11 +61,6 @@ libgncmod_ofx_gnc_module_description(void)
 int
 libgncmod_ofx_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* Add menu items with C callbacks */
     gnc_plugin_ofx_create_plugin();
 
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 99723b24f..d70a6294d 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library	(gncmod-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS
 
 target_link_libraries(gncmod-qif-import
     gnc-app-utils
-    gncmod-gnome-utils
+    gnc-gnome-utils
     gnc-gnome
     gnucash-guile)
 
diff --git a/gnucash/import-export/qif-imp/gncmod-qif-import.c b/gnucash/import-export/qif-imp/gncmod-qif-import.c
index 0d51884a8..ab4e18780 100644
--- a/gnucash/import-export/qif-imp/gncmod-qif-import.c
+++ b/gnucash/import-export/qif-imp/gncmod-qif-import.c
@@ -62,11 +62,6 @@ libgncmod_qif_import_gnc_module_description(void)
 int
 libgncmod_qif_import_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     /* If the recount == 0 then register the qif-import-assistant for the new-user
      * dialog.
      */
diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
index edbab9f3d..09d6c61d1 100644
--- a/gnucash/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -2,7 +2,6 @@
 
 set(GENERIC_IMPORT_TEST_INCLUDE_DIRS
   ${CMAKE_BINARY_DIR}/common # for config.h
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${CMAKE_SOURCE_DIR}/gnucash/import-export
   ${CMAKE_SOURCE_DIR}/common/test-core
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
diff --git a/gnucash/import-export/test/test-import-parse.c b/gnucash/import-export/test/test-import-parse.c
index 89118c63c..68a6585af 100644
--- a/gnucash/import-export/test/test-import-parse.c
+++ b/gnucash/import-export/test/test-import-parse.c
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <libguile.h>
 
-#include "gnc-module.h"
 #include "import-parse.h"
 
 #include "test-stuff.h"
@@ -176,8 +175,6 @@ test_import_parse(void)
 static void
 main_helper(void *closure, int argc, char **argv)
 {
-    gnc_module_system_init ();
-    gnc_module_load("gnucash/gnome-utils", 0);
     test_import_parse();
     print_test_results();
     exit(get_rv());
diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt
index 5a89938ff..71c2fb951 100644
--- a/gnucash/register/ledger-core/CMakeLists.txt
+++ b/gnucash/register/ledger-core/CMakeLists.txt
@@ -43,7 +43,7 @@ set_source_files_properties (${ledger_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${
 
 add_library (gnc-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
 
-target_link_libraries(gnc-ledger-core gncmod-register-gnome gnc-register-core gncmod-gnome-utils
+target_link_libraries(gnc-ledger-core gncmod-register-gnome gnc-register-core gnc-gnome-utils
         gnc-engine gnc-core-utils PkgConfig::GTK3)
 
 target_compile_definitions (gnc-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt
index dc5ae2932..64527e9a4 100644
--- a/gnucash/register/register-core/CMakeLists.txt
+++ b/gnucash/register/register-core/CMakeLists.txt
@@ -44,7 +44,7 @@ set_source_files_properties (${register_core_SOURCES} PROPERTIES OBJECT_DEPENDS
 
 add_library (gnc-register-core ${register_core_SOURCES} ${register_core_HEADERS})
 
-target_link_libraries(gnc-register-core gncmod-gnome-utils gnc-app-utils ${GMODULE_LDFLAGS})
+target_link_libraries(gnc-register-core gnc-gnome-utils gnc-app-utils ${GMODULE_LDFLAGS})
 
 target_compile_definitions (gnc-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.core\")
 
diff --git a/gnucash/register/register-gnome/gncmod-register-gnome.c b/gnucash/register/register-gnome/gncmod-register-gnome.c
index 3f126f16f..9047dbf8f 100644
--- a/gnucash/register/register-gnome/gncmod-register-gnome.c
+++ b/gnucash/register/register-gnome/gncmod-register-gnome.c
@@ -65,11 +65,6 @@ libgncmod_register_gnome_gnc_module_description(void)
 int
 libgncmod_register_gnome_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
     if (refcount == 0)
     {
         gnc_register_add_cell_type (COMBO_CELL_TYPE_NAME, gnc_combo_cell_new);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 118e6c755..49aedcdb2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -151,7 +151,6 @@ gnucash/gnome-utils/gnc-keyring.c
 gnucash/gnome-utils/gnc-main-window.c
 gnucash/gnome-utils/gnc-menu-extensions.c
 gnucash/gnome-utils/gnc-menu-extensions.scm
-gnucash/gnome-utils/gncmod-gnome-utils.c
 gnucash/gnome-utils/gnc-period-select.c
 gnucash/gnome-utils/gnc-plugin.c
 gnucash/gnome-utils/gnc-plugin-file-history.c

commit 58c6993cfb9e08ebfc7a24e3bafe5ae29d4e4425
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 24 10:11:15 2020 +0200

    Convert several gnc-modules to ordinary shared libraries
    
    None of these gnc-modules have any particular construction or destruction
    code except for loading the modules they depend on. These dependencies
    are all loaded anyway in other ways so for these libraries the gnc-module
    wrapper code brings no benefit.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 7482e8b9c..efb53961a 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -51,7 +51,7 @@ if (BUILDING_FROM_VCS)
 endif()
 
 target_link_libraries (gnucash
-   gncmod-ledger-core gnc-gnome gncmod-gnome-utils gnc-app-utils
+   gnc-ledger-core gnc-gnome gncmod-gnome-utils gnc-app-utils
    gnc-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
    PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 82347be81..6a9cb20a5 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -138,10 +138,10 @@ set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
 add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
 target_link_libraries(gnc-gnome
     gncmod-gnome-search
-    gncmod-ledger-core
+    gnc-ledger-core
     gncmod-report
     gncmod-register-gnome
-    gncmod-register-core
+    gnc-register-core
     gncmod-gnome-utils
     gnc-engine
     gnc-html
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index a9e131420..6fd5d2a4d 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -489,8 +489,6 @@ load_gnucash_modules()
     {
         { "gnucash/gnome-utils", 0, FALSE },
         { "gnucash/gnome-search", 0, FALSE },
-        { "gnucash/register/ledger-core", 0, FALSE },
-        { "gnucash/register/register-core", 0, FALSE },
         { "gnucash/register/register-gnome", 0, FALSE },
         { "gnucash/import-export/qif-import", 0, FALSE },
         { "gnucash/import-export/ofx", 0, TRUE },
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 726abc980..2c430eb9c 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -55,8 +55,8 @@ if(WITH_AQBANKING)
   endif()
 
   target_link_libraries(gncmod-aqbanking gnc-gnome gncmod-gnome-utils
-         gnc-generic-import gncmod-register-core
-         gncmod-register-gnome gncmod-ledger-core gnc-engine gwengui-gtk3
+         gnc-generic-import gnc-register-core
+         gncmod-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
          ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
          ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}
          ${GNOME_LDFLAGS} ${AQB_LIBSTDCXX})
diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
index 8dc2b2854..68cdcde32 100644
--- a/gnucash/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -21,7 +21,7 @@ set(test_aqb_INCLUDE_DIRS
 
 set(test_aqb_LIBS
   gncmod-aqbanking gnc-generic-import gnc-gnome gncmod-gnome-utils
-  gncmod-ledger-core gnc-app-utils
+  gnc-ledger-core gnc-app-utils
   gncmod-backend-xml-utils gnc-engine gnc-core-utils gnc-module
   ${GLIB2_LDFLAGS}
 )
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 44dd90a55..f3606845b 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -18,7 +18,7 @@ set(csv_export_noinst_HEADERS
 
 add_library(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
-target_link_libraries(gncmod-csv-export gncmod-register-gnome gncmod-register-core gncmod-ledger-core gnc-engine
+target_link_libraries(gncmod-csv-export gncmod-register-gnome gnc-register-core gnc-ledger-core gnc-engine
                          gnc-module gncmod-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils)
 
 target_compile_definitions(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt
index 057ec60c0..5a89938ff 100644
--- a/gnucash/register/ledger-core/CMakeLists.txt
+++ b/gnucash/register/ledger-core/CMakeLists.txt
@@ -4,7 +4,6 @@ add_subdirectory(test)
 set (ledger_core_SOURCES
   gnc-ledger-display.c
   gnc-ledger-display2.c
-  gncmod-ledger-core.c
   split-register.c
   split-register-control.c
   split-register-copy-ops.c
@@ -42,24 +41,24 @@ set (ledger_core_HEADERS
 # Add dependency on config.h
 set_source_files_properties (${ledger_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-add_library (gncmod-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
+add_library (gnc-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
 
-target_link_libraries(gncmod-ledger-core gncmod-register-gnome gncmod-register-core gncmod-gnome-utils
+target_link_libraries(gnc-ledger-core gncmod-register-gnome gnc-register-core gncmod-gnome-utils
         gnc-engine gnc-core-utils PkgConfig::GTK3)
 
-target_compile_definitions (gncmod-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
+target_compile_definitions (gnc-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
 
-target_include_directories(gncmod-ledger-core
+target_include_directories(gnc-ledger-core
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
 )
 
 if (APPLE)
-  set_target_properties (gncmod-ledger-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-ledger-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-ledger-core
+install(TARGETS gnc-ledger-core
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/register/ledger-core/gncmod-ledger-core.c b/gnucash/register/ledger-core/gncmod-ledger-core.c
deleted file mode 100644
index 64bb9e8e9..000000000
--- a/gnucash/register/ledger-core/gncmod-ledger-core.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*********************************************************************
- * gncmod-ledgercore.c
- * module definition/initialization for core (gui-independent) ledger
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_ledger_core)
-
-/* version of the gnc module system interface we require */
-int libgncmod_ledger_core_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_ledger_core_gnc_module_current  = 0;
-int libgncmod_ledger_core_gnc_module_revision = 0;
-int libgncmod_ledger_core_gnc_module_age      = 0;
-
-
-char *
-libgncmod_ledger_core_gnc_module_path(void)
-{
-    return g_strdup("gnucash/register/ledger-core");
-}
-
-char *
-libgncmod_ledger_core_gnc_module_description(void)
-{
-    return g_strdup("Toolkit-independent GUI for financial ledgers");
-}
-
-int
-libgncmod_ledger_core_gnc_module_init(int refcount)
-{
-    if (!gnc_module_load("gnucash/register/register-core", 0))
-    {
-        return FALSE;
-    }
-
-    return TRUE;
-}
diff --git a/gnucash/register/ledger-core/test/CMakeLists.txt b/gnucash/register/ledger-core/test/CMakeLists.txt
index 576974cb8..69a2eade7 100644
--- a/gnucash/register/ledger-core/test/CMakeLists.txt
+++ b/gnucash/register/ledger-core/test/CMakeLists.txt
@@ -21,7 +21,7 @@ set(SPLIT_REG_TEST_INCLUDE_DIRS
 
 set(SPLIT_REG_TEST_LIBS
     gnc-engine
-    gncmod-ledger-core
+    gnc-ledger-core
 )
 
 gnc_add_test(test-split-register-copy-ops
diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt
index 007de3849..dc5ae2932 100644
--- a/gnucash/register/register-core/CMakeLists.txt
+++ b/gnucash/register/register-core/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(test)
 
 set (register_core_SOURCES
-  gncmod-register-core.c
   basiccell.c
   cell-factory.c
   cellblock.c
@@ -43,19 +42,19 @@ set (register_core_HEADERS
 # Add dependency on config.h
 set_source_files_properties (${register_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-add_library (gncmod-register-core ${register_core_SOURCES} ${register_core_HEADERS})
+add_library (gnc-register-core ${register_core_SOURCES} ${register_core_HEADERS})
 
-target_link_libraries(gncmod-register-core gncmod-gnome-utils gnc-app-utils ${GMODULE_LDFLAGS})
+target_link_libraries(gnc-register-core gncmod-gnome-utils gnc-app-utils ${GMODULE_LDFLAGS})
 
-target_compile_definitions (gncmod-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.core\")
+target_compile_definitions (gnc-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.core\")
 
-target_include_directories(gncmod-register-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(gnc-register-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (APPLE)
-  set_target_properties (gncmod-register-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gnc-register-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-register-core
+install(TARGETS gnc-register-core
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/register/register-core/gncmod-register-core.c b/gnucash/register/register-core/gncmod-register-core.c
deleted file mode 100644
index 08f4fcd36..000000000
--- a/gnucash/register/register-core/gncmod-register-core.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*********************************************************************
- * gncmod-registercore.c
- * module definition/initialization for core (gui-independent) register
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-
-#include <config.h>
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_register_core)
-
-/* version of the gnc module system interface we require */
-int libgncmod_register_core_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_register_core_gnc_module_current  = 0;
-int libgncmod_register_core_gnc_module_revision = 0;
-int libgncmod_register_core_gnc_module_age      = 0;
-
-
-char *
-libgncmod_register_core_gnc_module_path(void)
-{
-    return g_strdup("gnucash/register/register-core");
-}
-
-char *
-libgncmod_register_core_gnc_module_description(void)
-{
-    return g_strdup("Toolkit-independent GUI for ledger-like table displays");
-}
-
-int
-libgncmod_register_core_gnc_module_init(int refcount)
-{
-    /* FIXME. We need this for the wide-character functions.
-     * When fixing, get rid of gnome-utils includes, too. */
-    if (!gnc_module_load("gnucash/gnome-utils", 0))
-    {
-        return FALSE;
-    }
-
-    return TRUE;
-}
diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt
index 887fc1481..6181d2c1f 100644
--- a/gnucash/register/register-gnome/CMakeLists.txt
+++ b/gnucash/register/register-gnome/CMakeLists.txt
@@ -45,7 +45,7 @@ set_source_files_properties (${register_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS
 
 add_library (gncmod-register-gnome ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS})
 
-target_link_libraries(gncmod-register-gnome gncmod-register-core PkgConfig::GTK3)
+target_link_libraries(gncmod-register-gnome gnc-register-core PkgConfig::GTK3)
 
 target_compile_definitions(gncmod-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.register.gnome\")
 
diff --git a/gnucash/register/register-gnome/gncmod-register-gnome.c b/gnucash/register/register-gnome/gncmod-register-gnome.c
index b40651ab5..3f126f16f 100644
--- a/gnucash/register/register-gnome/gncmod-register-gnome.c
+++ b/gnucash/register/register-gnome/gncmod-register-gnome.c
@@ -65,11 +65,6 @@ libgncmod_register_gnome_gnc_module_description(void)
 int
 libgncmod_register_gnome_gnc_module_init(int refcount)
 {
-    if (!gnc_module_load("gnucash/register/register-core", 0))
-    {
-        return FALSE;
-    }
-
     if (!gnc_module_load("gnucash/gnome-utils", 0))
     {
         return FALSE;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9680c4a69..118e6c755 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -364,7 +364,6 @@ gnucash/register/ledger-core/gncEntryLedgerLoad.c
 gnucash/register/ledger-core/gncEntryLedgerModel.c
 gnucash/register/ledger-core/gnc-ledger-display2.c
 gnucash/register/ledger-core/gnc-ledger-display.c
-gnucash/register/ledger-core/gncmod-ledger-core.c
 gnucash/register/ledger-core/split-register.c
 gnucash/register/ledger-core/split-register-control.c
 gnucash/register/ledger-core/split-register-copy-ops.c
@@ -378,7 +377,6 @@ gnucash/register/register-core/cellblock.c
 gnucash/register/register-core/cell-factory.c
 gnucash/register/register-core/checkboxcell.c
 gnucash/register/register-core/formulacell.c
-gnucash/register/register-core/gncmod-register-core.c
 gnucash/register/register-core/gtable.c
 gnucash/register/register-core/numcell.c
 gnucash/register/register-core/pricecell.c



Summary of changes:
 ChangeLog.2001                                     |  2 +-
 ChangeLog.2002                                     |  2 +-
 ChangeLog.2003                                     |  2 +-
 ChangeLog.2006                                     | 40 ++++-----
 ChangeLog.2007                                     |  4 +-
 ChangeLog.2010                                     |  4 +-
 ChangeLog.2011                                     |  2 +-
 bindings/guile/test/CMakeLists.txt                 |  2 +-
 bindings/guile/test/test-scm-query.cpp             |  1 -
 bindings/python/CMakeLists.txt                     |  7 +-
 bindings/python/gnucash_core.i                     |  2 -
 bindings/python/sqlite3test.c                      |  1 -
 gnucash/CMakeLists.txt                             |  8 +-
 gnucash/gnome-search/CMakeLists.txt                | 13 ++-
 gnucash/gnome-search/gncmod-gnome-search.c         | 89 --------------------
 gnucash/gnome-utils/CMakeLists.txt                 | 23 +++--
 gnucash/gnome-utils/assistant-xml-encoding.c       |  1 -
 gnucash/gnome-utils/gnc-gnome-utils.c              | 16 +++-
 gnucash/gnome-utils/gnc-gnome-utils.h              |  5 ++
 gnucash/gnome-utils/gncmod-gnome-utils.c           | 85 -------------------
 gnucash/gnome-utils/gnome-utils.scm                |  2 +-
 gnucash/gnome-utils/test/CMakeLists.txt            | 24 ++----
 gnucash/gnome-utils/test/test-link-module.c        | 41 ---------
 gnucash/gnome/CMakeLists.txt                       | 15 ++--
 gnucash/gnome/dialog-tax-info.c                    |  1 -
 gnucash/gnucash-bin.c                              | 38 ++++++---
 gnucash/html/CMakeLists.txt                        |  2 +-
 gnucash/import-export/CMakeLists.txt               |  2 +-
 gnucash/import-export/aqb/CMakeLists.txt           |  6 +-
 gnucash/import-export/aqb/gncmod-aqbanking.c       |  6 --
 gnucash/import-export/aqb/test/CMakeLists.txt      |  4 +-
 gnucash/import-export/bi-import/CMakeLists.txt     | 18 ++--
 .../import-export/bi-import/gnc-plugin-bi-import.c | 13 +++
 gnucash/import-export/bi-import/gncmod-bi-import.c | 93 ---------------------
 gnucash/import-export/csv-exp/CMakeLists.txt       | 27 ++++--
 gnucash/import-export/csv-exp/gncmod-csv-export.c  | 78 -----------------
 gnucash/import-export/csv-imp/CMakeLists.txt       | 25 +++---
 gnucash/import-export/csv-imp/gncmod-csv-import.c  | 78 -----------------
 gnucash/import-export/csv-imp/test/CMakeLists.txt  |  4 +-
 .../import-export/customer-import/CMakeLists.txt   | 20 +++--
 .../customer-import/gnc-plugin-customer-import.c   | 13 +++
 .../customer-import/gncmod-customer-import.c       | 93 ---------------------
 gnucash/import-export/log-replay/CMakeLists.txt    | 22 +++--
 .../import-export/log-replay/gncmod-log-replay.c   | 80 ------------------
 gnucash/import-export/ofx/CMakeLists.txt           |  2 +-
 gnucash/import-export/ofx/gncmod-ofx-import.c      |  5 --
 gnucash/import-export/qif-imp/CMakeLists.txt       | 21 +++--
 .../import-export/qif-imp/gnc-plugin-qif-import.c  |  6 ++
 gnucash/import-export/qif-imp/gncmod-qif-import.c  | 90 --------------------
 gnucash/import-export/qif-imp/test/CMakeLists.txt  |  8 +-
 gnucash/import-export/qif-imp/test/test-link.c     | 26 ------
 gnucash/import-export/test/CMakeLists.txt          |  8 +-
 gnucash/import-export/test/test-import-parse.c     |  3 -
 gnucash/import-export/test/test-link.c             | 26 ------
 gnucash/register/ledger-core/CMakeLists.txt        | 13 ++-
 gnucash/register/ledger-core/gncmod-ledger-core.c  | 65 ---------------
 gnucash/register/ledger-core/test/CMakeLists.txt   | 11 +--
 .../register/ledger-core/test/test-link-module.c   | 27 ------
 gnucash/register/register-core/CMakeLists.txt      | 15 ++--
 .../register/register-core/gncmod-register-core.c  | 68 ---------------
 gnucash/register/register-core/test/CMakeLists.txt |  9 --
 .../register/register-core/test/test-link-module.c | 27 ------
 gnucash/register/register-gnome/CMakeLists.txt     | 14 ++--
 .../register-gnome/gncmod-register-gnome.c         | 97 ----------------------
 gnucash/register/register-gnome/gnucash-register.c | 21 +++++
 gnucash/register/register-gnome/gnucash-register.h |  6 ++
 .../register/register-gnome/test/CMakeLists.txt    |  9 --
 .../register-gnome/test/test-link-module.c         | 27 ------
 gnucash/report/CMakeLists.txt                      | 17 ++--
 gnucash/report/gnc-report.c                        | 11 +++
 gnucash/report/gnc-report.h                        |  7 ++
 gnucash/report/gncmod-report.c                     | 81 ------------------
 gnucash/report/report-core.scm                     |  2 +-
 gnucash/report/reports/CMakeLists.txt              |  1 -
 .../report/reports/standard/test/CMakeLists.txt    |  1 -
 gnucash/report/stylesheets/CMakeLists.txt          |  1 -
 gnucash/report/test/CMakeLists.txt                 | 13 +--
 gnucash/report/test/test-link-module.c             | 42 ----------
 libgnucash/app-utils/CMakeLists.txt                | 16 ++--
 libgnucash/app-utils/gnc-ui-util.c                 |  1 -
 libgnucash/app-utils/test/CMakeLists.txt           |  2 +-
 libgnucash/backend/dbi/test/CMakeLists.txt         |  2 +-
 libgnucash/backend/xml/test/CMakeLists.txt         |  2 +-
 .../backend/xml/test/test-load-example-account.cpp |  1 -
 libgnucash/backend/xml/test/test-xml-commodity.cpp |  1 -
 libgnucash/engine/CMakeLists.txt                   |  1 -
 libgnucash/engine/test-core/CMakeLists.txt         | 11 ++-
 libgnucash/engine/test-core/gncmod-test-engine.c   | 67 ---------------
 libgnucash/engine/test/CMakeLists.txt              | 10 +--
 libgnucash/engine/test/test-business.c             |  1 -
 libgnucash/engine/test/test-link.c                 | 25 ------
 libgnucash/tax/CMakeLists.txt                      | 11 ++-
 po/POTFILES.in                                     | 12 ---
 util/src-count/count.sh                            |  2 +-
 94 files changed, 337 insertions(+), 1622 deletions(-)
 delete mode 100644 gnucash/gnome-search/gncmod-gnome-search.c
 delete mode 100644 gnucash/gnome-utils/gncmod-gnome-utils.c
 delete mode 100644 gnucash/gnome-utils/test/test-link-module.c
 delete mode 100644 gnucash/import-export/bi-import/gncmod-bi-import.c
 delete mode 100644 gnucash/import-export/csv-exp/gncmod-csv-export.c
 delete mode 100644 gnucash/import-export/csv-imp/gncmod-csv-import.c
 delete mode 100644 gnucash/import-export/customer-import/gncmod-customer-import.c
 delete mode 100644 gnucash/import-export/log-replay/gncmod-log-replay.c
 delete mode 100644 gnucash/import-export/qif-imp/gncmod-qif-import.c
 delete mode 100644 gnucash/import-export/qif-imp/test/test-link.c
 delete mode 100644 gnucash/import-export/test/test-link.c
 delete mode 100644 gnucash/register/ledger-core/gncmod-ledger-core.c
 delete mode 100644 gnucash/register/ledger-core/test/test-link-module.c
 delete mode 100644 gnucash/register/register-core/gncmod-register-core.c
 delete mode 100644 gnucash/register/register-core/test/CMakeLists.txt
 delete mode 100644 gnucash/register/register-core/test/test-link-module.c
 delete mode 100644 gnucash/register/register-gnome/gncmod-register-gnome.c
 delete mode 100644 gnucash/register/register-gnome/test/CMakeLists.txt
 delete mode 100644 gnucash/register/register-gnome/test/test-link-module.c
 delete mode 100644 gnucash/report/gncmod-report.c
 delete mode 100644 gnucash/report/test/test-link-module.c
 delete mode 100644 libgnucash/engine/test-core/gncmod-test-engine.c
 delete mode 100644 libgnucash/engine/test/test-link.c



More information about the gnucash-changes mailing list