diff --git a/lib/System/AIX/Process.cpp b/lib/System/AIX/Process.cpp
deleted file mode 100644
index 53b724a..0000000
--- a/lib/System/AIX/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- AIX/Process.cpp - AIX Process Implementation ----------- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the AIX specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only AIX specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Cygwin/Process.cpp b/lib/System/Cygwin/Process.cpp
deleted file mode 100644
index d1d8628..0000000
--- a/lib/System/Cygwin/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Cygwin/Process.cpp - Cygwin Process Implementation ----- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Cygwin specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Cygwin specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Darwin/Process.cpp b/lib/System/Darwin/Process.cpp
deleted file mode 100644
index a9e6c11..0000000
--- a/lib/System/Darwin/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Darwin/Process.cpp - Darwin Process Implementation ----- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Darwin specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Darwin specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/FreeBSD/Process.cpp b/lib/System/FreeBSD/Process.cpp
deleted file mode 100644
index 92341c0..0000000
--- a/lib/System/FreeBSD/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- FreeBSD/Process.cpp - FreeBSD Process Implementation --- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the FreeBSD specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only FreeBSD specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Interix/Process.cpp b/lib/System/Interix/Process.cpp
deleted file mode 100644
index 2890a78..0000000
--- a/lib/System/Interix/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Interix/Process.cpp - Interix Process Implementation --- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Interix specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Interix specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Linux/Process.cpp b/lib/System/Linux/Process.cpp
deleted file mode 100644
index e71e3d0..0000000
--- a/lib/System/Linux/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Linux/Process.cpp - Linux Process Implementation ------- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Linux specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Linux specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Process.cpp b/lib/System/Process.cpp
index aba9bfa..5aefb6a 100644
--- a/lib/System/Process.cpp
+++ b/lib/System/Process.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/System/Process.h"
+#include "llvm/Config/config.h"
 
 namespace llvm {
 using namespace sys;
@@ -24,6 +25,11 @@
 }
 
 // Include the platform-specific parts of this class.
-#include "platform/Process.cpp"
+#ifdef LLVM_ON_UNIX
+#include "Unix/Process.cpp"
+#endif
+#ifdef LLVM_ON_WIN32
+#include "Win32/Process.cpp"
+#endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/SunOS/Process.cpp b/lib/System/SunOS/Process.cpp
deleted file mode 100644
index f8b11b0..0000000
--- a/lib/System/SunOS/Process.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- SunOS/Process.cpp - SunOS Process Implementation ------- -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the SunOS specific implementation of the Process class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Process.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only SunOS specific code 
-//===          and must not be generic UNIX code (see ../Unix/Process.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab