From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Fri, 27 Apr 2018 11:21:39 +0000 (+0300)
Subject: Added njs_core.h
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=cd60036918646f0b92d556e3378d617e2e4cf9d4;p=njs.git

Added njs_core.h
---

diff --git a/Makefile b/Makefile
index c984e04a..8946813f 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,8 @@ $(NXT_LIB)/nxt_auto_config.h:
 
 $(NXT_BUILDDIR)/njscript.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
+	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_string.h \
 	njs/njs_object.h \
@@ -140,6 +142,7 @@ $(NXT_BUILDDIR)/njscript.o: \
 $(NXT_BUILDDIR)/njs_vm.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_string.h \
@@ -173,6 +176,7 @@ $(NXT_BUILDDIR)/njs_boolean.o: \
 $(NXT_BUILDDIR)/njs_number.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_string.h \
@@ -188,6 +192,7 @@ $(NXT_BUILDDIR)/njs_number.o: \
 $(NXT_BUILDDIR)/njs_string.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_string.h \
@@ -206,6 +211,7 @@ $(NXT_BUILDDIR)/njs_string.o: \
 $(NXT_BUILDDIR)/njs_object.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_object_hash.h \
@@ -219,6 +225,7 @@ $(NXT_BUILDDIR)/njs_object.o: \
 $(NXT_BUILDDIR)/njs_array.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_string.h \
@@ -235,6 +242,7 @@ $(NXT_BUILDDIR)/njs_array.o: \
 $(NXT_BUILDDIR)/njs_json.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_json.c \
@@ -247,6 +255,7 @@ $(NXT_BUILDDIR)/njs_json.o: \
 $(NXT_BUILDDIR)/njs_function.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_array.h \
@@ -260,6 +269,7 @@ $(NXT_BUILDDIR)/njs_function.o: \
 $(NXT_BUILDDIR)/njs_regexp.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_string.h \
 	njs/njs_object.h \
@@ -276,6 +286,7 @@ $(NXT_BUILDDIR)/njs_regexp.o: \
 $(NXT_BUILDDIR)/njs_date.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_string.h \
 	njs/njs_object.h \
@@ -290,6 +301,7 @@ $(NXT_BUILDDIR)/njs_date.o: \
 $(NXT_BUILDDIR)/njs_error.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_string.h \
 	njs/njs_object.h \
@@ -304,6 +316,7 @@ $(NXT_BUILDDIR)/njs_error.o: \
 $(NXT_BUILDDIR)/njs_math.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_math.h \
@@ -316,6 +329,7 @@ $(NXT_BUILDDIR)/njs_math.o: \
 $(NXT_BUILDDIR)/njs_time.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_time.h \
@@ -328,6 +342,7 @@ $(NXT_BUILDDIR)/njs_time.o: \
 $(NXT_BUILDDIR)/njs_module.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_module.h \
 	njs/njs_module.c \
@@ -339,6 +354,7 @@ $(NXT_BUILDDIR)/njs_module.o: \
 $(NXT_BUILDDIR)/njs_event.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_event.h \
 	njs/njs_event.c \
@@ -361,6 +377,7 @@ $(NXT_BUILDDIR)/njs_fs.o: \
 $(NXT_BUILDDIR)/njs_crypto.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_crypto.h \
 	njs/njs_crypto.c \
@@ -372,6 +389,7 @@ $(NXT_BUILDDIR)/njs_crypto.o: \
 $(NXT_BUILDDIR)/njs_extern.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_parser.h \
 	njs/njs_extern.h \
@@ -384,6 +402,7 @@ $(NXT_BUILDDIR)/njs_extern.o: \
 $(NXT_BUILDDIR)/njs_variable.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_parser.h \
 	njs/njs_variable.h \
@@ -396,6 +415,7 @@ $(NXT_BUILDDIR)/njs_variable.o: \
 $(NXT_BUILDDIR)/njs_builtin.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_boolean.h \
 	njs/njs_number.h \
@@ -415,6 +435,7 @@ $(NXT_BUILDDIR)/njs_builtin.o: \
 $(NXT_BUILDDIR)/njs_lexer.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_parser.h \
 	njs/njs_lexer.c \
@@ -439,6 +460,7 @@ $(NXT_BUILDDIR)/njs_lexer_keyword.o: \
 $(NXT_BUILDDIR)/njs_parser.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_string.h \
 	njs/njs_object.h \
@@ -454,6 +476,7 @@ $(NXT_BUILDDIR)/njs_parser.o: \
 $(NXT_BUILDDIR)/njs_parser_expression.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_object.h \
@@ -469,6 +492,7 @@ $(NXT_BUILDDIR)/njs_parser_expression.o: \
 $(NXT_BUILDDIR)/njs_generator.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_number.h \
 	njs/njs_string.h \
@@ -485,6 +509,7 @@ $(NXT_BUILDDIR)/njs_generator.o: \
 $(NXT_BUILDDIR)/njs_disassembler.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njscript.h \
+	njs/njs_core.h \
 	njs/njs_vm.h \
 	njs/njs_object.h \
 	njs/njs_parser.h \
diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index fa7a03d6..3dc12d46 100644
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -9,13 +9,6 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-
 #include <njscript.h>
 
 
diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 97d5f145..05b9b77d 100644
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -9,13 +9,6 @@
 #include <ngx_core.h>
 #include <ngx_stream.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-
 #include <njscript.h>
 
 
diff --git a/njs/njs.c b/njs/njs.c
index 4ce9e093..c83b1098 100644
--- a/njs/njs.c
+++ b/njs/njs.c
@@ -4,6 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
+#include <njs_core.h>
+#include <njs_builtin.h>
 #include <time.h>
 #include <errno.h>
 #include <string.h>
@@ -13,24 +16,6 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_djb_hash.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_object.h>
-#include <njs_builtin.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-
 #include <readline.h>
 
 
diff --git a/njs/njs_array.c b/njs/njs_array.c
index 4532e8ba..37491f7d 100644
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_boolean.c b/njs/njs_boolean.c
index 745dd4a3..aa704beb 100644
--- a/njs/njs_boolean.c
+++ b/njs/njs_boolean.c
@@ -4,21 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_boolean.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 
 
 njs_ret_t
diff --git a/njs/njs_builtin.c b/njs/njs_builtin.c
index 31a97eb5..5074b22d 100644
--- a/njs/njs_builtin.c
+++ b/njs/njs_builtin.c
@@ -4,33 +4,12 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_djb_hash.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_boolean.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_json.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_extern.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_date.h>
-#include <njs_error.h>
-#include <njs_math.h>
 #include <njs_time.h>
+#include <njs_math.h>
+#include <njs_json.h>
 #include <njs_module.h>
 #include <njs_fs.h>
 #include <njs_crypto.h>
diff --git a/njs/njs_core.h b/njs/njs_core.h
new file mode 100644
index 00000000..82e33691
--- /dev/null
+++ b/njs/njs_core.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright (C) Dmitry Volyntsev
+ * Copyright (C) NGINX, Inc.
+ */
+
+#ifndef _NJS_CORE_H_INCLUDED_
+#define _NJS_CORE_H_INCLUDED_
+
+#include <nxt_auto_config.h>
+
+#include <nxt_types.h>
+#include <nxt_clang.h>
+#include <nxt_alignment.h>
+#include <nxt_string.h>
+#include <nxt_stub.h>
+#include <nxt_utf8.h>
+#include <nxt_djb_hash.h>
+#include <nxt_trace.h>
+#include <nxt_array.h>
+#include <nxt_queue.h>
+#include <nxt_lvlhsh.h>
+#include <nxt_random.h>
+#include <nxt_time.h>
+#include <nxt_malloc.h>
+#include <nxt_mem_cache_pool.h>
+
+#include <njscript.h>
+#include <njs_vm.h>
+#include <njs_variable.h>
+#include <njs_parser.h>
+#include <njs_function.h>
+#include <njs_boolean.h>
+#include <njs_number.h>
+#include <njs_string.h>
+#include <njs_object.h>
+#include <njs_object_hash.h>
+#include <njs_array.h>
+#include <njs_error.h>
+
+#include <njs_event.h>
+
+#include <njs_extern.h>
+
+#endif /* _NJS_CORE_H_INCLUDED_ */
diff --git a/njs/njs_crypto.c b/njs/njs_crypto.c
index c00e2982..984f9d3c 100644
--- a/njs/njs_crypto.c
+++ b/njs/njs_crypto.c
@@ -4,27 +4,11 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
+#include <njs_core.h>
 #include <nxt_md5.h>
 #include <nxt_sha1.h>
 #include <nxt_sha2.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
 #include <njs_crypto.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_string.h>
-#include <njs_function.h>
-#include <njs_error.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/njs/njs_date.c b/njs/njs_date.c
index 7977e097..d43dc967 100644
--- a/njs/njs_date.c
+++ b/njs/njs_date.c
@@ -4,28 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_time.h>
-#include <nxt_malloc.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <njs_date.h>
-#include <njs_error.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/njs/njs_disassembler.c b/njs/njs_disassembler.c
index 3a406c29..8dd466a2 100644
--- a/njs/njs_disassembler.c
+++ b/njs/njs_disassembler.c
@@ -4,20 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_object.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <stdio.h>
 
 
diff --git a/njs/njs_error.c b/njs/njs_error.c
index a0f30449..34fe97d8 100644
--- a/njs/njs_error.c
+++ b/njs/njs_error.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_error.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_string.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/njs/njs_event.c b/njs/njs_event.c
index 5cc0f3d1..d2d4a57e 100644
--- a/njs/njs_event.c
+++ b/njs/njs_event.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_djb_hash.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_event.h>
-#include <njs_time.h>
+#include <njs_core.h>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/njs/njs_extern.c b/njs/njs_extern.c
index 21602645..8144bcf6 100644
--- a/njs/njs_extern.c
+++ b/njs/njs_extern.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_extern.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/njs/njs_fs.c b/njs/njs_fs.c
index 9281c577..d1a1db33 100644
--- a/njs/njs_fs.c
+++ b/njs/njs_fs.c
@@ -4,24 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_alignment.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <njs_fs.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/njs/njs_function.c b/njs/njs_function.c
index d3b55794..67a491b5 100644
--- a/njs/njs_function.c
+++ b/njs/njs_function.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index cc3ee547..689900c5 100644
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -4,24 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_json.c b/njs/njs_json.c
index 24d585ba..173e5105 100644
--- a/njs/njs_json.c
+++ b/njs/njs_json.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/njs/njs_lexer.c b/njs/njs_lexer.c
index e2cf369a..73a009c2 100644
--- a/njs/njs_lexer.c
+++ b/njs/njs_lexer.c
@@ -4,21 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_lexer_keyword.c b/njs/njs_lexer_keyword.c
index 939bde29..6933af93 100644
--- a/njs/njs_lexer_keyword.c
+++ b/njs/njs_lexer_keyword.c
@@ -4,22 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_math.c b/njs/njs_math.c
index e2e98396..ea428ca1 100644
--- a/njs/njs_math.c
+++ b/njs/njs_math.c
@@ -4,20 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_mem_cache_pool.h>
-#include <nxt_random.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <math.h>
 
 
diff --git a/njs/njs_module.c b/njs/njs_module.c
index d3dd0f2a..0c7f9025 100644
--- a/njs/njs_module.c
+++ b/njs/njs_module.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <njs_module.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/njs/njs_number.c b/njs/njs_number.c
index 161c5097..69622baf 100644
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -4,23 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
+#include <math.h>
 #include <string.h>
 #include <stdio.h>
 #include <float.h>
diff --git a/njs/njs_object.c b/njs/njs_object.c
index 1309bf34..88ad3933 100644
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_number.h>
-#include <njs_array.h>
-#include <njs_extern.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index c4c5601c..eba4a002 100644
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -4,27 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <nxt_djb_hash.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_extern.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index fbe6cb33..1b55ee72 100644
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -4,25 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 9b298f18..92954585 100644
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -4,32 +4,10 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_pcre.h>
-#include <nxt_malloc.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_regexp_pattern.h>
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/njs/njs_regexp_pattern.h b/njs/njs_regexp_pattern.h
index e05ae3c1..e14fa5c4 100644
--- a/njs/njs_regexp_pattern.h
+++ b/njs/njs_regexp_pattern.h
@@ -7,7 +7,8 @@
 #ifndef _NJS_REGEXP_PATTERN_H_INCLUDED_
 #define _NJS_REGEXP_PATTERN_H_INCLUDED_
 
-#include <pcre.h>
+#include <nxt_pcre.h>
+#include <nxt_regex.h>
 
 
 typedef enum {
diff --git a/njs/njs_string.c b/njs/njs_string.c
index 68c433d3..b438f586 100644
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -4,32 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_pcre.h>
-#include <nxt_malloc.h>
-#include <nxt_string.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_regexp_pattern.h>
 #include <string.h>
diff --git a/njs/njs_time.c b/njs/njs_time.c
index d97c80ba..23b5e73a 100644
--- a/njs/njs_time.c
+++ b/njs/njs_time.c
@@ -4,25 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_djb_hash.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_event.h>
+#include <njs_core.h>
 #include <njs_time.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index 9207c3bd..022ab858 100644
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 
diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index 206ea661..0119ec53 100644
--- a/njs/njs_vm.c
+++ b/njs/njs_vm.c
@@ -4,30 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_extern.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/njs/njs_vm.h b/njs/njs_vm.h
index beb8aba6..d1604071 100644
--- a/njs/njs_vm.h
+++ b/njs/njs_vm.h
@@ -12,6 +12,8 @@
 #include <nxt_queue.h>
 #include <nxt_regex.h>
 #include <nxt_random.h>
+#include <nxt_djb_hash.h>
+#include <nxt_mem_cache_pool.h>
 
 
 #define NJS_MAX_STACK_SIZE       (16 * 1024 * 1024)
diff --git a/njs/njscript.c b/njs/njscript.c
index 19e40730..ff1ebb3d 100644
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -4,29 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_malloc.h>
-#include <nxt_djb_hash.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
-#include <njs_event.h>
-#include <njs_time.h>
+
 #include <string.h>
 
 
diff --git a/njs/njscript.h b/njs/njscript.h
index d6fa7b50..b5ed023a 100644
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -9,9 +9,19 @@
 #ifndef _NJSCRIPT_H_INCLUDED_
 #define _NJSCRIPT_H_INCLUDED_
 
+#include <nxt_auto_config.h>
+
 #define NJS_VERSION                 "0.2.1"
 
 
+#include <nxt_types.h>
+#include <nxt_clang.h>
+#include <nxt_string.h>
+#include <nxt_stub.h>
+#include <nxt_array.h>
+#include <nxt_lvlhsh.h>
+
+
 typedef intptr_t                    njs_ret_t;
 typedef uintptr_t                   njs_index_t;
 typedef struct njs_vm_s             njs_vm_t;
diff --git a/njs/test/njs_benchmark.c b/njs/test/njs_benchmark.c
index efbf4657..4aed0567 100644
--- a/njs/test/njs_benchmark.c
+++ b/njs/test/njs_benchmark.c
@@ -4,15 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
 #include <njscript.h>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/resource.h>
 #include <time.h>
diff --git a/njs/test/njs_interactive_test.c b/njs/test/njs_interactive_test.c
index a477706c..3b3e1dfe 100644
--- a/njs/test/njs_interactive_test.c
+++ b/njs/test/njs_interactive_test.c
@@ -4,13 +4,6 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
 #include <njscript.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 3864772b..d32c76b4 100644
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -4,18 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
+#include <njs_core.h>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/resource.h>
 #include <time.h>