diff --git a/src/core-utils/CMakeLists.txt b/src/core-utils/CMakeLists.txt
index c8c924cf2f..d7c4d33538 100644
--- a/src/core-utils/CMakeLists.txt
+++ b/src/core-utils/CMakeLists.txt
@@ -26,6 +26,7 @@ SET (libgnc_core_utils_SOURCES
   gnc-glib-utils.c
   gnc-main.c
   gnc-path.c
+  gnc-uri-utils.c
   ${SWIG_CORE_UTILS_C}
 )
 
@@ -52,6 +53,7 @@ SET (libgnc_core_utils_HEADERS
   gnc-glib-utils.h
   gnc-main.h
   gnc-path.h
+  gnc-uri-utils.h
 )
 
 ADD_LIBRARY	(core-utils
diff --git a/src/gnc/mainwindow.cpp b/src/gnc/mainwindow.cpp
index fbc990147b..09bd101a00 100644
--- a/src/gnc/mainwindow.cpp
+++ b/src/gnc/mainwindow.cpp
@@ -36,7 +36,7 @@ extern "C"
 {
 #include "qof.h"
 #include "engine/gnc-hooks.h"
-#include "core-utils/gnc-filepath-utils.h"
+#include "core-utils/gnc-uri-utils.h"
 #include "engine/Account.h"
 #include "engine/TransLog.h"
 }
@@ -408,7 +408,7 @@ void MainWindow::loadFile(const QString &fileName)
 
     if (!we_are_in_error)
     {
-        char * logpath = xaccResolveFilePath(newfile);
+        char * logpath = gnc_uri_get_path(newfile);
         PINFO ("logpath=%s", logpath ? logpath : "(null)");
         xaccLogSetBaseName (logpath);
         xaccLogDisable();