Add includes and split off json_types.h to help ensure that headers can be included in any order.

json_object.h

@@ -33,16 +33,10 @@
 #define JSON_C_CONST_FUNCTION(func) func
 #endif
 
-#ifndef JSON_EXPORT
-#if defined(_MSC_VER)
-#define JSON_EXPORT __declspec(dllexport)
-#else
-#define JSON_EXPORT extern
-#endif
-#endif
-
 #include "json_inttypes.h"
+#include "json_types.h"
 #include "printbuf.h"
+
 #include <stddef.h>
 
 #ifdef __cplusplus
@@ -136,50 +130,6 @@ extern "C" {
  */
 #define JSON_C_OPTION_THREAD (1)
 
-/**
- * A structure to use with json_object_object_foreachC() loops.
- * Contains key, val and entry members.
- */
-struct json_object_iter
-{
-	char *key;
-	struct json_object *val;
-	struct lh_entry *entry;
-};
-typedef struct json_object_iter json_object_iter;
-
-typedef int json_bool;
-
-/**
- * @brief The core type for all type of JSON objects handled by json-c
- */
-typedef struct json_object json_object;
-
-/**
- * Type of custom user delete functions.  See json_object_set_serializer.
- */
-typedef void(json_object_delete_fn)(struct json_object *jso, void *userdata);
-
-/**
- * Type of a custom serialization function.  See json_object_set_serializer.
- */
-typedef int(json_object_to_json_string_fn)(struct json_object *jso, struct printbuf *pb, int level,
-                                           int flags);
-
-/* supported object types */
-
-typedef enum json_type
-{
-	/* If you change this, be sure to update json_type_to_name() too */
-	json_type_null,
-	json_type_boolean,
-	json_type_double,
-	json_type_int,
-	json_type_object,
-	json_type_array,
-	json_type_string
-} json_type;
-
 /* reference counting functions */
 
 /**