diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 031366e1df5c..bd5a5c4666d9 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -8,6 +8,10 @@
 #include <utility>
 #include <vector>
 
+#if defined(OS_WIN)
+#include <shlobj.h>
+#endif
+
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/browser.h"
@@ -50,7 +54,6 @@
 
 #if defined(OS_WIN)
 #include "ui/gfx/switches.h"
-#include <shlobj.h>
 #endif
 
 using content::NavigationEntry;
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index c05203917308..178be339008d 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -92,8 +92,10 @@ void AtomRendererClient::WebKitInitialized() {
   blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
 
 #if defined(OS_WIN)
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  base::string16 explicit_app_id = command_line->GetSwitchValueNative(switches::kAppUserModelId);
+  base::CommandLine* command_line =
+    base::CommandLine::ForCurrentProcess();
+  base::string16 explicit_app_id =
+    command_line->GetSwitchValueNative(switches::kAppUserModelId);
 
   if (explicit_app_id.length() > 0) {
     SetCurrentProcessExplicitAppUserModelID(explicit_app_id.c_str());