diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc
index 25f443d198..532101e762 100644
--- a/gtk2_ardour/missing_file_dialog.cc
+++ b/gtk2_ardour/missing_file_dialog.cc
@@ -133,7 +133,7 @@ MissingFileDialog::add_chosen ()
                 break;
         }
 
-        split (str, dirs, G_DIR_SEPARATOR);
+        split (str, dirs, G_SEARCHPATH_SEPARATOR);
 
         newdir = chooser.get_filename ();
 
@@ -144,7 +144,7 @@ MissingFileDialog::add_chosen ()
         }
 
         if (!str.empty()) {
-                str += G_DIR_SEPARATOR;
+                str += G_SEARCHPATH_SEPARATOR;
         }
 
         str += newdir;
diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index 1060e05b3f..9aea617812 100644
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -103,7 +103,7 @@ SearchPathOption::set_state_from_config ()
         clear ();
         path_box.pack_start (session_label);
 
-        split (str, dirs, G_DIR_SEPARATOR);
+        split (str, dirs, G_SEARCHPATH_SEPARATOR);
 
         for (vector<string>::iterator d = dirs.begin(); d != dirs.end(); ++d) {
                 add_path (*d);
@@ -118,7 +118,7 @@ SearchPathOption::changed ()
         for (list<PathEntry*>::iterator p = paths.begin(); p != paths.end(); ++p) {
 
                 if (!str.empty()) {
-                        str += G_DIR_SEPARATOR;
+                        str += G_SEARCHPATH_SEPARATOR;
                 }
                 str += (*p)->entry.get_text ();
         }
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index dd963591e8..cffdae9d15 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -916,7 +916,7 @@ Session::state (bool full_state)
 				p += (*i).path;
 
 				if (next != session_dirs.end()) {
-					p += G_DIR_SEPARATOR;
+					p += G_SEARCHPATH_SEPARATOR;
 				} else {
 					break;
 				}
@@ -2680,7 +2680,7 @@ Session::cleanup_sources (CleanupReport& rep)
 		audio_path += sdir.sound_path();
 
 		if (nexti != session_dirs.end()) {
-			audio_path += G_DIR_SEPARATOR;
+			audio_path += G_SEARCHPATH_SEPARATOR;
 		}
 
 		i = nexti;
@@ -2698,7 +2698,7 @@ Session::cleanup_sources (CleanupReport& rep)
 		midi_path += sdir.midi_path();
 
 		if (nexti != session_dirs.end()) {
-			midi_path += G_DIR_SEPARATOR;
+			midi_path += G_SEARCHPATH_SEPARATOR;
 		}
 
 		i = nexti;
diff --git a/libs/pbd/search_path.cc b/libs/pbd/search_path.cc
index 6c152e6015..c441c01211 100644
--- a/libs/pbd/search_path.cc
+++ b/libs/pbd/search_path.cc
@@ -133,7 +133,7 @@ export_search_path (const string& base_dir, const char* varname, const char* dir
 
 	if (cstr) {
 		path = cstr;
-		path += G_DIR_SEPARATOR;
+		path += G_SEARCHPATH_SEPARATOR;
 	} else {
 		path = "";
 	}