fix up conflict due to sync mistake

src/include/field.h

@@ -10,7 +10,9 @@
 #ifndef __FIELD_H__
 #define __FIELD_H__
 
+#include "constant_time.h"
 #include "f_field.h"
+#include <string.h>
 
 /** @brief Bytes in a field element */
 #define FIELD_BYTES          (1+(FIELD_BITS-1)/8)

src/include/word.h

@@ -5,11 +5,12 @@
 #ifndef __WORD_H__
 #define __WORD_H__
 
-#include "arch_config.h"
-
 /* for posix_memalign */
 #define _XOPEN_SOURCE 600
 
+#include "arch_config.h"
+
+
 #ifndef __APPLE__
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE 1