diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index bfaf5088f..285403ab8 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -61,11 +61,6 @@
 **/
 
 #include "optimized_cipher.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdint.h>
-
 
 #define opt_T(s) (0x1 & ((s->t >> 15) ^ (s->t >> 14)^ (s->t >> 10)^ (s->t >> 8)^ (s->t >> 5)^ (s->t >> 4)^ (s->t >> 1)^ s->t))
 
diff --git a/armsrc/optimized_cipher.h b/armsrc/optimized_cipher.h
index c10aea28b..6f428bf5e 100644
--- a/armsrc/optimized_cipher.h
+++ b/armsrc/optimized_cipher.h
@@ -1,6 +1,10 @@
 #ifndef OPTIMIZED_CIPHER_H
 #define OPTIMIZED_CIPHER_H
+
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
 
 /**
 * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2