diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 9ed149610a18..b2c56b29bdfc 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.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 ATOM_VERSION_H
-#define ATOM_VERSION_H
+#ifndef ATOM_COMMON_ATOM_VERSION_H_
+#define ATOM_COMMON_ATOM_VERSION_H_
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 3
@@ -38,6 +38,7 @@
 #define ATOM_VERSION_AT_LEAST(major, minor, patch) \
   (( (major) < ATOM_MAJOR_VERSION) \
   || ((major) == ATOM_MAJOR_VERSION && (minor) < ATOM_MINOR_VERSION) \
-  || ((major) == ATOM_MAJOR_VERSION && (minor) == ATOM_MINOR_VERSION && (patch) <= ATOM_PATCH_VERSION))
+  || ((major) == ATOM_MAJOR_VERSION && (minor) == ATOM_MINOR_VERSION \
+      && (patch) <= ATOM_PATCH_VERSION))
 
-#endif /* ATOM_VERSION_H */
+#endif  // ATOM_COMMON_ATOM_VERSION_H_
diff --git a/script/cpplint.py b/script/cpplint.py
index d647bed2de41..7ec3537e8da6 100755
--- a/script/cpplint.py
+++ b/script/cpplint.py
@@ -7,21 +7,13 @@ import sys
 from lib.util import execute
 
 IGNORE_FILES = [
-  os.path.join('atom', 'app', 'atom_main.cc'),
   os.path.join('atom', 'browser', 'mac', 'atom_application.h'),
   os.path.join('atom', 'browser', 'mac', 'atom_application_delegate.h'),
-  os.path.join('atom', 'browser', 'native_window_mac.h'),
   os.path.join('atom', 'browser', 'resources', 'win', 'resource.h'),
-  os.path.join('atom', 'browser', 'ui', 'cocoa', 'event_processing_window.h'),
   os.path.join('atom', 'browser', 'ui', 'cocoa', 'atom_menu_controller.h'),
-  os.path.join('atom', 'browser', 'ui', 'gtk', 'gtk_custom_menu.cc'),
-  os.path.join('atom', 'browser', 'ui', 'gtk', 'gtk_custom_menu_item.cc'),
   os.path.join('atom', 'common', 'api', 'api_messages.h'),
-  os.path.join('atom', 'common', 'api', 'atom_extensions.h'),
-  os.path.join('atom', 'common', 'atom_version.h'),
   os.path.join('atom', 'common', 'common_message_generator.cc'),
   os.path.join('atom', 'common', 'common_message_generator.h'),
-  os.path.join('atom', 'common', 'swap_or_assign.h'),
 ]
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))