diff --git a/common/basectx.cc b/common/basectx.cc
index f271f0f3..da33eecc 100644
--- a/common/basectx.cc
+++ b/common/basectx.cc
@@ -21,8 +21,8 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "design_utils.h"
 #include "context.h"
+#include "design_utils.h"
 #include "log.h"
 
 NEXTPNR_NAMESPACE_BEGIN
diff --git a/common/context.cc b/common/context.cc
index c85f40de..05c1e094 100644
--- a/common/context.cc
+++ b/common/context.cc
@@ -19,8 +19,8 @@
 
 #include "context.h"
 
-#include "nextpnr_namespaces.h"
 #include "log.h"
+#include "nextpnr_namespaces.h"
 #include "util.h"
 
 NEXTPNR_NAMESPACE_BEGIN
diff --git a/common/nextpnr.cc b/common/nextpnr.cc
index f8914ea5..7e3d1e00 100644
--- a/common/nextpnr.cc
+++ b/common/nextpnr.cc
@@ -18,8 +18,8 @@
  */
 
 #if defined(__wasm)
-#include <typeinfo>
 #include <exception>
+#include <typeinfo>
 #include "log.h"
 
 extern "C" {
diff --git a/common/property.cc b/common/property.cc
index 945462f8..76cb8bf8 100644
--- a/common/property.cc
+++ b/common/property.cc
@@ -36,7 +36,6 @@ Property::Property(const std::string &strval) : is_string(true), str(strval), in
 
 Property::Property(State bit) : is_string(false), str(std::string("") + char(bit)), intval(bit == S1) {}
 
-
 std::string Property::to_string() const
 {
     if (is_string) {