diff --git a/daemon/src/video/shm_header.h b/daemon/src/video/shm_header.h
index ccd76c090..713e6c06d 100644
--- a/daemon/src/video/shm_header.h
+++ b/daemon/src/video/shm_header.h
@@ -44,8 +44,10 @@ struct SHMHeader {
 
     unsigned buffer_gen;
     int buffer_size;
+    /* The header will be aligned on 16-bit boundaries */
+    char padding[8];
 
-    char data[0];
+    char data[];
 };
 
 #endif
diff --git a/gnome/src/video/shm_header.h b/gnome/src/video/shm_header.h
index b2efbac0c..1d7a6c6a3 100644
--- a/gnome/src/video/shm_header.h
+++ b/gnome/src/video/shm_header.h
@@ -44,8 +44,10 @@ typedef struct {
 
     unsigned buffer_gen;
     int buffer_size;
+    /* The header will be aligned on 16-bit boundaries */
+    char padding[8];
 
-    char data[0];
+    char data[];
 } SHMHeader;
 
 #endif