diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index d043eb3d58..028c93c002 100644
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -89,9 +89,6 @@ namespace ARDOUR {
 	LIBARDOUR_API std::string windows_package_directory_path ();
 #endif
 
-	LIBARDOUR_API PBD::Searchpath system_midi_map_search_path ();
-	LIBARDOUR_API std::string user_midi_map_directory ();
-
 	namespace ArdourVideoToolPaths {
 
 		LIBARDOUR_API bool harvid_exe (std::string &harvid_exe);
diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h
index fd5ada3b8d..cfcd14d522 100644
--- a/libs/ardour/ardour/search_paths.h
+++ b/libs/ardour/ardour/search_paths.h
@@ -130,6 +130,11 @@ namespace ARDOUR {
 	 */
 	LIBARDOUR_API PBD::Searchpath lua_search_path ();
 
+	/** retun a Searchpath for midi *.map files used by the
+	 * generic ctrl surface
+	 */
+	LIBARDOUR_API PBD::Searchpath system_midi_map_search_path ();
+	LIBARDOUR_API std::string user_midi_map_directory ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 505987cec9..df6005c662 100644
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -313,27 +313,4 @@ been_here_before_path (int version)
 	return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version));
 }
 
-static const char * const midimap_env_variable_name = "ARDOUR_MIDIMAPS_PATH";
-
-Searchpath
-system_midi_map_search_path ()
-{
-	bool midimap_path_defined = false;
-	std::string spath_env (Glib::getenv (midimap_env_variable_name, midimap_path_defined));
-
-	if (midimap_path_defined) {
-		return spath_env;
-	}
-
-	Searchpath spath (ardour_data_search_path());
-	spath.add_subdirectory_to_paths (midi_map_dir_name);
-	return spath;
-}
-
-std::string
-user_midi_map_directory ()
-{
-	return Glib::build_filename (user_config_directory(), midi_map_dir_name);
-}
-
 } // namespace ARDOUR
diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
index 80f8d86a42..e6d8744369 100644
--- a/libs/ardour/search_paths.cc
+++ b/libs/ardour/search_paths.cc
@@ -192,6 +192,29 @@ lua_search_path ()
 	return spath;
 }
 
+static const char * const midimap_env_variable_name = "ARDOUR_MIDIMAPS_PATH";
+
+Searchpath
+system_midi_map_search_path ()
+{
+	bool midimap_path_defined = false;
+	std::string spath_env (Glib::getenv (midimap_env_variable_name, midimap_path_defined));
+
+	if (midimap_path_defined) {
+		return spath_env;
+	}
+
+	Searchpath spath (ardour_data_search_path());
+	spath.add_subdirectory_to_paths (midi_map_dir_name);
+	return spath;
+}
+
+std::string
+user_midi_map_directory ()
+{
+	return Glib::build_filename (user_config_directory(), midi_map_dir_name);
+}
+
 #ifdef PLATFORM_WINDOWS
 
 const char*
diff --git a/libs/fst/wscript b/libs/fst/wscript
index e03e7c9753..e814277b03 100644
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -40,7 +40,7 @@ def build(bld):
             'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
             'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
             ]
-        obj.use = [ 'libpbd', 'libardour' ]
+        obj.use = [ 'libpbd' ]
         obj.uselib = 'GIOMM DL UUID ARCHIVE CURL XML'
 
         if sys.platform == 'darwin':
@@ -63,10 +63,10 @@ def build(bld):
             bld (features = 'c', name='vstwin', source='vstwin.c', uselib = 'GIOMM', includes  = [ '../pbd/', '../ardour/', '.' ])
             obj.uselib = ['GIOMM', 'DL', 'GDI32', 'ARCHIVE', 'CURL', 'XML']
             obj.linkflags = ['-mwindows']
-            obj.use = [ 'libpbd', 'libtemporal', 'libevoral', 'libardour', 'vstwin' ]
+            obj.use = [ 'libpbd', 'libtemporal', 'libevoral', 'vstwin' ]
         else:
             obj.uselib = ['GIOMM', 'DL', 'OSX', 'ARCHIVE', 'CURL', 'XML' ]
-            obj.use = [ 'libpbd', 'libtemporal', 'libevoral', 'libardour' ]
+            obj.use = [ 'libpbd', 'libtemporal', 'libevoral' ]
 
         obj.includes  = [ '../pbd/', '../ardour/', '.' ]
         obj.defines = [
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 98e4f8d847..6810036c69 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -52,7 +52,7 @@
 #include "ardour/auditioner.h"
 #include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
-#include "ardour/filesystem_paths.h"
+#include "ardour/search_paths.h"
 #include "ardour/session.h"
 #include "ardour/midi_ui.h"
 #include "ardour/plugin_insert.h"