diff --git a/atom/browser/api/atom_api_debugger.cc b/atom/browser/api/atom_api_debugger.cc
index 7cf5e41a93..85aed107ca 100644
--- a/atom/browser/api/atom_api_debugger.cc
+++ b/atom/browser/api/atom_api_debugger.cc
@@ -206,4 +206,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize)
diff --git a/atom/browser/api/atom_api_desktop_capturer.cc b/atom/browser/api/atom_api_desktop_capturer.cc
index f388345934..ae2e64b935 100644
--- a/atom/browser/api/atom_api_desktop_capturer.cc
+++ b/atom/browser/api/atom_api_desktop_capturer.cc
@@ -232,4 +232,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize)
diff --git a/atom/browser/api/atom_api_download_item.cc b/atom/browser/api/atom_api_download_item.cc
index 337274fa34..8bb61ec592 100644
--- a/atom/browser/api/atom_api_download_item.cc
+++ b/atom/browser/api/atom_api_download_item.cc
@@ -251,4 +251,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize)
diff --git a/atom/browser/api/atom_api_power_save_blocker.cc b/atom/browser/api/atom_api_power_save_blocker.cc
index 532bc7e270..ae11ffc565 100644
--- a/atom/browser/api/atom_api_power_save_blocker.cc
+++ b/atom/browser/api/atom_api_power_save_blocker.cc
@@ -151,4 +151,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize);
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize)
diff --git a/atom/browser/api/atom_api_system_preferences.cc b/atom/browser/api/atom_api_system_preferences.cc
index bf957bb2c5..b34c7b571b 100644
--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@@ -130,4 +130,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize);
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize)
diff --git a/native_mate/native_mate/constructor.h b/native_mate/native_mate/constructor.h
index 8f165e629d..da5ffddb6d 100644
--- a/native_mate/native_mate/constructor.h
+++ b/native_mate/native_mate/constructor.h
@@ -23,9 +23,9 @@ inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*()>& callback) {
   return callback.Run();
-};
+}
 
-template<typename P1>
+template <typename P1>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1)>& callback) {
@@ -33,9 +33,9 @@ inline WrappableBase* InvokeFactory(
   if (!GetNextArgument(args, 0, true, &a1))
     return nullptr;
   return callback.Run(a1);
-};
+}
 
-template<typename P1, typename P2>
+template <typename P1, typename P2>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1, P2)>& callback) {
@@ -45,9 +45,9 @@ inline WrappableBase* InvokeFactory(
       !GetNextArgument(args, 0, false, &a2))
     return nullptr;
   return callback.Run(a1, a2);
-};
+}
 
-template<typename P1, typename P2, typename P3>
+template <typename P1, typename P2, typename P3>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1, P2, P3)>& callback) {
@@ -59,9 +59,9 @@ inline WrappableBase* InvokeFactory(
       !GetNextArgument(args, 0, false, &a3))
     return nullptr;
   return callback.Run(a1, a2, a3);
-};
+}
 
-template<typename P1, typename P2, typename P3, typename P4>
+template <typename P1, typename P2, typename P3, typename P4>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1, P2, P3, P4)>& callback) {
@@ -75,9 +75,9 @@ inline WrappableBase* InvokeFactory(
       !GetNextArgument(args, 0, false, &a4))
     return nullptr;
   return callback.Run(a1, a2, a3, a4);
-};
+}
 
-template<typename P1, typename P2, typename P3, typename P4, typename P5>
+template <typename P1, typename P2, typename P3, typename P4, typename P5>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1, P2, P3, P4, P5)>& callback) {
@@ -93,10 +93,14 @@ inline WrappableBase* InvokeFactory(
       !GetNextArgument(args, 0, false, &a5))
     return nullptr;
   return callback.Run(a1, a2, a3, a4, a5);
-};
+}
 
-template<typename P1, typename P2, typename P3, typename P4, typename P5,
-    typename P6>
+template <typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6>
 inline WrappableBase* InvokeFactory(
     Arguments* args,
     const base::Callback<WrappableBase*(P1, P2, P3, P4, P5, P6)>& callback) {
@@ -114,11 +118,12 @@ inline WrappableBase* InvokeFactory(
       !GetNextArgument(args, 0, false, &a6))
     return nullptr;
   return callback.Run(a1, a2, a3, a4, a5, a6);
-};
+}
 
-template<typename Sig>
+template <typename Sig>
 void InvokeNew(const base::Callback<Sig>& factory,
-               v8::Isolate* isolate, Arguments* args) {
+               v8::Isolate* isolate,
+               Arguments* args) {
   if (!args->IsConstructCall()) {
     args->ThrowError("Requires constructor call");
     return;