diff --git a/utils/pgsql2sqlite/main.cpp b/utils/pgsql2sqlite/main.cpp
index 58261dd03..555680df1 100644
--- a/utils/pgsql2sqlite/main.cpp
+++ b/utils/pgsql2sqlite/main.cpp
@@ -100,7 +100,7 @@ int main ( int argc, char** argv)
             boost::shared_ptr<Connection> conn(creator());
     
             std::string query = vm["query"].as<std::string>();      
-            std::string output_table_name = vm.count("table") ? vm["table"].as<std::string>() : mapnik::table_from_sql(query);
+            std::string output_table_name = vm.count("table") ? vm["table"].as<std::string>() : mapnik::sql_utils::table_from_sql(query);
             std::string output_file = vm["file"].as<std::string>();
           
             std::cout << "output_table : " << output_table_name << "\n";
diff --git a/utils/pgsql2sqlite/pgsql2sqlite.hpp b/utils/pgsql2sqlite/pgsql2sqlite.hpp
index 8710f5aac..c5b22ea09 100644
--- a/utils/pgsql2sqlite/pgsql2sqlite.hpp
+++ b/utils/pgsql2sqlite/pgsql2sqlite.hpp
@@ -92,7 +92,7 @@ void pgsql2sqlite(Connection conn,
    
     select_sql << " from (" << query << ") as query";
    
-    std::string table_name = mapnik::table_from_sql(query);
+    std::string table_name = mapnik::sql_utils::table_from_sql(query);
       
     std::string schema_name="";
     std::string::size_type idx=table_name.find_last_of('.');
@@ -279,7 +279,7 @@ void pgsql2sqlite(Connection conn,
                 }
                 case 1700:
                 {
-                    std::string str = mapnik::numeric2string(buf);
+                    std::string str = mapnik::sql_utils::numeric2string(buf);
                     try 
                     {
                         double val = boost::lexical_cast<double>(str);