diff --git a/src/video_engine/vie_base_impl.h b/src/video_engine/vie_base_impl.h
index 796971bc6c..3d914ec39f 100644
--- a/src/video_engine/vie_base_impl.h
+++ b/src/video_engine/vie_base_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
 
 #include "video_engine/include/vie_base.h"
 #include "video_engine/vie_defines.h"
@@ -69,4 +69,4 @@ class ViEBaseImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
diff --git a/src/video_engine/vie_capture_impl.h b/src/video_engine/vie_capture_impl.h
index 99880be756..fd6589d701 100644
--- a/src/video_engine/vie_capture_impl.h
+++ b/src/video_engine/vie_capture_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
 
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_capture.h"
@@ -78,4 +78,4 @@ class ViECaptureImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
diff --git a/src/video_engine/vie_capturer.h b/src/video_engine/vie_capturer.h
index 1a50e82b25..bec36f9dcd 100644
--- a/src/video_engine/vie_capturer.h
+++ b/src/video_engine/vie_capturer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
 
 #include "common_types.h"  // NOLINT
 #include "engine_configurations.h"  // NOLINT
@@ -221,4 +221,4 @@ class ViECapturer
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
diff --git a/src/video_engine/vie_channel.h b/src/video_engine/vie_channel.h
index 381b8c4ac6..eadfc3b181 100644
--- a/src/video_engine/vie_channel.h
+++ b/src/video_engine/vie_channel.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
 
 #include <list>
 
@@ -397,4 +397,4 @@ class ViEChannel
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
diff --git a/src/video_engine/vie_codec_impl.h b/src/video_engine/vie_codec_impl.h
index f017706f47..2d34540c2e 100644
--- a/src/video_engine/vie_codec_impl.h
+++ b/src/video_engine/vie_codec_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
 
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_codec.h"
@@ -78,4 +78,4 @@ class ViECodecImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
diff --git a/src/video_engine/vie_defines.h b/src/video_engine/vie_defines.h
index bc0931e101..2cc18cc7e4 100644
--- a/src/video_engine/vie_defines.h
+++ b/src/video_engine/vie_defines.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
+#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
 
 #include "engine_configurations.h"  // NOLINT
 
@@ -218,4 +218,4 @@ inline int ChannelId(const int moduleId) {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
diff --git a/src/video_engine/vie_encoder.h b/src/video_engine/vie_encoder.h
index 068bce3687..52410bf10b 100644
--- a/src/video_engine/vie_encoder.h
+++ b/src/video_engine/vie_encoder.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
 
 #include "common_types.h"  // NOLINT
 #include "typedefs.h"  //NOLINT
@@ -187,4 +187,4 @@ class ViEEncoder
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
diff --git a/src/video_engine/vie_encryption_impl.h b/src/video_engine/vie_encryption_impl.h
index 63866f3e7b..608a5abade 100644
--- a/src/video_engine/vie_encryption_impl.h
+++ b/src/video_engine/vie_encryption_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
 
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_encryption.h"
@@ -40,4 +40,4 @@ class ViEEncryptionImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
diff --git a/src/video_engine/vie_external_codec_impl.h b/src/video_engine/vie_external_codec_impl.h
index 4928ed5863..f06613f550 100644
--- a/src/video_engine/vie_external_codec_impl.h
+++ b/src/video_engine/vie_external_codec_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
 
 #include "video_engine/include/vie_external_codec.h"
 #include "video_engine/vie_ref_count.h"
@@ -47,4 +47,4 @@ class ViEExternalCodecImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
diff --git a/src/video_engine/vie_file_image.h b/src/video_engine/vie_file_image.h
index f06a120ffa..e3f229a10a 100644
--- a/src/video_engine/vie_file_image.h
+++ b/src/video_engine/vie_file_image.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
 
 #include "modules/interface/module_common_types.h"
 #include "typedefs.h"  // NOLINT
@@ -29,4 +29,4 @@ class ViEFileImage {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
diff --git a/src/video_engine/vie_file_impl.h b/src/video_engine/vie_file_impl.h
index 2e735fbf1e..29f532930d 100644
--- a/src/video_engine/vie_file_impl.h
+++ b/src/video_engine/vie_file_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
 
 #include "system_wrappers/interface/scoped_ptr.h"
 #include "typedefs.h"  // NOLINT
@@ -134,4 +134,4 @@ class ViEFileImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
diff --git a/src/video_engine/vie_file_player.h b/src/video_engine/vie_file_player.h
index d3608ac281..15ac35a4e7 100644
--- a/src/video_engine/vie_file_player.h
+++ b/src/video_engine/vie_file_player.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
 
 #include <list>
 #include <set>
@@ -135,4 +135,4 @@ class ViEFilePlayer
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
diff --git a/src/video_engine/vie_file_recorder.h b/src/video_engine/vie_file_recorder.h
index c3738f3f17..ba25ce3771 100644
--- a/src/video_engine/vie_file_recorder.h
+++ b/src/video_engine/vie_file_recorder.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
 
 #include "modules/utility/interface/file_recorder.h"
 #include "typedefs.h"  // NOLINT
@@ -62,4 +62,4 @@ class ViEFileRecorder : protected OutStream {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
diff --git a/src/video_engine/vie_frame_provider_base.h b/src/video_engine/vie_frame_provider_base.h
index c00c474e5c..2f75adb79a 100644
--- a/src/video_engine/vie_frame_provider_base.h
+++ b/src/video_engine/vie_frame_provider_base.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
 
 #include <vector>
 
@@ -99,4 +99,4 @@ class ViEFrameProviderBase {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
diff --git a/src/video_engine/vie_image_process_impl.h b/src/video_engine/vie_image_process_impl.h
index 09c0a8e8c0..4a8c5f909f 100644
--- a/src/video_engine/vie_image_process_impl.h
+++ b/src/video_engine/vie_image_process_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
 
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_image_process.h"
@@ -49,4 +49,4 @@ class ViEImageProcessImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
diff --git a/src/video_engine/vie_impl.h b/src/video_engine/vie_impl.h
index 2304490a32..ca5d903138 100644
--- a/src/video_engine/vie_impl.h
+++ b/src/video_engine/vie_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
 
 #include "engine_configurations.h"  // NOLINT
 #include "video_engine/vie_defines.h"
@@ -112,4 +112,4 @@ class VideoEngineImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
diff --git a/src/video_engine/vie_input_manager.h b/src/video_engine/vie_input_manager.h
index d71dae2334..465472d11a 100644
--- a/src/video_engine/vie_input_manager.h
+++ b/src/video_engine/vie_input_manager.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
 
 #include "modules/video_capture/main/interface/video_capture.h"
 #include "system_wrappers/interface/map_wrapper.h"
@@ -137,4 +137,4 @@ class ViEInputManagerScoped: private ViEManagerScopedBase {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
diff --git a/src/video_engine/vie_manager_base.h b/src/video_engine/vie_manager_base.h
index 18606e3dc8..088a2b8a31 100644
--- a/src/video_engine/vie_manager_base.h
+++ b/src/video_engine/vie_manager_base.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
 
 namespace webrtc {
 
@@ -72,4 +72,4 @@ class ViEManagedItemScopedBase {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
diff --git a/src/video_engine/vie_network_impl.h b/src/video_engine/vie_network_impl.h
index cc469234e9..56832df089 100644
--- a/src/video_engine/vie_network_impl.h
+++ b/src/video_engine/vie_network_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
 
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_network.h"
@@ -111,4 +111,4 @@ class ViENetworkImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
diff --git a/src/video_engine/vie_performance_monitor.h b/src/video_engine/vie_performance_monitor.h
index e4f65d6a70..1dc72ec62c 100644
--- a/src/video_engine/vie_performance_monitor.h
+++ b/src/video_engine/vie_performance_monitor.h
@@ -11,8 +11,8 @@
 // ViEPerformanceMonitor is used to check the current CPU usage and triggers a
 // callback when getting over a specified threshold.
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
 
 #include "system_wrappers/interface/scoped_ptr.h"
 #include "typedefs.h"  // NOLINT
@@ -51,4 +51,4 @@ class ViEPerformanceMonitor {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
diff --git a/src/video_engine/vie_receiver.h b/src/video_engine/vie_receiver.h
index 1537d98cff..09fbc8f39d 100644
--- a/src/video_engine/vie_receiver.h
+++ b/src/video_engine/vie_receiver.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
 
 #include <list>
 
@@ -84,4 +84,4 @@ class ViEReceiver : public UdpTransportData, public RtpData {
 
 }  // namespace webrt
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
diff --git a/src/video_engine/vie_ref_count.h b/src/video_engine/vie_ref_count.h
index 15241d4e6e..5ac9a3e97a 100644
--- a/src/video_engine/vie_ref_count.h
+++ b/src/video_engine/vie_ref_count.h
@@ -10,8 +10,8 @@
 
 // TODO(mflodman) Remove this class and use ref count class in system_wrappers.
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
 
 #include "system_wrappers/interface/scoped_ptr.h"
 
@@ -37,4 +37,4 @@ class ViERefCount {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
diff --git a/src/video_engine/vie_remb.h b/src/video_engine/vie_remb.h
index de7c28fc80..3f530a641b 100644
--- a/src/video_engine/vie_remb.h
+++ b/src/video_engine/vie_remb.h
@@ -15,8 +15,8 @@
 //    for a specified SSRC.
 
 
-#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
+#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
 
 #include <list>
 #include <map>
@@ -89,4 +89,4 @@ class VieRemb : public RemoteBitrateObserver, public Module {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
diff --git a/src/video_engine/vie_render_impl.h b/src/video_engine/vie_render_impl.h
index ec7cacee3a..c0cf9162df 100644
--- a/src/video_engine/vie_render_impl.h
+++ b/src/video_engine/vie_render_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
 
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "typedefs.h"  // NOLINT
@@ -55,4 +55,4 @@ class ViERenderImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
diff --git a/src/video_engine/vie_render_manager.h b/src/video_engine/vie_render_manager.h
index d090fbf9f5..ebdf8624d0 100644
--- a/src/video_engine/vie_render_manager.h
+++ b/src/video_engine/vie_render_manager.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
 
 #include "system_wrappers/interface/list_wrapper.h"
 #include "system_wrappers/interface/map_wrapper.h"
@@ -70,4 +70,4 @@ class ViERenderManagerScoped: private ViEManagerScopedBase {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
diff --git a/src/video_engine/vie_renderer.h b/src/video_engine/vie_renderer.h
index fc061cfc7c..dd216ea1a3 100644
--- a/src/video_engine/vie_renderer.h
+++ b/src/video_engine/vie_renderer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
 
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "system_wrappers/interface/map_wrapper.h"
@@ -113,4 +113,4 @@ class ViERenderer: public ViEFrameCallback {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
diff --git a/src/video_engine/vie_rtp_rtcp_impl.h b/src/video_engine/vie_rtp_rtcp_impl.h
index 43844fb28c..89d4c8d184 100644
--- a/src/video_engine/vie_rtp_rtcp_impl.h
+++ b/src/video_engine/vie_rtp_rtcp_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
 
 #include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "typedefs.h"  // NOLINT
@@ -116,4 +116,4 @@ class ViERTP_RTCPImpl
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
diff --git a/src/video_engine/vie_sender.h b/src/video_engine/vie_sender.h
index db41bbafc5..c9a1ef8f21 100644
--- a/src/video_engine/vie_sender.h
+++ b/src/video_engine/vie_sender.h
@@ -11,8 +11,8 @@
 // ViESender is responsible for encrypting, if enabled, packets and send to
 // network.
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_  // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_  // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
 
 #include "common_types.h"  // NOLINT
 #include "engine_configurations.h"  // NOLINT
@@ -61,4 +61,4 @@ class ViESender: public Transport {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_  // NOLINT
+#endif  // WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_