diff --git a/ppremake/ppMain.cxx b/ppremake/ppMain.cxx
index a98d7879b1..ee5b6d24e2 100644
--- a/ppremake/ppMain.cxx
+++ b/ppremake/ppMain.cxx
@@ -110,7 +110,7 @@ read_source(const string &root) {
     return false;
   }
 
-  _root = Filename::from_os_specific(get_cwd());
+  _root = get_cwd();
   cerr << "Root is " << _root << "\n";
 
   _def_scope = new PPScope(&_named_scopes);
@@ -381,7 +381,7 @@ read_global_file() {
 //  Description: Calls the system getcwd(), automatically allocating a
 //               large enough string.
 ////////////////////////////////////////////////////////////////////
-string PPMain::
+Filename PPMain::
 get_cwd() {
   static size_t bufsize = 1024;
   static char *buffer = NULL;
@@ -401,5 +401,5 @@ get_cwd() {
     assert(buffer != (char *)NULL);
   }
 
-  return string(buffer);
+  return Filename::from_os_specific(buffer);
 }
diff --git a/ppremake/ppMain.h b/ppremake/ppMain.h
index a55fb271ac..1f460c5dba 100644
--- a/ppremake/ppMain.h
+++ b/ppremake/ppMain.h
@@ -40,7 +40,7 @@ private:
   bool r_process_all(PPDirectory *dir);
   bool p_process(PPDirectory *dir);
   bool read_global_file();
-  static string get_cwd();
+  static Filename get_cwd();
 
 
   PPScope *_global_scope;
diff --git a/ppremake/ppremake.vcproj b/ppremake/ppremake.vcproj
index f14ec1d73a..a16e6578c0 100644
--- a/ppremake/ppremake.vcproj
+++ b/ppremake/ppremake.vcproj
@@ -136,6 +136,15 @@
 		<File
 			RelativePath="filename.h">
 		</File>
+		<File
+			RelativePath="globPattern.I">
+		</File>
+		<File
+			RelativePath="globPattern.cxx">
+		</File>
+		<File
+			RelativePath="globPattern.h">
+		</File>
 		<File
 			RelativePath="gnu_getopt.c">
 		</File>