diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg
index 01e99482f2b0..1e4a4e6de3aa 100644
--- a/brightray/CPPLINT.cfg
+++ b/brightray/CPPLINT.cfg
@@ -1 +1 @@
-filter=-build/header_guard,-build/include_what_you_use,-legal/copyright,-runtime/references
+filter=-build/include_what_you_use,-legal/copyright,-runtime/references
diff --git a/brightray/browser/brightray_paths.h b/brightray/browser/brightray_paths.h
index c196757442a1..b12b10d08f3c 100644
--- a/brightray/browser/brightray_paths.h
+++ b/brightray/browser/brightray_paths.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_BRIGHTRAY_PATHS_H_
-#define BROWSER_BRIGHTRAY_PATHS_H_
+#ifndef BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_
+#define BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
@@ -40,4 +40,4 @@ enum {
 
 }  // namespace brightray
 
-#endif  // BROWSER_BRIGHTRAY_PATHS_H_
+#endif  // BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_
diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h
index cd0380b404b2..4426de839298 100644
--- a/brightray/browser/browser_client.h
+++ b/brightray/browser/browser_client.h
@@ -64,4 +64,4 @@ class BrowserClient : public content::ContentBrowserClient {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_
diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h
index 704cfb9f33c6..f533c73f1c42 100644
--- a/brightray/browser/browser_context.h
+++ b/brightray/browser/browser_context.h
@@ -140,4 +140,4 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_
diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h
index 4bc2a85e462b..42b49923d2fb 100644
--- a/brightray/browser/browser_main_parts.h
+++ b/brightray/browser/browser_main_parts.h
@@ -57,4 +57,4 @@ class BrowserMainParts : public content::BrowserMainParts {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_
diff --git a/brightray/browser/devtools_file_system_indexer.h b/brightray/browser/devtools_file_system_indexer.h
index bb1acefab52a..49e5f4b4c147 100644
--- a/brightray/browser/devtools_file_system_indexer.h
+++ b/brightray/browser/devtools_file_system_indexer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
-#define BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#define BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ class DevToolsFileSystemIndexer
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h
index 8ebc27b7b4c1..e351b06c25cc 100644
--- a/brightray/browser/devtools_manager_delegate.h
+++ b/brightray/browser/devtools_manager_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
-#define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/compiler_specific.h"
@@ -38,4 +38,4 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
diff --git a/brightray/browser/devtools_ui.h b/brightray/browser/devtools_ui.h
index 176de9b71bad..eb78fdf2a780 100644
--- a/brightray/browser/devtools_ui.h
+++ b/brightray/browser/devtools_ui.h
@@ -24,4 +24,4 @@ class DevToolsUI : public content::WebUIController {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_UI_H_
diff --git a/brightray/browser/inspectable_web_contents.h b/brightray/browser/inspectable_web_contents.h
index 44c0c22ec647..3b717a2b5f5a 100644
--- a/brightray/browser/inspectable_web_contents.h
+++ b/brightray/browser/inspectable_web_contents.h
@@ -1,5 +1,5 @@
-#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_
-#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_
 
 #include "content/public/browser/web_contents.h"
 
@@ -50,4 +50,4 @@ class InspectableWebContents {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_
diff --git a/brightray/browser/inspectable_web_contents_delegate.h b/brightray/browser/inspectable_web_contents_delegate.h
index a94bcac44d52..85a05dbe3876 100644
--- a/brightray/browser/inspectable_web_contents_delegate.h
+++ b/brightray/browser/inspectable_web_contents_delegate.h
@@ -1,5 +1,5 @@
-#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
-#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ class InspectableWebContentsDelegate {
 
 }  // namespace brightray
 
-#endif  // BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h
index 0da69acb5be1..288f6119c44e 100644
--- a/brightray/browser/inspectable_web_contents_impl.h
+++ b/brightray/browser/inspectable_web_contents_impl.h
@@ -195,4 +195,4 @@ class InspectableWebContentsImpl :
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_
diff --git a/brightray/browser/inspectable_web_contents_view.h b/brightray/browser/inspectable_web_contents_view.h
index 2fabf5d2ba30..480515ef4c2b 100644
--- a/brightray/browser/inspectable_web_contents_view.h
+++ b/brightray/browser/inspectable_web_contents_view.h
@@ -56,4 +56,4 @@ class InspectableWebContentsView {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_H_
diff --git a/brightray/browser/inspectable_web_contents_view_delegate.h b/brightray/browser/inspectable_web_contents_view_delegate.h
index 900857c7a108..7992c3830b14 100644
--- a/brightray/browser/inspectable_web_contents_view_delegate.h
+++ b/brightray/browser/inspectable_web_contents_view_delegate.h
@@ -1,5 +1,5 @@
-#ifndef BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
-#define BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
 
 #include "ui/gfx/image/image_skia.h"
 
@@ -25,4 +25,4 @@ class InspectableWebContentsViewDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h
index e7ad57fbee8c..8d6d7b23a471 100644
--- a/brightray/browser/inspectable_web_contents_view_mac.h
+++ b/brightray/browser/inspectable_web_contents_view_mac.h
@@ -42,4 +42,4 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
diff --git a/brightray/browser/linux/libnotify_notification.h b/brightray/browser/linux/libnotify_notification.h
index cb9384cb0e0c..41633f54b66b 100644
--- a/brightray/browser/linux/libnotify_notification.h
+++ b/brightray/browser/linux/libnotify_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
-#define BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
 
 #include "browser/linux/libnotify_loader.h"
 #include "browser/notification.h"
@@ -41,4 +41,4 @@ class LibnotifyNotification : public Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
diff --git a/brightray/browser/linux/notification_presenter_linux.h b/brightray/browser/linux/notification_presenter_linux.h
index a90f31ea60ef..143717091d77 100644
--- a/brightray/browser/linux/notification_presenter_linux.h
+++ b/brightray/browser/linux/notification_presenter_linux.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
-#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
+#ifndef BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
+#define BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
 
 #include "browser/notification_presenter.h"
 
@@ -24,4 +24,4 @@ class NotificationPresenterLinux : public NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
diff --git a/brightray/browser/mac/cocoa_notification.h b/brightray/browser/mac/cocoa_notification.h
index f6ec9e9da6b0..96b09c5da578 100644
--- a/brightray/browser/mac/cocoa_notification.h
+++ b/brightray/browser/mac/cocoa_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_MAC_COCOA_NOTIFICATION_H_
-#define BROWSER_MAC_COCOA_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_
 
 #import <Foundation/Foundation.h>
 
@@ -39,4 +39,4 @@ class CocoaNotification : public Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_MAC_COCOA_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_
diff --git a/brightray/browser/mac/notification_presenter_mac.h b/brightray/browser/mac/notification_presenter_mac.h
index 514a27625eab..f0781609846e 100644
--- a/brightray/browser/mac/notification_presenter_mac.h
+++ b/brightray/browser/mac/notification_presenter_mac.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_
-#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_
+#ifndef BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
+#define BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
 
 #include "base/mac/scoped_nsobject.h"
 #include "browser/mac/notification_center_delegate.h"
@@ -33,4 +33,4 @@ class NotificationPresenterMac : public NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
diff --git a/brightray/browser/net/devtools_network_conditions.h b/brightray/browser/net/devtools_network_conditions.h
index 12acdc8bd4ff..f9885ba4680c 100644
--- a/brightray/browser/net/devtools_network_conditions.h
+++ b/brightray/browser/net/devtools_network_conditions.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_
 
 #include "base/macros.h"
 
@@ -36,4 +36,4 @@ class DevToolsNetworkConditions {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_
diff --git a/brightray/browser/net/devtools_network_controller.h b/brightray/browser/net/devtools_network_controller.h
index c36d888df110..fb46193aa876 100644
--- a/brightray/browser/net/devtools_network_controller.h
+++ b/brightray/browser/net/devtools_network_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
 
 #include <unordered_map>
 #include <memory>
@@ -41,4 +41,4 @@ class DevToolsNetworkController {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
diff --git a/brightray/browser/net/devtools_network_controller_handle.h b/brightray/browser/net/devtools_network_controller_handle.h
index 2d038e837f80..cbb89ca25bce 100644
--- a/brightray/browser/net/devtools_network_controller_handle.h
+++ b/brightray/browser/net/devtools_network_controller_handle.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
 
 #include <memory>
 #include <string>
@@ -42,4 +42,4 @@ class DevToolsNetworkControllerHandle {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
diff --git a/brightray/browser/net/devtools_network_interceptor.h b/brightray/browser/net/devtools_network_interceptor.h
index 4a04876b6f17..08f5f672164d 100644
--- a/brightray/browser/net/devtools_network_interceptor.h
+++ b/brightray/browser/net/devtools_network_interceptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
-#define BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_
 
 #include <string>
 #include <utility>
@@ -104,4 +104,4 @@ class DevToolsNetworkInterceptor {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_
diff --git a/brightray/browser/net/devtools_network_protocol_handler.h b/brightray/browser/net/devtools_network_protocol_handler.h
index 9ec577814c37..8efa3468fe12 100644
--- a/brightray/browser/net/devtools_network_protocol_handler.h
+++ b/brightray/browser/net/devtools_network_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
-#define BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
 
 #include "base/macros.h"
 #include "base/values.h"
@@ -45,4 +45,4 @@ class DevToolsNetworkProtocolHandler {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h
index 707755f724b5..e9ee54e2513e 100644
--- a/brightray/browser/net/devtools_network_transaction.h
+++ b/brightray/browser/net/devtools_network_transaction.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
-#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_
 
 #include <stdint.h>
 
@@ -104,4 +104,4 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_
diff --git a/brightray/browser/net/devtools_network_transaction_factory.h b/brightray/browser/net/devtools_network_transaction_factory.h
index 49286a04742d..e303cc243623 100644
--- a/brightray/browser/net/devtools_network_transaction_factory.h
+++ b/brightray/browser/net/devtools_network_transaction_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
-#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
 
 #include "base/macros.h"
 #include "net/base/request_priority.h"
@@ -36,4 +36,4 @@ class DevToolsNetworkTransactionFactory : public net::HttpTransactionFactory {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
diff --git a/brightray/browser/net/devtools_network_upload_data_stream.h b/brightray/browser/net/devtools_network_upload_data_stream.h
index da697374d9ec..ecc4b2c39ae9 100644
--- a/brightray/browser/net/devtools_network_upload_data_stream.h
+++ b/brightray/browser/net/devtools_network_upload_data_stream.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
-#define BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
 
 #include <stdint.h>
 
@@ -47,4 +47,4 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
diff --git a/brightray/browser/net_log.h b/brightray/browser/net_log.h
index e62c335350c7..254100ef7775 100644
--- a/brightray/browser/net_log.h
+++ b/brightray/browser/net_log.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NET_LOG_H_
-#define BROWSER_NET_LOG_H_
+#ifndef BRIGHTRAY_BROWSER_NET_LOG_H_
+#define BRIGHTRAY_BROWSER_NET_LOG_H_
 
 #include "base/files/scoped_file.h"
 #include "net/log/net_log.h"
@@ -27,4 +27,4 @@ class NetLog : public net::NetLog {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NET_LOG_H_
+#endif  // BRIGHTRAY_BROWSER_NET_LOG_H_
diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h
index 3ab3b49700ff..6f9e13e2ea48 100644
--- a/brightray/browser/network_delegate.h
+++ b/brightray/browser/network_delegate.h
@@ -76,4 +76,4 @@ class NetworkDelegate : public net::NetworkDelegate {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
diff --git a/brightray/browser/notification.h b/brightray/browser/notification.h
index a330bc25d1b8..1e47d6cdac83 100644
--- a/brightray/browser/notification.h
+++ b/brightray/browser/notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_H_
-#define BROWSER_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ -62,4 +62,4 @@ class Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_H_
diff --git a/brightray/browser/notification_delegate.h b/brightray/browser/notification_delegate.h
index 93512f71753d..c036b83bcfe0 100644
--- a/brightray/browser/notification_delegate.h
+++ b/brightray/browser/notification_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_DELEGATE_H_
-#define BROWSER_NOTIFICATION_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
 
 #include "content/public/browser/desktop_notification_delegate.h"
 
@@ -20,4 +20,4 @@ class NotificationDelegate : public content::DesktopNotificationDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
diff --git a/brightray/browser/notification_delegate_adapter.h b/brightray/browser/notification_delegate_adapter.h
index 01f3284e2b85..78a3e3c4daaa 100644
--- a/brightray/browser/notification_delegate_adapter.h
+++ b/brightray/browser/notification_delegate_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
-#define BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
 
 #include <memory>
 
@@ -35,4 +35,4 @@ class NotificationDelegateAdapter : public NotificationDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
diff --git a/brightray/browser/notification_presenter.h b/brightray/browser/notification_presenter.h
index 721ba92ace4a..93ddb1bffbcd 100644
--- a/brightray/browser/notification_presenter.h
+++ b/brightray/browser/notification_presenter.h
@@ -42,4 +42,4 @@ class NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_H_
diff --git a/brightray/browser/permission_manager.h b/brightray/browser/permission_manager.h
index 734529f06eb4..a63041fedc26 100644
--- a/brightray/browser/permission_manager.h
+++ b/brightray/browser/permission_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_PERMISSION_MANAGER_H_
-#define BROWSER_PERMISSION_MANAGER_H_
+#ifndef BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_
+#define BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
@@ -54,4 +54,4 @@ class PermissionManager : public content::PermissionManager {
 
 }  // namespace brightray
 
-#endif  // BROWSER_PERMISSION_MANAGER_H_
+#endif  // BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_
diff --git a/brightray/browser/platform_notification_service.h b/brightray/browser/platform_notification_service.h
index f9b09c64bdff..30a631cc5e84 100644
--- a/brightray/browser/platform_notification_service.h
+++ b/brightray/browser/platform_notification_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
-#define BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#ifndef BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#define BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/platform_notification_service.h"
@@ -58,4 +58,4 @@ class PlatformNotificationService
 
 }  // namespace brightray
 
-#endif  // BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#endif  // BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h
index dab7ae1e8728..f534c1a75728 100644
--- a/brightray/browser/url_request_context_getter.h
+++ b/brightray/browser/url_request_context_getter.h
@@ -120,4 +120,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
diff --git a/brightray/browser/web_ui_controller_factory.h b/brightray/browser/web_ui_controller_factory.h
index ca86de6baa65..1739466f9207 100644
--- a/brightray/browser/web_ui_controller_factory.h
+++ b/brightray/browser/web_ui_controller_factory.h
@@ -42,4 +42,4 @@ class WebUIControllerFactory : public content::WebUIControllerFactory {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_
diff --git a/brightray/common/application_info.h b/brightray/common/application_info.h
index 25b02c0d2393..ffff6ff0ab0e 100644
--- a/brightray/common/application_info.h
+++ b/brightray/common/application_info.h
@@ -10,4 +10,4 @@ std::string GetApplicationVersion();
 
 }
 
-#endif
+#endif  // BRIGHTRAY_COMMON_APPLICATION_INFO_H_
diff --git a/brightray/common/content_client.h b/brightray/common/content_client.h
index 4d1d6238c954..09df6539692f 100644
--- a/brightray/common/content_client.h
+++ b/brightray/common/content_client.h
@@ -31,4 +31,4 @@ class ContentClient : public content::ContentClient {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_COMMON_CONTENT_CLIENT_H_
diff --git a/brightray/common/mac/main_application_bundle.h b/brightray/common/mac/main_application_bundle.h
index 78e6bc200b42..555738023cfd 100644
--- a/brightray/common/mac/main_application_bundle.h
+++ b/brightray/common/mac/main_application_bundle.h
@@ -18,4 +18,4 @@ base::FilePath MainApplicationBundlePath();
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
diff --git a/brightray/common/main_delegate.h b/brightray/common/main_delegate.h
index 2f63a2fb1b1a..515e8a821db1 100644
--- a/brightray/common/main_delegate.h
+++ b/brightray/common/main_delegate.h
@@ -60,4 +60,5 @@ class MainDelegate : public content::ContentMainDelegate {
 };
 
 }  // namespace brightray
-#endif
+
+#endif  // BRIGHTRAY_COMMON_MAIN_DELEGATE_H_
diff --git a/script/cpplint.py b/script/cpplint.py
index 0c91dc06aea8..e602b3cb1e6b 100755
--- a/script/cpplint.py
+++ b/script/cpplint.py
@@ -22,10 +22,16 @@ IGNORE_FILES = [
   os.path.join('brightray', 'browser', 'mac', 'event_dispatching_window.h'),
   os.path.join('brightray', 'browser', 'mac',
                'notification_center_delegate.h'),
+  os.path.join('brightray', 'browser', 'win', 'notification_presenter_win7.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
+               'common.h'),
   os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
                'desktop_notification_controller.cc'),
   os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
-               'desktop_notification_controller.h')
+               'desktop_notification_controller.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
+               'toast.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_notification.h')
 ]
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))