diff --git a/src/Directory.cpp b/src/Directory.cpp
index ab6a9be60..d3ac2bc3d 100644
--- a/src/Directory.cpp
+++ b/src/Directory.cpp
@@ -31,6 +31,7 @@
 #include <dirent.h>
 #include <string.h>
 #include "Directory.h"
+#include "../auto.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 Directory::Directory ()
diff --git a/src/Path.cpp b/src/Path.cpp
index b6613a0b8..04b6c4706 100644
--- a/src/Path.cpp
+++ b/src/Path.cpp
@@ -32,6 +32,7 @@
 #include <pwd.h>
 #include <unistd.h>
 #include "Path.h"
+#include "../auto.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 Path::Path ()
@@ -201,7 +202,11 @@ std::vector <std::string> Path::glob (const std::string& pattern)
   std::vector <std::string> results;
 
   glob_t g;
+#ifdef SOLARIS
+  if (!::glob (pattern.c_str (), GLOB_ERR, NULL, &g))
+#else
   if (!::glob (pattern.c_str (), GLOB_ERR | GLOB_BRACE | GLOB_TILDE, NULL, &g))
+#endif
     for (int i = 0; i < (int) g.gl_pathc; ++i)
       results.push_back (g.gl_pathv[i]);
 
diff --git a/src/text.cpp b/src/text.cpp
index 2232c4e06..0ca9aeb37 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -499,7 +499,7 @@ std::string::size_type find (
 
     for (; t <= end - len; ++t)
     {
-      int diff;
+      int diff = 0;
       for (size_t i = 0; i < len; ++i)
         if ((diff = tolower (t[i]) - tolower (p[i])))
           break;
@@ -546,7 +546,7 @@ std::string::size_type find (
 
     for (; t <= end - len; ++t)
     {
-      int diff;
+      int diff = 0;
       for (size_t i = 0; i < len; ++i)
         if ((diff = tolower (t[i]) - tolower (p[i])))
           break;