diff --git a/src/input.h b/src/input.h
index 4a3fe79ed1d..0e7007c9d03 100644
--- a/src/input.h
+++ b/src/input.h
@@ -25,8 +25,8 @@ namespace input {
   std::shared_ptr<input_t> alloc(safe::mail_t mail);
 
   struct touch_port_t: public platf::touch_port_t {
-    int env_height;
     int env_width;
+    int env_height;
 
     // Offset x and y coordinates of the client
     float client_offsetX;
@@ -35,8 +35,8 @@ namespace input {
     float scalar_inv;
     float scalar_tpcoords;
 
-    int env_logical_height;
     int env_logical_width;
+    int env_logical_height;
 
     explicit operator bool() const {
       return width != 0 && height != 0 && env_width != 0 && env_height != 0;
diff --git a/src/platform/common.h b/src/platform/common.h
index 744aa168b0a..8829341ce55 100644
--- a/src/platform/common.h
+++ b/src/platform/common.h
@@ -270,12 +270,10 @@ namespace platf {
   struct touch_port_t {
     int offset_x;
     int offset_y;
-
-    int height;
     int width;
-
-    int logical_height;
+    int height;
     int logical_width;
+    int logical_height;
   };
 
   // These values must match Limelight-internal.h's SS_FF_* constants!
@@ -541,18 +539,14 @@ namespace platf {
     // Offsets for when streaming a specific monitor. By default, they are 0.
     int offset_x;
     int offset_y;
-
-    int env_height;
     int env_width;
-
-    int env_logical_height;
+    int env_height;
     int env_logical_width;
-
-    int height;
+    int env_logical_height;
     int width;
-
-    int logical_height;
+    int height;
     int logical_width;
+    int logical_height;
 
   protected:
     // collect capture timing data (at loglevel debug)
diff --git a/src/platform/linux/cuda.h b/src/platform/linux/cuda.h
index ac30c29e2f1..2353a088af5 100644
--- a/src/platform/linux/cuda.h
+++ b/src/platform/linux/cuda.h
@@ -69,9 +69,8 @@ namespace cuda {
   stream_t make_stream(int flags = 0);
 
   struct viewport_t {
-    int height;
     int width;
-
+    int height;
     int offsetX;
     int offsetY;
   };
diff --git a/src/platform/linux/graphics.h b/src/platform/linux/graphics.h
index 6dcdd191a76..7abbdc0b7e4 100644
--- a/src/platform/linux/graphics.h
+++ b/src/platform/linux/graphics.h
@@ -266,10 +266,10 @@ namespace egl {
 
   class cursor_t: public platf::img_t {
   public:
-    int src_h;
-    int src_w;
     int x;
     int y;
+    int src_w;
+    int src_h;
 
     unsigned long serial;
 
@@ -331,10 +331,10 @@ namespace egl {
     gl::program_t program[3];
     gl::buffer_t color_matrix;
 
-    int out_height;
     int out_width;
-    int in_height;
+    int out_height;
     int in_width;
+    int in_height;
     int offsetX;
     int offsetY;
 
diff --git a/src/platform/linux/kmsgrab.cpp b/src/platform/linux/kmsgrab.cpp
index 6e9d47885c8..ce0f7b76c7c 100644
--- a/src/platform/linux/kmsgrab.cpp
+++ b/src/platform/linux/kmsgrab.cpp
@@ -296,20 +296,20 @@ namespace platf {
     struct cursor_t {
       // Public properties used during blending
       bool visible = false;
-      std::uint32_t dst_h;
-      std::uint32_t dst_w;
-      std::uint32_t src_h;
-      std::uint32_t src_w;
       std::int32_t x;
       std::int32_t y;
+      std::uint32_t dst_w;
+      std::uint32_t dst_h;
+      std::uint32_t src_w;
+      std::uint32_t src_h;
       std::vector<std::uint8_t> pixels;
       unsigned long serial;
 
       // Private properties used for tracking cursor changes
       std::uint64_t prop_src_x;
       std::uint64_t prop_src_y;
-      std::uint64_t prop_src_h;
       std::uint64_t prop_src_w;
+      std::uint64_t prop_src_h;
       std::uint32_t fb_id;
     };
 
@@ -1139,8 +1139,8 @@ namespace platf {
 
       std::chrono::nanoseconds delay;
 
-      int img_height;
       int img_width;
+      int img_height;
       int img_offset_x;
       int img_offset_y;
 
diff --git a/src/platform/linux/vaapi.cpp b/src/platform/linux/vaapi.cpp
index 27dd77ea94c..18d7ff48dda 100644
--- a/src/platform/linux/vaapi.cpp
+++ b/src/platform/linux/vaapi.cpp
@@ -398,8 +398,8 @@ namespace va {
     egl::sws_t sws;
     egl::nv12_t nv12;
 
-    int height;
     int width;
+    int height;
   };
 
   class va_ram_t: public va_t {
diff --git a/src/platform/windows/display.h b/src/platform/windows/display.h
index d2cf683b7e4..2fcb7dc3bbb 100644
--- a/src/platform/windows/display.h
+++ b/src/platform/windows/display.h
@@ -347,8 +347,8 @@ namespace platf::dxgi {
     winrt::Windows::Graphics::Capture::GraphicsCaptureItem item {nullptr};
     winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool frame_pool {nullptr};
     winrt::Windows::Graphics::Capture::GraphicsCaptureSession capture_session {nullptr};
-    winrt::Windows::Graphics::Capture::Direct3D11CaptureFrame consumed_frame {nullptr};
     winrt::Windows::Graphics::Capture::Direct3D11CaptureFrame produced_frame {nullptr};
+    winrt::Windows::Graphics::Capture::Direct3D11CaptureFrame consumed_frame {nullptr};
     SRWLOCK frame_lock = SRWLOCK_INIT;
     CONDITION_VARIABLE frame_present_cv;
 
diff --git a/src/video_colorspace.cpp b/src/video_colorspace.cpp
index d88d71bfffe..d155d3b9b20 100644
--- a/src/video_colorspace.cpp
+++ b/src/video_colorspace.cpp
@@ -123,8 +123,8 @@ namespace video {
   const color_t *color_vectors_from_colorspace(const sunshine_colorspace_t &colorspace, bool unorm_output) {
     constexpr auto generate_color_vectors = [](const sunshine_colorspace_t &colorspace, bool unorm_output) -> color_t {
       // "Table 4 – Interpretation of matrix coefficients (MatrixCoefficients) value" section of ITU-T H.273
-      double Kb;
       double Kr;
+      double Kb;
       switch (colorspace.colorspace) {
         case colorspace_e::rec601:
           Kr = 0.299;
@@ -143,10 +143,10 @@ namespace video {
       }
       double Kg = 1.0 - Kr - Kb;
 
-      double uv_add;
-      double uv_mult;
-      double y_add;
       double y_mult;
+      double y_add;
+      double uv_mult;
+      double uv_add;
 
       // "8.3 Matrix coefficients" section of ITU-T H.273
       if (colorspace.full_range) {