diff --git a/filament/backend/include/private/backend/CommandStream.h b/filament/backend/include/private/backend/CommandStream.h
index 1e2366d3bb..ded56bb8fb 100644
--- a/filament/backend/include/private/backend/CommandStream.h
+++ b/filament/backend/include/private/backend/CommandStream.h
@@ -34,11 +34,11 @@
 #include <utils/compiler.h>
 #include <utils/ThreadUtils.h>
 
+#include <cstddef>
 #include <functional>
 #include <tuple>
 #include <thread>
 #include <utility>
-#include <cstddef>
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/libs/image/src/ImageSampler.cpp b/libs/image/src/ImageSampler.cpp
index 6832483722..98073c4894 100644
--- a/libs/image/src/ImageSampler.cpp
+++ b/libs/image/src/ImageSampler.cpp
@@ -38,7 +38,7 @@ struct FilterFunction {
     bool rejectExternalSamples = true;
 };
 
-constexpr float MM_PIf = float(filament::math::F_PI);
+constexpr float M_PIf = float(filament::math::F_PI);
 
 const FilterFunction Box {
     .fn = [](float t) { return t <= 0.5f ? 1.0f : 0.0f; },
@@ -50,7 +50,7 @@ const FilterFunction Nearest { Box.fn, 0.0f };
 const FilterFunction Gaussian {
     .fn = [](float t) {
         if (t >= 2.0) return 0.0f;
-        const float scale = 1.0f / std::sqrt(0.5f * MM_PIf);
+        const float scale = 1.0f / std::sqrt(0.5f * M_PIf);
         return std::exp(-2.0f * t * t) * scale;
     },
     .boundingRadius = 2
@@ -86,7 +86,7 @@ const FilterFunction Mitchell {
 // Not bothering with a fast approximation since we cache results for each row.
 float sinc(float t) {
     if (t <= 0.00001f) return 1.0f;
-    return std::sin(MM_PIf * t) / (MM_PIf * t);
+    return std::sin(M_PIf * t) / (M_PIf * t);
 }
 
 const FilterFunction Lanczos {
diff --git a/libs/ktxreader/src/Ktx2Reader.cpp b/libs/ktxreader/src/Ktx2Reader.cpp
index 2d2faa7f95..622e023522 100644
--- a/libs/ktxreader/src/Ktx2Reader.cpp
+++ b/libs/ktxreader/src/Ktx2Reader.cpp
@@ -21,8 +21,8 @@
 
 #include <utils/Log.h>
 
-#include <vector>
 #include <atomic>
+#include <vector>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warray-bounds"