diff --git a/arch/alpha/process.cc b/arch/alpha/process.cc
index dc4b92861..17a54ee80 100644
--- a/arch/alpha/process.cc
+++ b/arch/alpha/process.cc
@@ -27,6 +27,10 @@
  */
 
 #include "arch/alpha/process.hh"
+#include "arch/alpha/linux/process.hh"
+#include "arch/alpha/tru64/process.hh"
+#include "base/loader/object_file.hh"
+#include "base/misc.hh"
 
 namespace AlphaISA
 {
diff --git a/arch/alpha/process.hh b/arch/alpha/process.hh
index a2eb65890..6d6585175 100644
--- a/arch/alpha/process.hh
+++ b/arch/alpha/process.hh
@@ -30,18 +30,19 @@
 #define __ALPHA_PROCESS_HH__
 
 #include <string>
+#include <vector>
 
-#include "arch/alpha/linux/process.hh"
-#include "arch/alpha/tru64/process.hh"
-#include "base/loader/object_file.hh"
+class LiveProcess;
+class ObjectFile;
+class System;
 
 namespace AlphaISA
 {
 
 LiveProcess *
 createProcess(const std::string &nm, ObjectFile * objFile, System * system,
-        int stdin_fd, int stdout_fd, int stderr_fd,
-        std::vector<std::string> &argv, std::vector<std::string> &envp);
+              int stdin_fd, int stdout_fd, int stderr_fd,
+              std::vector<std::string> &argv, std::vector<std::string> &envp);
 
 } // namespace AlphaISA
 
diff --git a/arch/mips/process.cc b/arch/mips/process.cc
index 7f374f580..f63e668b5 100644
--- a/arch/mips/process.cc
+++ b/arch/mips/process.cc
@@ -27,6 +27,9 @@
  */
 
 #include "arch/mips/process.hh"
+#include "arch/mips/linux/process.hh"
+#include "base/loader/object_file.hh"
+#include "base/misc.hh"
 
 using namespace std;
 
diff --git a/arch/mips/process.hh b/arch/mips/process.hh
index b2a35d688..8f5d74d96 100644
--- a/arch/mips/process.hh
+++ b/arch/mips/process.hh
@@ -29,18 +29,20 @@
 #ifndef __MIPS_PROCESS_HH__
 #define __MIPS_PROCESS_HH__
 
-#include "arch/mips/linux_process.hh"
-#include "base/loader/object_file.hh"
+#include <string>
+#include <vector>
 
-using namespace std;
+class LiveProcess;
+class ObjectFile;
+class System;
 
 namespace MipsISA
 {
 
 LiveProcess *
-createProcess(const string &nm, ObjectFile * objFile,System * system,
-        int stdin_fd, int stdout_fd, int stderr_fd,
-        vector<string> &argv, vector<string> &envp);
+createProcess(const std::string &nm, ObjectFile * objFile,System * system,
+              int stdin_fd, int stdout_fd, int stderr_fd,
+              std::vector<std::string> &argv, std::vector<std::string> &envp);
 
 } // namespace MipsISA
 
diff --git a/arch/sparc/process.cc b/arch/sparc/process.cc
index 53a215379..2c10f65e6 100644
--- a/arch/sparc/process.cc
+++ b/arch/sparc/process.cc
@@ -27,6 +27,9 @@
  */
 
 #include "arch/sparc/process.hh"
+#include "arch/sparc/linux/process.hh"
+#include "base/loader/object_file.hh"
+#include "base/misc.hh"
 
 namespace SparcISA
 {
diff --git a/arch/sparc/process.hh b/arch/sparc/process.hh
index 48041a316..e0bba3497 100644
--- a/arch/sparc/process.hh
+++ b/arch/sparc/process.hh
@@ -29,16 +29,20 @@
 #ifndef __SPARC_PROCESS_HH__
 #define __SPARC_PROCESS_HH__
 
-#include "arch/sparc/linux/process.hh"
-#include "base/loader/object_file.hh"
+#include <string>
+#include <vector>
+
+class LiveProcess;
+class ObjectFile;
+class System;
 
 namespace SparcISA
 {
 
 LiveProcess *
-createProcess(const string &nm, ObjectFile * objFile,
-        int stdin_fd, int stdout_fd, int stderr_fd,
-        vector<string> &argv, vector<string> &envp);
+createProcess(const std::string &nm, ObjectFile * objFile,
+              int stdin_fd, int stdout_fd, int stderr_fd,
+              std::vector<std::string> &argv, std::vector<std::string> &envp);
 
 } // namespace SparcISA