diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77ec297b1c..815cd28f6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -569,7 +569,7 @@ endif()
 
 add_definitions(-D_GNU_SOURCE)
 
-# Also, set the C++ version to c++11
+# Set up the language standards:
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/libgnucash/app-utils/gnc-optiondb.i b/libgnucash/app-utils/gnc-optiondb.i
index a5fee701b7..9bad4093f3 100644
--- a/libgnucash/app-utils/gnc-optiondb.i
+++ b/libgnucash/app-utils/gnc-optiondb.i
@@ -39,7 +39,12 @@ namespace std {
 
 %module sw_gnc_optiondb
 %{
+extern "C"
+{
+#include <config.h>
 #include <libguile.h>
+#include <gnc-engine-guile.h>
+}
 #include "gnc-optiondb.hpp"
 extern "C" SCM scm_init_sw_gnc_optiondb_module(void);
 %}
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index dc41f34715..628207f7ee 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -43,8 +43,8 @@ set(gtest_gnc_option_INCLUDES
   ${GUILE_INCLUDE_DIRS})
 
 set(gtest_gnc_option_LIBS
-  gncmod-app-utils
-  gncmod-engine
+  gnc-app-utils
+  gnc-engine
   ${GLIB2_LDFLAGS}
   ${GUILE_LDFLAGS}
   gtest)
@@ -94,6 +94,7 @@ if (HAVE_SRFI64)
   gnc_add_swig_guile_command(swig-gnc-optiondb-guile
     SWIG_GNC_OPTIONDB_GUILE_CPP swig-gnc-optiondb-guile.cpp
     ${MODULEPATH}/gnc-optiondb.i
+    ""
     )
   add_library(swig-gnc-optiondb MODULE
     ${MODULEPATH}/gnc-option.cpp
@@ -102,6 +103,7 @@ if (HAVE_SRFI64)
     )
   set(swig_gnc_optiondb_INCLUDES
     ${MODULEPATH}
+    ${CMAKE_SOURCE_DIR}/bindings/guile
     ${CMAKE_SOURCE_DIR}/libgnucash/engine
     ${CMAKE_BINARY_DIR}/common # for config.h
     ${GLIB2_INCLUDE_DIRS}
@@ -109,8 +111,9 @@ if (HAVE_SRFI64)
     )
 
   set(swig_gnc_optiondb_LIBS
-    gncmod-engine
-    gncmod-app-utils
+    gnc-engine
+    gnc-app-utils
+    gnucash-guile
     ${GLIB2_LDFLAGS}
     ${GUILE_LDFLAGS}
     )
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f92fb3c27..fce91bb811 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -527,7 +527,6 @@ libgnucash/app-utils/gnc-exp-parser.c
 libgnucash/app-utils/gnc-gsettings.c
 libgnucash/app-utils/gnc-helpers.c
 libgnucash/app-utils/gnc-help-utils.c
-libgnucash/app-utils/gncmod-app-utils.c
 libgnucash/app-utils/gnc-option.cpp
 libgnucash/app-utils/gnc-optiondb.cpp
 libgnucash/app-utils/gnc-prefs-utils.c