8 files changed, 11 insertions, 8 deletions
diff --git a/src/build.h b/src/build.h
index 407aecc..ddd9db8 100644
--- a/src/build.h
+++ b/src/build.h
@@ -193,7 +193,7 @@ struct BuildStatus {
   const char* progress_status_format_;
 
 #ifdef _WIN32
-  HANDLE console_;
+  void* console_;
 #endif
 };
 
diff --git a/src/build_log.cc b/src/build_log.cc
index 4ad005f..d30625a 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -17,7 +17,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #include "build.h"
 #include "graph.h"
diff --git a/src/disk_interface.cc b/src/disk_interface.cc
index 5a36685..74f33c4 100644
--- a/src/disk_interface.cc
+++ b/src/disk_interface.cc
@@ -103,7 +103,7 @@ TimeStamp RealDiskInterface::Stat(const string& path) {
 #endif
 }
 
-bool RealDiskInterface::WriteFile(const string & path, const string & contents) {
+bool RealDiskInterface::WriteFile(const string& path, const string& contents) {
   FILE * fp = fopen(path.c_str(), "w");
   if (fp == NULL) {
     Error("WriteFile(%s): Unable to create file. %s", path.c_str(), strerror(errno));
diff --git a/src/disk_interface.h b/src/disk_interface.h
index c0f5ee5..55f8a21 100644
--- a/src/disk_interface.h
+++ b/src/disk_interface.h
@@ -36,7 +36,7 @@ struct DiskInterface {
 
   /// Create a file, with the specified name and contents
   /// Returns true on success, false on failure
-  virtual bool WriteFile(const string & path, const string & contents) = 0;
+  virtual bool WriteFile(const string& path, const string& contents) = 0;
 
   /// Read a file to a string.  Fill in |err| on error.
   virtual string ReadFile(const string& path, string* err) = 0;
@@ -58,7 +58,7 @@ struct RealDiskInterface : public DiskInterface {
   virtual ~RealDiskInterface() {}
   virtual TimeStamp Stat(const string& path);
   virtual bool MakeDir(const string& path);
-  virtual bool WriteFile(const string & path, const string & contents);
+  virtual bool WriteFile(const string& path, const string& contents);
   virtual string ReadFile(const string& path, string* err);
   virtual int RemoveFile(const string& path);
 };
diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc
index 9e460c5..985e991 100644
--- a/src/disk_interface_test.cc
+++ b/src/disk_interface_test.cc
@@ -107,7 +107,7 @@ struct StatTest : public StateTestWithBuiltinRules,
                   public DiskInterface {
   // DiskInterface implementation.
   virtual TimeStamp Stat(const string& path);
-  virtual bool WriteFile(const string& path, const string & contents) {
+  virtual bool WriteFile(const string& path, const string& contents) {
     assert(false);
     return true;
   }
diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
index fef0bc8..7842114 100644
--- a/src/subprocess-win32.cc
+++ b/src/subprocess-win32.cc
@@ -207,7 +207,7 @@ BOOL WINAPI SubprocessSet::NotifyInterrupted(DWORD dwCtrlType) {
   return FALSE;
 }
 
-Subprocess *SubprocessSet::Add(const string &command) {
+Subprocess *SubprocessSet::Add(const string& command) {
   Subprocess *subprocess = new Subprocess;
   if (!subprocess->Start(this, command)) {
     delete subprocess;
diff --git a/src/subprocess.cc b/src/subprocess.cc
index 25b1bda..0d240b1 100644
--- a/src/subprocess.cc
+++ b/src/subprocess.cc
@@ -172,7 +172,7 @@ SubprocessSet::~SubprocessSet() {
     Fatal("sigprocmask: %s", strerror(errno));
 }
 
-Subprocess *SubprocessSet::Add(const string &command) {
+Subprocess *SubprocessSet::Add(const string& command) {
   Subprocess *subprocess = new Subprocess;
   if (!subprocess->Start(this, command)) {
     delete subprocess;
diff --git a/src/subprocess.h b/src/subprocess.h
index 3294416..4c1629c 100644
--- a/src/subprocess.h
+++ b/src/subprocess.h
@@ -75,7 +75,7 @@ struct SubprocessSet {
   SubprocessSet();
   ~SubprocessSet();
 
-  Subprocess *Add(const string &command);
+  Subprocess* Add(const string& command);
   bool DoWork();
   Subprocess* NextFinished();
   void Clear();