diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc
index 4096ad27273..05b9abf8a30 100644
--- a/lib/System/Unix/Signals.inc
+++ b/lib/System/Unix/Signals.inc
@@ -21,6 +21,7 @@
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
+using namespace llvm;
 
 namespace {
 
@@ -30,7 +31,7 @@ bool StackTraceRequested = false;
 void (*InterruptFunction)() = 0;
 
 std::vector<std::string> *FilesToRemove = 0 ;
-std::vector<llvm::sys::Path> *DirectoriesToRemove = 0;
+std::vector<sys::Path> *DirectoriesToRemove = 0;
 
 // IntSigs - Signals that may interrupt the program at any time.
 const int IntSigs[] = {
@@ -146,7 +147,6 @@ void RegisterHandler(int Signal) {
 
 }
 
-namespace llvm {
 
 void sys::SetInterruptFunction(void (*IF)()) {
   InterruptFunction = IF;
@@ -165,8 +165,10 @@ void sys::RemoveFileOnSignal(const sys::Path &Filename) {
 }
 
 // RemoveDirectoryOnSignal - The public API
-void sys::RemoveDirectoryOnSignal(const llvm::sys::Path& path) {
-  if (!path.isDirectory())
+void sys::RemoveDirectoryOnSignal(const sys::Path& path) {
+  // Not a directory?
+  sys::FileStatus Status;
+  if (path.getFileStatus(Status) || !Status.isDir)
     return;
 
   if (DirectoriesToRemove == 0)
@@ -184,6 +186,3 @@ void sys::PrintStackTraceOnErrorSignal() {
   StackTraceRequested = true;
   std::for_each(KillSigs, KillSigsEnd, RegisterHandler);
 }
-
-}
-
diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index a44c034ba1d..c2bfb01b386 100644
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -96,17 +96,19 @@ void sys::RemoveFileOnSignal(const sys::Path &Filename) {
 
 // RemoveDirectoryOnSignal - The public API
 void sys::RemoveDirectoryOnSignal(const sys::Path& path) {
+  // Not a directory?
+  sys::FileStatus Status;
+  if (path.getFileStatus(Status) || !Status.isDir)
+    return;
+
   RegisterHandler();
 
   if (CleanupExecuted)
     throw std::string("Process terminating -- cannot register for removal");
 
-  if (path.isDirectory()) {
-    if (DirectoriesToRemove == NULL)
-      DirectoriesToRemove = new std::vector<sys::Path>;
-
-    DirectoriesToRemove->push_back(path);
-  }
+  if (DirectoriesToRemove == NULL)
+    DirectoriesToRemove = new std::vector<sys::Path>;
+  DirectoriesToRemove->push_back(path);
 
   LeaveCriticalSection(&CriticalSection);
 }