diff --git a/adb/Android.mk b/adb/Android.mk
index d4adbfb6a..425bf9ba5 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -200,10 +200,7 @@ endif
 # will violate ODR
 LOCAL_SHARED_LIBRARIES :=
 
-# Don't build the host adb on Windows (this branch should only be used for security updates.)
-ifneq ($(HOST_OS),windows)
 include $(BUILD_HOST_EXECUTABLE)
-endif
 
 $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
 
diff --git a/adb/sysdeps/mutex.h b/adb/sysdeps/mutex.h
index ef5d9b164..e33551fe1 100644
--- a/adb/sysdeps/mutex.h
+++ b/adb/sysdeps/mutex.h
@@ -20,7 +20,7 @@
 
 #include <windows.h>
 
-#include <android-base/macros.h>
+#include <base/macros.h>
 
 #include "adb.h"