diff --git a/gfx/video_layout.h b/gfx/video_layout.h
index cf60f20b14..fa6262f793 100644
--- a/gfx/video_layout.h
+++ b/gfx/video_layout.h
@@ -29,10 +29,10 @@
 
 typedef struct video_layout_render_info
 {
-   video_layout_bounds_t      bounds;
-   video_layout_orientation_t orientation;
-   video_layout_color_t       color;
    void                      *video_driver_data;
+   video_layout_bounds_t      bounds;           /* float alignment */
+   video_layout_color_t       color;            /* float alignment */
+   video_layout_orientation_t orientation;      /* uint8_t alignment */
 } video_layout_render_info_t;
 
 typedef enum video_layout_led
diff --git a/gfx/video_layout/component_attr.h b/gfx/video_layout/component_attr.h
index 398a8177d7..10d25e28cc 100644
--- a/gfx/video_layout/component_attr.h
+++ b/gfx/video_layout/component_attr.h
@@ -18,7 +18,7 @@ typedef struct c_attr_image
 typedef struct c_attr_text
 {
    char               *string;
-   video_layout_text_align_t align;
+   video_layout_text_align_t align; /* enum alignment */
 } c_attr_text_t;
 
 typedef struct c_attr_counter
diff --git a/gfx/video_layout/element.h b/gfx/video_layout/element.h
index 1cd18eea78..138f1f4b35 100644
--- a/gfx/video_layout/element.h
+++ b/gfx/video_layout/element.h
@@ -7,17 +7,15 @@
 typedef struct element
 {
    char            *name;
+   component_t     *components;
+   int              components_count;
    int              state;
    int              o_bind;
    int              i_bind;
    int              i_mask;
+   video_layout_bounds_t  bounds;         /* float alignment */
+   video_layout_bounds_t  render_bounds;  /* float alignment */
    bool             i_raw;
-
-   video_layout_bounds_t  bounds;
-   video_layout_bounds_t  render_bounds;
-
-   component_t     *components;
-   int              components_count;
 } element_t;
 
 void element_init              (element_t *elem, const char *name, int components_count);
diff --git a/gfx/video_layout/scope.h b/gfx/video_layout/scope.h
index e8f6932fac..52d6aca108 100644
--- a/gfx/video_layout/scope.h
+++ b/gfx/video_layout/scope.h
@@ -10,8 +10,6 @@ typedef struct param param_t;
 
 typedef struct scope
 {
-   int        level;
-
    param_t   *param;
 
    element_t *elements;
@@ -20,6 +18,8 @@ typedef struct scope
    view_t    *groups;
    int        groups_count;
 
+   int        level;
+
    char       eval[SCOPE_BUFFER_SIZE];
 } scope_t;