From 1ac0ab2b71fbda31f2499d95ad223d28e7af979e Mon Sep 17 00:00:00 2001
From: Tomas Rycl <trycl@me.com>
Date: Thu, 19 Apr 2018 14:27:57 +0200
Subject: [PATCH] Include missing "windows.h" and fix headers ordering

For PCWSTR on line 198.
---
 atom/browser/browser.h                         | 1 +
 atom/browser/ui/certificate_trust_win.cc       | 3 ++-
 atom/common/crash_reporter/win/crash_service.h | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 246f8a8645d1..39cc0f9812ac 100644
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -18,6 +18,7 @@
 #include "native_mate/arguments.h"
 
 #if defined(OS_WIN)
+#include <windows.h>
 #include "base/files/file_path.h"
 #endif
 
diff --git a/atom/browser/ui/certificate_trust_win.cc b/atom/browser/ui/certificate_trust_win.cc
index ac68d8313055..6179b0860704 100644
--- a/atom/browser/ui/certificate_trust_win.cc
+++ b/atom/browser/ui/certificate_trust_win.cc
@@ -4,8 +4,9 @@
 
 #include "atom/browser/ui/certificate_trust.h"
 
+#include <windows.h>  // windows.h must be included first
+
 #include <wincrypt.h>
-#include <windows.h>
 
 #include "base/callback.h"
 #include "net/cert/cert_database.h"
diff --git a/atom/common/crash_reporter/win/crash_service.h b/atom/common/crash_reporter/win/crash_service.h
index 8b7b51037a37..93bbb7c36de3 100644
--- a/atom/common/crash_reporter/win/crash_service.h
+++ b/atom/common/crash_reporter/win/crash_service.h
@@ -11,6 +11,10 @@
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif  // defined(OS_WIN)
+
 namespace google_breakpad {
 
 class CrashReportSender;