diff --git a/atom/browser/api/event_emitter.cc b/atom/browser/api/event_emitter.cc
index 46a8e629e3f3..7337830780f5 100644
--- a/atom/browser/api/event_emitter.cc
+++ b/atom/browser/api/event_emitter.cc
@@ -37,9 +37,9 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
 EventEmitter::EventEmitter() {
 }
 
-v8::Local<v8::Object> EventEmitter::CreateEvent(v8::Isolate* isolate,
-                                                content::WebContents* sender,
-                                                IPC::Message* message) {
+v8::Local<v8::Object> EventEmitter::CreateJSEvent(v8::Isolate* isolate,
+                                                  content::WebContents* sender,
+                                                  IPC::Message* message) {
   v8::Local<v8::Object> event;
   bool use_native_event = sender && message;
 
diff --git a/atom/browser/api/event_emitter.h b/atom/browser/api/event_emitter.h
index 7139b606483c..6910df3a28d0 100644
--- a/atom/browser/api/event_emitter.h
+++ b/atom/browser/api/event_emitter.h
@@ -39,7 +39,7 @@ class EventEmitter : public Wrappable {
                       const Args&... args) {
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
-    v8::Local<v8::Object> event = CreateEvent(isolate(), sender, message);
+    v8::Local<v8::Object> event = CreateJSEvent(isolate(), sender, message);
     EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
     return event->Get(
         StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
@@ -49,9 +49,9 @@ class EventEmitter : public Wrappable {
   EventEmitter();
 
  private:
-  v8::Local<v8::Object> CreateEvent(v8::Isolate* isolate,
-                                    content::WebContents* sender,
-                                    IPC::Message* message);
+  v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
+                                      content::WebContents* sender,
+                                      IPC::Message* message);
 
   DISALLOW_COPY_AND_ASSIGN(EventEmitter);
 };
diff --git a/atom/browser/browser_observer.h b/atom/browser/browser_observer.h
index 19f4bd85c1db..20fd08a2e911 100644
--- a/atom/browser/browser_observer.h
+++ b/atom/browser/browser_observer.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "content/public/browser/client_certificate_delegate.h"
 
 namespace content {
-class ClientCertificateDelegate;
 class WebContents;
 }
 
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 4441726e3396..0ac7aa50c915 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -248,6 +248,9 @@ class NativeWindow : public content::WebContentsObserver,
   // Window icon.
   gfx::ImageSkia icon_;
 
+  // Observers of this window.
+  ObserverList<NativeWindowObserver> observers_;
+
  private:
   // Schedule a notification unresponsive event.
   void ScheduleUnresponsiveEvent(int ms);
@@ -260,9 +263,6 @@ class NativeWindow : public content::WebContentsObserver,
                          const SkBitmap& bitmap,
                          content::ReadbackResponse response);
 
-  // Observers of this window.
-  ObserverList<NativeWindowObserver> observers_;
-
   // The windows has been closed.
   bool is_closed_;