diff --git a/src/base/process.cc b/src/base/process.cc
index 619bdb9..898c340 100644
--- a/src/base/process.cc
+++ b/src/base/process.cc
@@ -63,6 +63,10 @@
 #include "base/system_util.h"
 #include "base/util.h"
 
+#ifdef OS_WIN
+#include "base/scoped_handle.h"
+#endif  // OS_WIN
+
 #ifdef OS_MACOSX
 // We do not use the global environ variable because it is unavailable
 // in Mac Framework/dynamic libraries.  Instead call _NSGetEnviron().
diff --git a/src/base/process.h b/src/base/process.h
index 0509925..b92374a 100644
--- a/src/base/process.h
+++ b/src/base/process.h
@@ -32,12 +32,6 @@
 
 #include <string>
 
-#ifdef OS_WIN
-#include "base/port.h"
-#include "base/scoped_handle.h"
-#include "base/win_sandbox.h"
-#endif  // OS_WIN
-
 namespace mozc {
 class Process {
  public:
diff --git a/src/client/server_launcher.cc b/src/client/server_launcher.cc
index dc5689c..55619e9 100644
--- a/src/client/server_launcher.cc
+++ b/src/client/server_launcher.cc
@@ -54,6 +54,10 @@
 #include "ipc/ipc.h"
 #include "ipc/named_event.h"
 
+#ifdef OS_WIN
+#include "base/win_sandbox.h"
+#endif  // OS_WIN
+
 namespace mozc {
 namespace client {
 namespace {
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 03ef86c..02dddf6 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2048
+BUILD=2049
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/renderer/renderer_client.cc b/src/renderer/renderer_client.cc
index c8863da..d464e47 100644
--- a/src/renderer/renderer_client.cc
+++ b/src/renderer/renderer_client.cc
@@ -49,6 +49,10 @@
 #include "base/mac_util.h"
 #endif
 
+#ifdef OS_WIN
+#include "base/win_sandbox.h"
+#endif  // OS_WIN
+
 namespace mozc {
 namespace renderer {
 namespace {