Reorder includes

src/aec.c

@@ -47,12 +47,12 @@
  *
  */
 
+#include "config.h"
+#include "libaec.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "libaec.h"
-
 #define CHUNK 10485760
 
 int get_param(unsigned int *param, int *iarg, char *argv[])

src/decode.c

@@ -48,15 +48,15 @@
  *
  */
 
+#include "config.h"
+#include "decode.h"
+#include "libaec.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "decode.h"
-#include "libaec.h"
-
 #if HAVE_BSR64
-#  include <intrin.h>
+#include <intrin.h>
 #endif
 
 #define ROS 5

src/decode.h

@@ -51,9 +51,9 @@
 #ifndef DECODE_H
 #define DECODE_H 1
 
-#include <config.h>
-
+#include "config.h"
 #include <stdint.h>
+#include <stddef.h>
 
 #define M_CONTINUE 1
 #define M_EXIT 0

src/encode.c

@@ -48,13 +48,13 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "config.h"
 #include "encode.h"
 #include "encode_accessors.h"
 #include "libaec.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 static int m_get_block(struct aec_stream *strm);
 

src/encode.h

@@ -51,8 +51,7 @@
 #ifndef ENCODE_H
 #define ENCODE_H 1
 
-#include <config.h>
-
+#include "config.h"
 #include <stdint.h>
 
 #define M_CONTINUE 1

src/encode_accessors.c

@@ -47,13 +47,12 @@
  *
  */
 
-#include <config.h>
-
+#include "config.h"
+#include "encode_accessors.h"
+#include "encode.h"
+#include "libaec.h"
 #include <stdint.h>
 #include <string.h>
-#include "libaec.h"
-#include "encode.h"
-#include "encode_accessors.h"
 
 uint32_t aec_get_8(struct aec_stream *strm)
 {

src/encode_accessors.h

@@ -51,7 +51,7 @@
 #define ENCODE_ACCESSORS_H 1
 
 #include "config.h"
-
+#include "libaec.h"
 #include <stdint.h>
 
 uint32_t aec_get_8(struct aec_stream *strm);

src/sz_compat.c

+#include "config.h"
+#include "szlib.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
-#include "szlib.h"
 
 #define NOPTS 129
 #define MIN(a, b) (((a) < (b))? (a): (b))

src/szlib.h

 #ifndef SZLIB_H
 #define SZLIB_H 1
 
+#include "config.h"
 #include "libaec.h"
 
-#define SZ_ALLOW_K13_OPTION_MASK         1
-#define SZ_CHIP_OPTION_MASK              2
-#define SZ_EC_OPTION_MASK                4
-#define SZ_LSB_OPTION_MASK               8
-#define SZ_MSB_OPTION_MASK              16
-#define SZ_NN_OPTION_MASK               32
-#define SZ_RAW_OPTION_MASK             128
+#define SZ_ALLOW_K13_OPTION_MASK 1
+#define SZ_CHIP_OPTION_MASK 2
+#define SZ_EC_OPTION_MASK 4
+#define SZ_LSB_OPTION_MASK 8
+#define SZ_MSB_OPTION_MASK 16
+#define SZ_NN_OPTION_MASK 32
+#define SZ_RAW_OPTION_MASK 128
 
 #define SZ_OK AEC_OK
 #define SZ_OUTBUFF_FULL 2