diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt
index 4942ef481c..004a24be9d 100644
--- a/bindings/guile/CMakeLists.txt
+++ b/bindings/guile/CMakeLists.txt
@@ -129,7 +129,6 @@ add_custom_target(scm-engine ALL DEPENDS scm-engine-2 scm-engine-1 scm-engine-0)
 set_local_dist(guile_DIST_local
     CMakeLists.txt
     core-utils.scm
-    gnc-module.scm
     ${guile_SOURCES}
     ${guile_HEADERS}
     ${engine_SCHEME_0}
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index e7b77fcb1c..a9cf47e7cd 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -13,6 +13,8 @@ set (app_utils_noinst_HEADERS
   calculation/fin_static_proto.h
   gnc-option-date.hpp
   gnc-option-impl.hpp
+  gnc-option-ui.hpp
+  gnc-option-uitype.hpp
   gnc-optiondb-impl.hpp
 )
 
@@ -226,7 +228,7 @@ set_local_dist(app_utils_DIST_local
     ${app_utils_SCHEME_1c}
     ${app_utils_SCHEME_2}
     ${app_utils_SCHEME_3}
-    app-utils.i CMakeLists.txt gnc-help-utils.c)
+    app-utils.i gnc-optiondb.i CMakeLists.txt gnc-help-utils.c)
 
 set(app_utils_DIST
     ${app_utils_DIST_local}
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 0ffa2b6e5d..b0028c299c 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -100,9 +100,13 @@ set_dist_list(test_app_utils_DIST
   test-print-queries.cpp
   test-scm-query-string.cpp
   test-sx.cpp
+  gtest-gnc-option.cpp
+  gtest-gnc-optiondb.cpp
   test-c-interface.scm
   test-date-utilities.scm
   test-options.scm
+  test-gnc-optiondb.scm
+  test-gnc-option-scheme-output.scm
   ${test_app_utils_scheme_SOURCES}
   ${test_app_utils_SOURCES}
 )