Clean up header files somewhat

doc/github_commits.c

@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include <curl/curl.h>
-#include <jansson.h>
+#include "jansson.h"
 
 #define BUFFER_SIZE (256 * 1024) /* 256 KB */
 

examples/simple_parse.c

@@ -22,7 +22,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include <jansson.h>
+#include "jansson.h"
 #include <stdio.h>
 #include <stdlib.h>
 

src/dump.c

@@ -19,7 +19,9 @@
 #include <unistd.h>
 #endif
 
+#include "hashtable.h"
 #include "jansson.h"
+#include "jansson_config.h"
 #include "strbuffer.h"
 #include "utf.h"
 

src/error.c

@@ -1,4 +1,7 @@
+#include "jansson.h"
 #include "jansson_private.h"
+#include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 
 void jsonp_error_init(json_error_t *error, const char *source) {

src/hashtable.c

@@ -6,7 +6,7 @@
  */
 
 #if HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #include <stdlib.h>
@@ -18,7 +18,7 @@
 
 #include "hashtable.h"
 #include "jansson_private.h" /* for container_of() */
-#include <jansson_config.h>  /* for JSON_INLINE */
+#include "jansson_config.h"  /* for JSON_INLINE */
 
 #ifndef INITIAL_HASHTABLE_ORDER
 #define INITIAL_HASHTABLE_ORDER 3

src/hashtable_seed.c

@@ -3,7 +3,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #include <stdio.h>
@@ -42,8 +42,6 @@
 #include <windows.h>
 #endif
 
-#include "jansson.h"
-
 static uint32_t buf_to_uint32(char *data) {
     size_t i;
     uint32_t result = 0;

src/load.c

@@ -9,13 +9,13 @@
 #define _GNU_SOURCE
 #endif
 
+#include "jansson_config.h"
 #include "jansson_private.h"
 
 #include <assert.h>
 #include <errno.h>
-#include <limits.h>
+#include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

src/lookup3.h

@@ -38,7 +38,7 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 #include <stdlib.h>
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #ifdef HAVE_STDINT_H

src/pack_unpack.c

@@ -7,8 +7,12 @@
  */
 
 #include "jansson.h"
+#include "jansson_config.h"
 #include "jansson_private.h"
+#include "hashtable.h"
+#include "strbuffer.h"
 #include "utf.h"
+#include <stdarg.h>
 #include <string.h>
 
 typedef struct {

src/strbuffer.c

@@ -11,6 +11,7 @@
 
 #include "strbuffer.h"
 #include "jansson_private.h"
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 

src/strconv.c

@@ -1,14 +1,16 @@
+#include "jansson_config.h"
 #include "jansson_private.h"
 #include "strbuffer.h"
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 /* need jansson_private_config.h to get the correct snprintf */
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #if JSON_HAVE_LOCALECONV

src/utf.c

@@ -6,7 +6,6 @@
  */
 
 #include "utf.h"
-#include <string.h>
 
 int utf8_encode(int32_t codepoint, char *buffer, size_t *size) {
     if (codepoint < 0)

src/utf.h

@@ -9,7 +9,7 @@
 #define UTF_H
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #include <stddef.h>

src/value.c

@@ -10,11 +10,13 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #include <math.h>
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -24,6 +26,7 @@
 
 #include "hashtable.h"
 #include "jansson.h"
+#include "jansson_config.h"
 #include "jansson_private.h"
 #include "utf.h"
 

test/bin/json_process.c

@@ -6,11 +6,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
+#include "jansson.h"
 #include <ctype.h>
-#include <jansson.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

test/suites/api/test_array.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 
 static void test_misc(void) {
     json_t *array, *five, *seven, *value;

test/suites/api/test_chaos.c

@@ -3,7 +3,7 @@
 #endif
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <stdio.h>
 #include <string.h>
 

test/suites/api/test_copy.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_copy_simple(void) {

test/suites/api/test_dump.c

@@ -7,7 +7,7 @@
 
 #include "jansson_private_config.h"
 
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

test/suites/api/test_dump_callback.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <stdlib.h>
 #include <string.h>
 

test/suites/api/test_equal.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 
 static void test_equal_simple() {
     json_t *value1, *value2;

test/suites/api/test_fixed_size.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_keylen_iterator(json_t *object) {

test/suites/api/test_load.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void file_not_found() {

test/suites/api/test_load_callback.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <stdlib.h>
 #include <string.h>
 

test/suites/api/test_loadb.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void run_tests() {

test/suites/api/test_memory_funcs.c

@@ -1,4 +1,4 @@
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 #include "util.h"

test/suites/api/test_number.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <math.h>
 
 #ifdef INFINITY

test/suites/api/test_object.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_clear() {

test/suites/api/test_pack.c

@@ -7,13 +7,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
-#include <jansson_config.h>
+#include "jansson_config.h"
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <math.h>
 #include <stdio.h>
 #include <string.h>

test/suites/api/test_simple.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_bad_args(void) {

test/suites/api/test_sprintf.c

@@ -1,5 +1,5 @@
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_sprintf() {

test/suites/api/test_unpack.c

@@ -7,7 +7,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <stdio.h>
 #include <string.h>
 

test/suites/api/test_version.c

@@ -6,7 +6,7 @@
  */
 
 #include "util.h"
-#include <jansson.h>
+#include "jansson.h"
 #include <string.h>
 
 static void test_version_str(void) {

test/suites/api/util.h

@@ -9,7 +9,7 @@
 #define UTIL_H
 
 #ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
+#include "jansson_private_config.h"
 #endif
 
 #include <stdio.h>
@@ -18,7 +18,7 @@
 #include <locale.h>
 #endif
 
-#include <jansson.h>
+#include "jansson.h"
 
 #define failhdr fprintf(stderr, "%s:%d: ", __FILE__, __LINE__)