--- a/liboctave/util/pathsearch.cc	Thu May 19 13:01:29 2016 -0400
+++ b/liboctave/util/pathsearch.cc	Thu May 19 13:59:28 2016 -0400
@@ -36,136 +36,139 @@
 
 #include "kpse.cc"
 
-dir_path::static_members *dir_path::static_members::instance = 0;
+namespace octave
+{
+  directory_path::static_members *directory_path::static_members::instance = 0;
 
-dir_path::static_members::static_members (void)
-  : xpath_sep_char (SEPCHAR), xpath_sep_str (SEPCHAR_STR) { }
+  directory_path::static_members::static_members (void)
+    : xpath_sep_char (SEPCHAR), xpath_sep_str (SEPCHAR_STR) { }
 
-bool
-dir_path::static_members::instance_ok (void)
-{
-  bool retval = true;
+  bool
+  directory_path::static_members::instance_ok (void)
+  {
+    bool retval = true;
 
-  if (! instance)
-    {
-      instance = new static_members ();
+    if (! instance)
+      {
+        instance = new static_members ();
 
-      if (instance)
-        singleton_cleanup_list::add (cleanup_instance);
-    }
+        if (instance)
+          singleton_cleanup_list::add (cleanup_instance);
+      }
 
-  if (! instance)
-    (*current_liboctave_error_handler)
-      ("unable to create dir_path::static_members object!");
+    if (! instance)
+      (*current_liboctave_error_handler)
+        ("unable to create directory_path::static_members object!");
 
-  return retval;
-}
+    return retval;
+  }
 
-string_vector
-dir_path::elements (void)
-{
-  return initialized ? pv : string_vector ();
-}
+  string_vector
+  directory_path::elements (void)
+  {
+    return initialized ? pv : string_vector ();
+  }
 
-string_vector
-dir_path::all_directories (void)
-{
-  int count = 0;
-  string_vector retval;
+  string_vector
+  directory_path::all_directories (void)
+  {
+    int count = 0;
+    string_vector retval;
 
-  if (initialized)
-    {
-      int len = pv.numel ();
+    if (initialized)
+      {
+        int len = pv.numel ();
 
-      int nmax = len > 32 ? len : 32;
+        int nmax = len > 32 ? len : 32;
 
-      retval.resize (len);
+        retval.resize (len);
 
-      for (int i = 0; i < len; i++)
-        {
-          str_llist_type *elt_dirs = kpse_element_dirs (pv[i]);
+        for (int i = 0; i < len; i++)
+          {
+            str_llist_type *elt_dirs = kpse_element_dirs (pv[i]);
 
-          if (elt_dirs)
-            {
-              str_llist_elt_type *dir;
+            if (elt_dirs)
+              {
+                str_llist_elt_type *dir;
 
-              for (dir = *elt_dirs; dir; dir = STR_LLIST_NEXT (*dir))
-                {
-                  const std::string elt_dir = STR_LLIST (*dir);
+                for (dir = *elt_dirs; dir; dir = STR_LLIST_NEXT (*dir))
+                  {
+                    const std::string elt_dir = STR_LLIST (*dir);
 
-                  if (! elt_dir.empty ())
-                    {
-                      if (count == nmax)
-                        nmax *= 2;
+                    if (! elt_dir.empty ())
+                      {
+                        if (count == nmax)
+                          nmax *= 2;
 
-                      retval.resize (nmax);
+                        retval.resize (nmax);
 
-                      retval[count++] = elt_dir;
-                    }
-                }
-            }
-        }
+                        retval[count++] = elt_dir;
+                      }
+                  }
+              }
+          }
 
-      retval.resize (count);
-    }
+        retval.resize (count);
+      }
 
-  return retval;
-}
+    return retval;
+  }
 
-std::string
-dir_path::find_first (const std::string& nm)
-{
-  return initialized ? kpse_path_search (p, nm, true) : "";
-}
+  std::string
+  directory_path::find_first (const std::string& nm)
+  {
+    return initialized ? kpse_path_search (p, nm, true) : "";
+  }
 
-string_vector
-dir_path::find_all (const std::string& nm)
-{
-  return initialized ? kpse_all_path_search (p, nm) : string_vector ();
-}
+  string_vector
+  directory_path::find_all (const std::string& nm)
+  {
+    return initialized ? kpse_all_path_search (p, nm) : string_vector ();
+  }
 
-std::string
-dir_path::find_first_of (const string_vector& names)
-{
-  return initialized
-         ? kpse_path_find_first_of (p, names, true) : "";
-}
+  std::string
+  directory_path::find_first_of (const string_vector& names)
+  {
+    return initialized
+      ? kpse_path_find_first_of (p, names, true) : "";
+  }
 
-string_vector
-dir_path::find_all_first_of (const string_vector& names)
-{
-  return initialized
-         ? kpse_all_path_find_first_of (p, names) : string_vector ();
-}
+  string_vector
+  directory_path::find_all_first_of (const string_vector& names)
+  {
+    return initialized
+      ? kpse_all_path_find_first_of (p, names) : string_vector ();
+  }
 
-void
-dir_path::init (void)
-{
-  static bool octave_kpathsea_initialized = false;
+  void
+  directory_path::init (void)
+  {
+    static bool octave_kpathsea_initialized = false;
 
-  if (! octave_kpathsea_initialized)
-    {
-      std::string val = octave::sys::env::getenv ("KPATHSEA_DEBUG");
+    if (! octave_kpathsea_initialized)
+      {
+        std::string val = octave::sys::env::getenv ("KPATHSEA_DEBUG");
 
-      if (! val.empty ())
-        kpathsea_debug |= atoi (val.c_str ());
+        if (! val.empty ())
+          kpathsea_debug |= atoi (val.c_str ());
 
-      octave_kpathsea_initialized = true;
-    }
+        octave_kpathsea_initialized = true;
+      }
 
-  p = kpse_path_expand (p_default.empty ()
-                        ? p_orig : kpse_expand_default (p_orig, p_default));
+    p = kpse_path_expand (p_default.empty ()
+                          ? p_orig : kpse_expand_default (p_orig, p_default));
 
-  int count = 0;
-  for (kpse_path_iterator pi (p); pi != std::string::npos; pi++)
-    count++;
+    int count = 0;
+    for (kpse_path_iterator pi (p); pi != std::string::npos; pi++)
+      count++;
 
-  pv.resize (count);
+    pv.resize (count);
 
-  kpse_path_iterator pi (p);
+    kpse_path_iterator pi (p);
 
-  for (int i = 0; i < count; i++)
-    pv[i] = *pi++;
+    for (int i = 0; i < count; i++)
+      pv[i] = *pi++;
 
-  initialized = true;
+    initialized = true;
+  }
 }