And hopefully the last fix...

runtime/bin/dbg_connection_win.cc

Index: runtime/bin/dbg_connection_win.cc
===================================================================
--- runtime/bin/dbg_connection_win.cc	(revision 7330)
+++ runtime/bin/dbg_connection_win.cc	(working copy)
@@ -2,15 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#include "bin/fdutils.h"
-#include "bin/socket.h"
-
 void DebuggerConnectionImpl::StartHandler(int port_number) {
   FATAL("Debugger wire protocol not yet implemented on Linux\n");
 }