diff --git a/sw/airborne/boards/bebop/mt9v117.c b/sw/airborne/boards/bebop/mt9v117.c
index 3fd2a04e48..d308deaa50 100644
--- a/sw/airborne/boards/bebop/mt9v117.c
+++ b/sw/airborne/boards/bebop/mt9v117.c
@@ -174,7 +174,7 @@ struct mt9v117_patch_t {
   uint16_t len;
 };
 
-const static struct mt9v117_patch_t mt9v117_patch_lines[MT9V117_PATCH_LINE_NUM] = {
+static const struct mt9v117_patch_t mt9v117_patch_lines[MT9V117_PATCH_LINE_NUM] = {
     {patch_line1, sizeof(patch_line1)},
     {patch_line2, sizeof(patch_line2)},
     {patch_line3, sizeof(patch_line3)},
diff --git a/sw/airborne/modules/computer_vision/lib/encoding/jpeg.c b/sw/airborne/modules/computer_vision/lib/encoding/jpeg.c
index 888ca7597c..606ed29ba5 100644
--- a/sw/airborne/modules/computer_vision/lib/encoding/jpeg.c
+++ b/sw/airborne/modules/computer_vision/lib/encoding/jpeg.c
@@ -121,27 +121,27 @@ static uint8_t *jpeg_huffman(JPEG_ENCODER_STRUCTURE *, uint16_t, uint8_t *);
 
 static uint8_t *jpeg_close_bitstream(JPEG_ENCODER_STRUCTURE *, uint8_t *);
 
-const static uint16_t luminance_dc_code_table [] = {
+static const uint16_t luminance_dc_code_table [] = {
   0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006,
   0x000E, 0x001E, 0x003E, 0x007E, 0x00FE, 0x01FE
 };
 
-const static uint16_t luminance_dc_size_table [] = {
+static const uint16_t luminance_dc_size_table [] = {
   0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003,
   0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009
 };
 
-const static uint16_t chrominance_dc_code_table [] = {
+static const uint16_t chrominance_dc_code_table [] = {
   0x0000, 0x0001, 0x0002, 0x0006, 0x000E, 0x001E,
   0x003E, 0x007E, 0x00FE, 0x01FE, 0x03FE, 0x07FE
 };
 
-const static uint16_t chrominance_dc_size_table [] = {
+static const uint16_t chrominance_dc_size_table [] = {
   0x0002, 0x0002, 0x0002, 0x0003, 0x0004, 0x0005,
   0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B
 };
 
-const static uint16_t luminance_ac_code_table [] = {
+static const uint16_t luminance_ac_code_table [] = {
   0x000A,
   0x0000, 0x0001, 0x0004, 0x000B, 0x001A, 0x0078, 0x00F8, 0x03F6, 0xFF82, 0xFF83,
   0x000C, 0x001B, 0x0079, 0x01F6, 0x07F6, 0xFF84, 0xFF85, 0xFF86, 0xFF87, 0xFF88,
@@ -162,7 +162,7 @@ const static uint16_t luminance_ac_code_table [] = {
   0x07F9
 };
 
-const static uint16_t luminance_ac_size_table [] = {
+static const uint16_t luminance_ac_size_table [] = {
   0x0004,
   0x0002, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007, 0x0008, 0x000A, 0x0010, 0x0010,
   0x0004, 0x0005, 0x0007, 0x0009, 0x000B, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010,
@@ -183,7 +183,7 @@ const static uint16_t luminance_ac_size_table [] = {
   0x000B
 };
 
-const static uint16_t chrominance_ac_code_table [] = {
+static const uint16_t chrominance_ac_code_table [] = {
   0x0000,
   0x0001, 0x0004, 0x000A, 0x0018, 0x0019, 0x0038, 0x0078, 0x01F4, 0x03F6, 0x0FF4,
   0x000B, 0x0039, 0x00F6, 0x01F5, 0x07F6, 0x0FF5, 0xFF88, 0xFF89, 0xFF8A, 0xFF8B,
@@ -204,7 +204,7 @@ const static uint16_t chrominance_ac_code_table [] = {
   0x03FA
 };
 
-const static uint16_t chrominance_ac_size_table [] = {
+static const uint16_t chrominance_ac_size_table [] = {
   0x0002,
   0x0002, 0x0003, 0x0004, 0x0005, 0x0005, 0x0006, 0x0007, 0x0009, 0x000A, 0x000C,
   0x0004, 0x0006, 0x0008, 0x0009, 0x000B, 0x000C, 0x0010, 0x0010, 0x0010, 0x0010,
@@ -225,7 +225,7 @@ const static uint16_t chrominance_ac_size_table [] = {
   0x000A
 };
 
-const static uint8_t bitsize [] = {
+static const uint8_t bitsize [] = {
   0, 1, 2, 2, 3, 3, 3, 3,
   4, 4, 4, 4, 4, 4, 4, 4,
   5, 5, 5, 5, 5, 5, 5, 5,
@@ -260,7 +260,7 @@ const static uint8_t bitsize [] = {
   8, 8, 8, 8, 8, 8, 8, 8
 };
 
-const static uint8_t markerdata [] = {
+static const uint8_t markerdata [] = {
   0xFF, 0xC4, 0x00, 0x1F, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
 
   0xFF, 0xC4, 0x00, 0xB5, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA,
@@ -271,7 +271,7 @@ const static uint8_t markerdata [] = {
 };
 
 
-const static uint8_t zigzag_table [] = {
+static const uint8_t zigzag_table [] = {
   0,  1,   5,  6, 14, 15, 27, 28,
   2,  4,   7, 13, 16, 26, 29, 42,
   3,  8,  12, 17, 25, 30, 41, 43,