diff --git a/minidump/minidump_user_stream_writer.cc b/minidump/minidump_user_stream_writer.cc
index 139e8270..8401b285 100644
--- a/minidump/minidump_user_stream_writer.cc
+++ b/minidump/minidump_user_stream_writer.cc
@@ -42,7 +42,7 @@ class MinidumpUserStreamWriter::SnapshotContentsWriter final
     return snapshot_->Read(this);
   }
 
-  size_t GetSize() const override { return snapshot_ ? snapshot_->Size() : 0; };
+  size_t GetSize() const override { return snapshot_ ? snapshot_->Size() : 0; }
 
   bool MemorySnapshotDelegateRead(void* data, size_t size) override {
     return writer_->Write(data, size);
diff --git a/snapshot/crashpad_types/crashpad_info_reader.cc b/snapshot/crashpad_types/crashpad_info_reader.cc
index 527d3723..07a9b48e 100644
--- a/snapshot/crashpad_types/crashpad_info_reader.cc
+++ b/snapshot/crashpad_types/crashpad_info_reader.cc
@@ -160,29 +160,29 @@ bool CrashpadInfoReader::Initialize(const ProcessMemoryRange* memory,
     return GET_MEMBER(member);                       \
   }
 
-DEFINE_GETTER(TriState, CrashpadHandlerBehavior, crashpad_handler_behavior);
+DEFINE_GETTER(TriState, CrashpadHandlerBehavior, crashpad_handler_behavior)
 
 DEFINE_GETTER(TriState,
               SystemCrashReporterForwarding,
-              system_crash_reporter_forwarding);
+              system_crash_reporter_forwarding)
 
 DEFINE_GETTER(TriState,
               GatherIndirectlyReferencedMemory,
-              gather_indirectly_referenced_memory);
+              gather_indirectly_referenced_memory)
 
 DEFINE_GETTER(uint32_t,
               IndirectlyReferencedMemoryCap,
-              indirectly_referenced_memory_cap);
+              indirectly_referenced_memory_cap)
 
-DEFINE_GETTER(VMAddress, ExtraMemoryRanges, extra_memory_ranges);
+DEFINE_GETTER(VMAddress, ExtraMemoryRanges, extra_memory_ranges)
 
-DEFINE_GETTER(VMAddress, SimpleAnnotations, simple_annotations);
+DEFINE_GETTER(VMAddress, SimpleAnnotations, simple_annotations)
 
-DEFINE_GETTER(VMAddress, AnnotationsList, annotations_list);
+DEFINE_GETTER(VMAddress, AnnotationsList, annotations_list)
 
 DEFINE_GETTER(VMAddress,
               UserDataMinidumpStreamHead,
-              user_data_minidump_stream_head);
+              user_data_minidump_stream_head)
 
 #undef DEFINE_GETTER
 #undef GET_MEMBER
diff --git a/snapshot/elf/elf_image_reader_test.cc b/snapshot/elf/elf_image_reader_test.cc
index 0846ada4..971ed229 100644
--- a/snapshot/elf/elf_image_reader_test.cc
+++ b/snapshot/elf/elf_image_reader_test.cc
@@ -49,8 +49,8 @@
 #endif  // OS_FUCHSIA
 
 extern "C" {
-__attribute__((visibility("default"))) void
-ElfImageReaderTestExportedSymbol(){};
+__attribute__((visibility("default"))) void ElfImageReaderTestExportedSymbol() {
+}
 }  // extern "C"
 
 namespace crashpad {
diff --git a/snapshot/minidump/minidump_stream.h b/snapshot/minidump/minidump_stream.h
index 1c75cb63..4356b2c6 100644
--- a/snapshot/minidump/minidump_stream.h
+++ b/snapshot/minidump/minidump_stream.h
@@ -25,7 +25,7 @@ namespace crashpad {
 class MinidumpStream {
  public:
   MinidumpStream(uint32_t stream_type, std::vector<uint8_t> data)
-      : stream_type_(stream_type), data_(data){};
+      : stream_type_(stream_type), data_(data) {}
 
   uint32_t stream_type() const { return stream_type_; }
   const std::vector<uint8_t>& data() const { return data_; }
diff --git a/test/multiprocess.h b/test/multiprocess.h
index d0275020..9a221bb3 100644
--- a/test/multiprocess.h
+++ b/test/multiprocess.h
@@ -26,7 +26,7 @@ namespace test {
 
 namespace internal {
 struct MultiprocessInfo;
-};
+}  // namespace internal
 
 //! \brief Manages a multiprocess test.
 //!
diff --git a/test/multiprocess_exec_test.cc b/test/multiprocess_exec_test.cc
index 99a1b01f..d290efa8 100644
--- a/test/multiprocess_exec_test.cc
+++ b/test/multiprocess_exec_test.cc
@@ -72,8 +72,7 @@ TEST(MultiprocessExec, MultiprocessExecSimpleChild) {
   TestMultiprocessExec exec;
   exec.SetChildTestMainFunction("SimpleMultiprocess");
   exec.Run();
-};
-
+}
 
 CRASHPAD_CHILD_TEST_MAIN(SimpleMultiprocessReturnsNonZero) {
   return 123;
@@ -96,7 +95,7 @@ TEST(MultiprocessExec, MultiprocessExecSimpleChildReturnsNonZero) {
   exec.SetExpectedChildTermination(
       Multiprocess::TerminationReason::kTerminationNormal, 123);
   exec.Run();
-};
+}
 
 #if !defined(OS_WIN)
 
diff --git a/util/linux/memory_map.cc b/util/linux/memory_map.cc
index 4f02ce88..17fd7a3d 100644
--- a/util/linux/memory_map.cc
+++ b/util/linux/memory_map.cc
@@ -210,7 +210,7 @@ ParseResult ParseMapsLine(DelimitedFileReader* maps_file_reader,
 class SparseReverseIterator : public MemoryMap::Iterator {
  public:
   SparseReverseIterator(const std::vector<const MemoryMap::Mapping*>& mappings)
-      : mappings_(mappings), riter_(mappings_.rbegin()){};
+      : mappings_(mappings), riter_(mappings_.rbegin()) {}
 
   SparseReverseIterator() : mappings_(), riter_(mappings_.rend()) {}
 
diff --git a/util/misc/lexing.cc b/util/misc/lexing.cc
index 6c318654..5e8fa304 100644
--- a/util/misc/lexing.cc
+++ b/util/misc/lexing.cc
@@ -32,10 +32,10 @@ namespace {
   bool ConvertStringToNumber(const base::StringPiece& input, type* value) { \
     return function(input, value);                                          \
   }
-MAKE_ADAPTER(int, base::StringToInt);
-MAKE_ADAPTER(unsigned int, base::StringToUint);
-MAKE_ADAPTER(int64_t, base::StringToInt64);
-MAKE_ADAPTER(uint64_t, base::StringToUint64);
+MAKE_ADAPTER(int, base::StringToInt)
+MAKE_ADAPTER(unsigned int, base::StringToUint)
+MAKE_ADAPTER(int64_t, base::StringToInt64)
+MAKE_ADAPTER(uint64_t, base::StringToUint64)
 #undef MAKE_ADAPTER
 
 }  // namespace