diff --git a/script/lint.sh b/script/lint.sh
index c7935875..09225c4a 100755
--- a/script/lint.sh
+++ b/script/lint.sh
@@ -3,5 +3,5 @@
 filters=-whitespace,-readability/namespace,-legal/copyright
 cpplint=externals/cpplint.py
 
-find src -type f | xargs $cpplint --root=src --filter=$filters 2>&1
+find src/compiler -type f | xargs $cpplint --root=src --filter=$filters 2>&1
 find include -type f | xargs $cpplint --root=include --filter=$filters 2>&1
diff --git a/src/compiler/build_tables/item.cc b/src/compiler/build_tables/item.cc
index 9750368c..a8743803 100644
--- a/src/compiler/build_tables/item.cc
+++ b/src/compiler/build_tables/item.cc
@@ -13,7 +13,7 @@ namespace tree_sitter {
     namespace build_tables {
         Item::Item(const Symbol &lhs, const rule_ptr rule) :
             lhs(lhs),
-            rule(rule) {};
+            rule(rule) {}
 
         bool Item::is_done() const {
             return rule_can_be_blank(rule);
diff --git a/src/compiler/generate_code/c_code.cc b/src/compiler/generate_code/c_code.cc
index 0f8ad802..52e9fe1e 100644
--- a/src/compiler/generate_code/c_code.cc
+++ b/src/compiler/generate_code/c_code.cc
@@ -60,10 +60,11 @@ namespace tree_sitter {
                         return "ts_builtin_sym_error";
                     else
                         return "ts_builtin_sym_end";
-                } else if (symbol.is_auxiliary())
+                } else if (symbol.is_auxiliary()) {
                     return "ts_aux_sym_" + symbol.name;
-                else
+                } else {
                     return "ts_sym_" + symbol.name;
+                }
             }
 
             string character_code(char character) {
diff --git a/src/compiler/parse_table.cc b/src/compiler/parse_table.cc
index cf46aef2..6f3b76df 100644
--- a/src/compiler/parse_table.cc
+++ b/src/compiler/parse_table.cc
@@ -12,7 +12,7 @@ namespace tree_sitter {
         type(type),
         symbol(symbol),
         state_index(state_index),
-        child_flags(child_flags) {};
+        child_flags(child_flags) {}
 
     ParseAction ParseAction::Error() {
         return ParseAction(ParseActionTypeError, -1, Symbol(""), {});
diff --git a/src/compiler/rules/choice.cc b/src/compiler/rules/choice.cc
index 87907396..ecc41b87 100644
--- a/src/compiler/rules/choice.cc
+++ b/src/compiler/rules/choice.cc
@@ -7,7 +7,7 @@ namespace tree_sitter  {
     using std::vector;
 
     namespace rules {
-        Choice::Choice(rule_ptr left, rule_ptr right) : left(left), right(right) {};
+        Choice::Choice(rule_ptr left, rule_ptr right) : left(left), right(right) {}
 
         rule_ptr Choice::Build(const vector<rule_ptr> &rules) {
             rule_ptr result;
diff --git a/src/compiler/rules/pattern.cc b/src/compiler/rules/pattern.cc
index 8fe3b82f..3d25069a 100644
--- a/src/compiler/rules/pattern.cc
+++ b/src/compiler/rules/pattern.cc
@@ -151,7 +151,7 @@ namespace tree_sitter {
             size_t position;
         };
 
-        Pattern::Pattern(const string &string) : value(string) {};
+        Pattern::Pattern(const string &string) : value(string) {}
 
         bool Pattern::operator==(tree_sitter::rules::Rule const &other) const {
             auto pattern = dynamic_cast<const Pattern *>(&other);
diff --git a/src/compiler/rules/seq.cc b/src/compiler/rules/seq.cc
index bd0d0690..46ecd658 100644
--- a/src/compiler/rules/seq.cc
+++ b/src/compiler/rules/seq.cc
@@ -8,7 +8,7 @@ namespace tree_sitter {
     using std::vector;
 
     namespace rules {
-        Seq::Seq(rule_ptr left, rule_ptr right) : left(left), right(right) {};
+        Seq::Seq(rule_ptr left, rule_ptr right) : left(left), right(right) {}
 
         rule_ptr Seq::Build(const std::vector<rule_ptr> &rules) {
             rule_ptr result = make_shared<Blank>();
diff --git a/src/compiler/rules/string.cc b/src/compiler/rules/string.cc
index 509ef253..8721c887 100644
--- a/src/compiler/rules/string.cc
+++ b/src/compiler/rules/string.cc
@@ -6,7 +6,7 @@ namespace tree_sitter  {
     using std::hash;
     
     namespace rules {
-        String::String(string value) : value(value) {};
+        String::String(string value) : value(value) {}
 
         bool String::operator==(const Rule &rule) const {
             const String *other = dynamic_cast<const String *>(&rule);
diff --git a/src/compiler/rules/symbol.cc b/src/compiler/rules/symbol.cc
index 2e50c45f..03729669 100644
--- a/src/compiler/rules/symbol.cc
+++ b/src/compiler/rules/symbol.cc
@@ -7,8 +7,8 @@ namespace tree_sitter  {
     using std::hash;
     
     namespace rules {
-        Symbol::Symbol(const std::string &name) : name(name), type(SymbolTypeNormal) {};
-        Symbol::Symbol(const std::string &name, SymbolType type) : name(name), type(type) {};
+        Symbol::Symbol(const std::string &name) : name(name), type(SymbolTypeNormal) {}
+        Symbol::Symbol(const std::string &name, SymbolType type) : name(name), type(type) {}
 
         bool Symbol::operator==(const Rule &rule) const {
             const Symbol *other = dynamic_cast<const Symbol *>(&rule);
diff --git a/src/compiler/rules/visitor.cc b/src/compiler/rules/visitor.cc
index e76f3f10..b583b21e 100644
--- a/src/compiler/rules/visitor.cc
+++ b/src/compiler/rules/visitor.cc
@@ -11,7 +11,7 @@
 
 namespace tree_sitter {
     namespace rules {
-        void Visitor::default_visit(const Rule *rule) {};
+        void Visitor::default_visit(const Rule *rule) {}
         void Visitor::visit(const Blank *rule) { default_visit(rule); }
         void Visitor::visit(const Symbol *rule) { default_visit(rule); }
         void Visitor::visit(const CharacterSet *rule) { default_visit(rule); }