diff --git a/include/dwarfs/filesystem_v2.h b/include/dwarfs/filesystem_v2.h
index 390974eb..8b8161c2 100644
--- a/include/dwarfs/filesystem_v2.h
+++ b/include/dwarfs/filesystem_v2.h
@@ -33,8 +33,8 @@
 
 #include <sys/types.h>
 
-#include <folly/dynamic.h>
 #include <folly/Expected.h>
+#include <folly/dynamic.h>
 
 #include "dwarfs/metadata_types.h"
 
diff --git a/include/dwarfs/metadata_v2.h b/include/dwarfs/metadata_v2.h
index f12fde1c..dfc55ca2 100644
--- a/include/dwarfs/metadata_v2.h
+++ b/include/dwarfs/metadata_v2.h
@@ -34,9 +34,9 @@
 
 #include <sys/types.h>
 
-#include <folly/dynamic.h>
 #include <folly/Expected.h>
 #include <folly/Range.h>
+#include <folly/dynamic.h>
 
 #include "dwarfs/metadata_types.h"
 
@@ -69,9 +69,7 @@ class metadata_v2 {
     impl_->dump(os, detail_level, icb);
   }
 
-  folly::dynamic as_dynamic() const {
-    return impl_->as_dynamic();
-  }
+  folly::dynamic as_dynamic() const { return impl_->as_dynamic(); }
 
   static void get_stat_defaults(struct ::stat* defaults);
 
diff --git a/src/dwarfs/block_manager.cpp b/src/dwarfs/block_manager.cpp
index 99d22f8b..9276c27f 100644
--- a/src/dwarfs/block_manager.cpp
+++ b/src/dwarfs/block_manager.cpp
@@ -500,4 +500,5 @@ block_manager::block_manager(logger& lgr, progress& prog, const config& cfg,
                              filesystem_writer& fsw)
     : impl_(make_unique_logging_object<impl, block_manager_, logger_policies>(
           lgr, prog, cfg, os, fsw)) {}
+
 } // namespace dwarfs
diff --git a/src/dwarfs/metadata_v2.cpp b/src/dwarfs/metadata_v2.cpp
index e897dd83..96cea9c8 100644
--- a/src/dwarfs/metadata_v2.cpp
+++ b/src/dwarfs/metadata_v2.cpp
@@ -504,10 +504,8 @@ folly::dynamic metadata_<LoggerPolicy>::as_dynamic() const {
   struct ::statvfs stbuf;
   statvfs(&stbuf);
 
-  obj["statvfs"] = folly::dynamic::object
-    ("f_bsize", stbuf.f_bsize)
-    ("f_files", stbuf.f_files)
-    ("f_blocks", stbuf.f_blocks);
+  obj["statvfs"] = folly::dynamic::object("f_bsize", stbuf.f_bsize)(
+      "f_files", stbuf.f_files)("f_blocks", stbuf.f_blocks);
 
   obj["root"] = as_dynamic(root_);
 
diff --git a/src/dwarfsck.cpp b/src/dwarfsck.cpp
index 1a602178..e5a56a2b 100644
--- a/src/dwarfsck.cpp
+++ b/src/dwarfsck.cpp
@@ -24,8 +24,8 @@
 
 #include <boost/program_options.hpp>
 
-#include <folly/json.h>
 #include <folly/String.h>
+#include <folly/json.h>
 
 #include "dwarfs/filesystem_v2.h"
 #include "dwarfs/logger.h"
diff --git a/test/dwarfs_compat.cpp b/test/dwarfs_compat.cpp
index 4f11d216b..fabce58a 100644
--- a/test/dwarfs_compat.cpp
+++ b/test/dwarfs_compat.cpp
@@ -150,12 +150,12 @@ char const* reference = R"(
 }
 )";
 
-std::vector<std::string> versions {
-  "0.2.0",
-  "0.2.3",
+std::vector<std::string> versions{
+    "0.2.0",
+    "0.2.3",
 };
 
-}
+} // namespace
 
 using namespace dwarfs;
 
@@ -164,7 +164,8 @@ class compat : public testing::TestWithParam<std::string> {};
 TEST_P(compat, backwards_compatibility) {
   std::ostringstream oss;
   stream_logger lgr(oss);
-  auto filename = std::string(TEST_DATA_DIR "/compat-v") + GetParam() + ".dwarfs";
+  auto filename =
+      std::string(TEST_DATA_DIR "/compat-v") + GetParam() + ".dwarfs";
   filesystem_v2 fs(lgr, std::make_shared<mmap>(filename));
   auto meta = fs.metadata_as_dynamic();
   auto ref = folly::parseJson(reference);