Use plain windows.h now it doesn't define small.

ui/platform/win/ui_utility_win.cpp

@@ -6,13 +6,13 @@
 //
 #include "ui/platform/win/ui_utility_win.h"
 
-#include "base/platform/win/base_windows_h.h"
 #include "ui/widgets/popup_menu.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QWindow>
 #include <QtCore/QAbstractNativeEventFilter>
 
+#include <windows.h>
 #include <wrl/client.h>
 #include <Shobjidl.h>
 

ui/platform/win/ui_window_shadow_win.h

@@ -6,19 +6,10 @@
 //
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
+#include "base/platform/win/base_windows_rpcndr_h.h"
+#include "base/platform/win/base_windows_gdiplus_h.h"
 #include "base/flags.h"
 
-#include <rpc.h>
-#include <rpcndr.h>
-#include <Unknwn.h>
-
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) < (b) ? (b) : (a))
-#include <gdiplus.h>
-#undef min
-#undef max
-
 class QColor;
 
 namespace Ui {

ui/platform/win/ui_windows_direct_manipulation.h

@@ -7,11 +7,11 @@
 #pragma once
 
 #include "base/platform/win/base_windows_winrt.h"
-#include "base/platform/win/base_windows_h.h"
 #include "ui/effects/animations.h"
 
 #include <QtCore/QPoint>
 
+#include <windows.h>
 #include <directmanipulation.h>
 
 namespace Ui {

ui/widgets/fields/input_field.cpp

@@ -32,7 +32,7 @@
 #include <QtWidgets/QTextEdit>
 
 #ifdef Q_OS_WIN
-#include "base/platform/win/base_windows_h.h"
+#include <windows.h>
 #include <WinUser.h>
 #elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
 #include "base/platform/linux/base_linux_xcb_utilities.h"