Separating private from public headers.

diff --git a/src/njs.h b/src/njs.h
index c72a996977a03807fd8e5aec4ac16a243f18f3bc..8fa3b33e4054c85edfe0a188238141f65f81f4e6 100644 (file)
--- a/src/njs.h
+++ b/src/njs.h
@@ -14,10 +14,12 @@
 #define NJS_VERSION                 "0.3.4"
 
 
+#include <unistd.h>                 /* STDOUT_FILENO, STDERR_FILENO */
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
 #include <njs_lvlhsh.h>
+#include <njs_sprintf.h>
 
 
 typedef uintptr_t                   njs_index_t;

diff --git a/src/njs_clang.h b/src/njs_clang.h
index 04b07ff5ae03f58f936aeecca83daa173b260985..f3c306af0b77dcea0817f6023ed4dfb0170598c2 100644 (file)
--- a/src/njs_clang.h
+++ b/src/njs_clang.h
@@ -10,7 +10,6 @@
 
 #include <stdarg.h>
 #include <stddef.h>       /* offsetof(). */
-#include <unistd.h>       /* NULL. */
 
 
 #define njs_inline         static inline __attribute__((always_inline))

diff --git a/src/njs_diyfp.h b/src/njs_diyfp.h
index e7190a7c19e4b242edb690f8780253b0e8e80fcb..bcfa6384210a8b07ff04a9d47982fed70b6211c6 100644 (file)
--- a/src/njs_diyfp.h
+++ b/src/njs_diyfp.h
@@ -11,9 +11,6 @@
 #ifndef _NJS_DIYFP_H_INCLUDED_
 #define _NJS_DIYFP_H_INCLUDED_
 
-#include <njs_types.h>
-#include <math.h>
-
 
 typedef struct {
     uint64_t    significand;

diff --git a/src/njs_main.h b/src/njs_main.h
index b8041ce1dff7345b662b57ff3ba9f3ae4550489b..45efcb294061d704226e24fc1975c3bd251895be 100644 (file)
--- a/src/njs_main.h
+++ b/src/njs_main.h
@@ -31,6 +31,9 @@
 #include <njs_arr.h>
 #include <njs_sprintf.h>
 
+#include <njs_pcre.h>
+#include <njs_regex.h>
+
 #include <njs_md5.h>
 #include <njs_sha1.h>
 #include <njs_sha2.h>

diff --git a/src/njs_malloc.h b/src/njs_malloc.h
index 6cd30680e5c6093c6ea9c7349e13cf92c03fd3a8..a737f14e28e1fe5aace694c5104fdb329d08039f 100644 (file)
--- a/src/njs_malloc.h
+++ b/src/njs_malloc.h
@@ -7,16 +7,6 @@
 #ifndef _NJS_MALLOC_H_INCLUDED_
 #define _NJS_MALLOC_H_INCLUDED_
 
-#include <stdlib.h>
-
-/*
- * alloca() is defined in stdlib.h in Linux, FreeBSD and MacOSX
- * and in alloca.h in Linux, Solaris and MacOSX.
- */
-#if (NJS_SOLARIS)
-#include <alloca.h>
-#endif
-
 
 #define njs_malloc(size)   malloc(size)
 #define njs_free(p)        free(p)

diff --git a/src/njs_math.h b/src/njs_math.h
index 11f8c1691a5980fb20a8f318cea8255a0ee236f1..af74ae26093de2a0c69c05f32e238c3916afb932 100644 (file)
--- a/src/njs_math.h
+++ b/src/njs_math.h
@@ -8,9 +8,6 @@
 #define _NJS_MATH_H_INCLUDED_
 
 
-#include <math.h>
-
-
 extern const njs_object_init_t  njs_math_object_init;
 
 

diff --git a/src/njs_number.h b/src/njs_number.h
index cc4a99979a28a6fcee9b88d523803068978bb20f..16b75b2e04b8c37b29e4ae1978380b574cc75174 100644 (file)
--- a/src/njs_number.h
+++ b/src/njs_number.h
@@ -8,10 +8,6 @@
 #define _NJS_NUMBER_H_INCLUDED_
 
 
-#include <njs_string.h>
-#include <math.h>
-
-
 uint32_t njs_value_to_index(const njs_value_t *value);
 double njs_number_dec_parse(const u_char **start, const u_char *end);
 uint64_t njs_number_oct_parse(const u_char **start, const u_char *end);

diff --git a/src/njs_pcre.c b/src/njs_pcre.c
index 92cc5e15bbcefea42f209770487b0e697723c81b..f3016f484a46d18a92bbaa879156a0db8439285e 100644 (file)
--- a/src/njs_pcre.c
+++ b/src/njs_pcre.c
@@ -6,7 +6,6 @@
 
 
 #include <njs_main.h>
-#include <njs_pcre.h>
 
 
 static void *njs_pcre_malloc(size_t size);

diff --git a/src/njs_regexp_pattern.h b/src/njs_regexp_pattern.h
index 12228df15555f432d08c91e766dd62a947d9f820..95716555dcd2726ad26e6689cd36ef5aa4b0a170 100644 (file)
--- a/src/njs_regexp_pattern.h
+++ b/src/njs_regexp_pattern.h
@@ -7,9 +7,6 @@
 #ifndef _NJS_REGEXP_PATTERN_H_INCLUDED_
 #define _NJS_REGEXP_PATTERN_H_INCLUDED_
 
-#include <njs_pcre.h>
-#include <njs_regex.h>
-
 
 typedef enum {
     NJS_REGEXP_BYTE = 0,

diff --git a/src/njs_string.h b/src/njs_string.h
index 01adf15a0bcccde8e7c623232513d72962ad14fb..e280e502b4b34c2c22f31349bd09ff95b9e7fadd 100644 (file)
--- a/src/njs_string.h
+++ b/src/njs_string.h
@@ -7,7 +7,6 @@
 #ifndef _NJS_STRING_H_INCLUDED_
 #define _NJS_STRING_H_INCLUDED_
 
-#include <njs_utf8.h>
 
 /*
  * nJSVM supports two string variants:

diff --git a/src/njs_types.h b/src/njs_types.h
index a47e2391f48df2973aade48d97afe9cf8b0b4378..c38cb9dcf291250a7e91c7e9531902f1cb7f7a6f 100644 (file)
--- a/src/njs_types.h
+++ b/src/njs_types.h
@@ -23,7 +23,7 @@
 
 /* u_char, u_int, int8_t, int32_t, int64_t, size_t, off_t. */
 #include <sys/types.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 
 #if (__LP64__)

diff --git a/src/njs_unix.h b/src/njs_unix.h
index 442cf8b60b213c551dde94a4cfb757a43e370936..89e8a6b7031e21199ae2a37ca0addff88606ac8c 100644 (file)
--- a/src/njs_unix.h
+++ b/src/njs_unix.h
@@ -22,17 +22,24 @@
 
 #endif /* NJS_LINUX */
 
+
 #include <errno.h>
-#include <stdarg.h>
-#include <stddef.h>                 /* offsetof() */
+#include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <math.h>
 #include <float.h>
 #include <time.h>
 #include <fcntl.h>
 
+/*
+ * alloca() is defined in stdlib.h in Linux, FreeBSD and MacOSX
+ * and in alloca.h in Linux, Solaris and MacOSX.
+ */
+#if (NJS_SOLARIS)
+#include <alloca.h>
+#endif
+
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/param.h>

diff --git a/src/njs_value.h b/src/njs_value.h
index 20c9933654d58e18f9e912bc485686d513a4c231..b59ef9e027ad6b95a976a45eb7ee6a2f779f3c85 100644 (file)
--- a/src/njs_value.h
+++ b/src/njs_value.h
@@ -8,16 +8,6 @@
 #define _NJS_VALUE_H_INCLUDED_
 
 
-#include <njs_trace.h>
-#include <njs_queue.h>
-#include <njs_regex.h>
-#include <njs_random.h>
-#include <njs_djb_hash.h>
-#include <njs_mp.h>
-
-#include <math.h>
-
-
 /*
  * The order of the enum is used in njs_vmcode_typeof()
  * and njs_object_prototype_to_string().

diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c
index 98fa96037b2ffadeae12f9f612c8d0b878713814..4692eb1d7122bb0e5631d64c01f4d98f7be7083b 100644 (file)
--- a/src/test/njs_benchmark.c
+++ b/src/test/njs_benchmark.c
@@ -5,7 +5,6 @@
  */
 
 #include <njs.h>
-#include <njs_sprintf.h>
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/src/test/njs_interactive_test.c b/src/test/njs_interactive_test.c
index a8b2738467de47bce932950277381373777de4e4..391f0ec266ecbe8ec2d9c4c598a300306883ae54 100644 (file)
--- a/src/test/njs_interactive_test.c
+++ b/src/test/njs_interactive_test.c
@@ -5,7 +5,6 @@
  */
 
 #include <njs.h>
-#include <njs_sprintf.h>
 
 #include <string.h>
 #include <sys/resource.h>