Include windows.h first

atom/app/atom_main.cc

@@ -7,10 +7,11 @@
 #include <stdlib.h>
 
 #if defined(OS_WIN)
+#include <windows.h>  // windows.h must be included first
+
 #include <shellapi.h>
 #include <shellscalingapi.h>
 #include <tchar.h>
-#include <windows.h>
 
 #include "atom/app/atom_main_delegate.h"
 #include "atom/common/crash_reporter/win/crash_service_main.h"

atom/browser/browser_win.cc

@@ -4,11 +4,12 @@
 
 #include "atom/browser/browser.h"
 
+#include <windows.h>  // windows.h must be included first
+
 #include <atlbase.h>
 #include <propkey.h>
 #include <shlobj.h>
 #include <shobjidl.h>
-#include <windows.h>
 
 #include "atom/common/atom_version.h"
 #include "atom/common/native_mate_converters/string16_converter.h"

atom/browser/ui/file_dialog_win.cc

@@ -4,10 +4,11 @@
 
 #include "atom/browser/ui/file_dialog.h"
 
+#include <windows.h>  // windows.h must be included first
+
 #include <atlbase.h>
 #include <commdlg.h>
 #include <shlobj.h>
-#include <windows.h>
 
 #include "atom/browser/native_window_views.h"
 #include "atom/browser/unresponsive_suppressor.h"

atom/browser/ui/message_box_win.cc

@@ -4,8 +4,9 @@
 
 #include "atom/browser/ui/message_box.h"
 
+#include <windows.h>  // windows.h must be included first
+
 #include <commctrl.h>
-#include <windows.h>
 
 #include <map>
 #include <vector>

atom/browser/ui/win/notify_icon.h

@@ -5,8 +5,9 @@
 #ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
 #define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
 
+#include <windows.h>  // windows.h must be included first
+
 #include <shellapi.h>
-#include <windows.h>
 
 #include <string>
 

atom/common/platform_util_win.cc

@@ -4,13 +4,14 @@
 
 #include "atom/common/platform_util.h"
 
+#include <windows.h>  // windows.h must be included first
+
 #include <atlbase.h>
 #include <comdef.h>
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#include <windows.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"