From dbd7540a0476118a831cdc326dc7471f86fb1b9c Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 28 Dec 2017 20:50:49 +0300
Subject: [PATCH] Removed duplicate declaration.

---
 src/nxt_application.c     | 2 +-
 src/nxt_application.h     | 2 --
 src/nxt_conf_validation.c | 2 +-
 src/nxt_go.c              | 2 +-
 src/nxt_http.h            | 3 ---
 src/nxt_main_process.c    | 2 +-
 src/nxt_python_wsgi.c     | 2 +-
 src/nxt_router.h          | 2 ++
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/nxt_application.c b/src/nxt_application.c
index e77a9796..69f68616 100644
--- a/src/nxt_application.c
+++ b/src/nxt_application.c
@@ -8,10 +8,10 @@
 
 #include <nxt_main.h>
 #include <nxt_runtime.h>
-#include <nxt_application.h>
 #include <nxt_main_process.h>
 #include <nxt_router.h>
 #include <nxt_http.h>
+#include <nxt_application.h>
 
 #include <glob.h>
 
diff --git a/src/nxt_application.h b/src/nxt_application.h
index a9a1d5d3..664e831b 100644
--- a/src/nxt_application.h
+++ b/src/nxt_application.h
@@ -115,8 +115,6 @@ typedef struct {
 } nxt_app_request_t;
 
 
-typedef struct nxt_http_request_s   nxt_http_request_t;
-
 typedef struct nxt_app_parse_ctx_s  nxt_app_parse_ctx_t;
 
 struct nxt_app_parse_ctx_s {
diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 05d0a021..a0b2664c 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -6,7 +6,7 @@
 
 #include <nxt_main.h>
 #include <nxt_conf.h>
-#include <nxt_application.h>
+#include <nxt_router.h>
 
 
 typedef struct {
diff --git a/src/nxt_go.c b/src/nxt_go.c
index 329a3cd3..294c608b 100644
--- a/src/nxt_go.c
+++ b/src/nxt_go.c
@@ -5,7 +5,7 @@
  */
 
 #include <nxt_main.h>
-#include <nxt_application.h>
+#include <nxt_router.h>
 
 
 static nxt_int_t nxt_go_init(nxt_task_t *task, nxt_common_app_conf_t *conf);
diff --git a/src/nxt_http.h b/src/nxt_http.h
index c6704d68..e857ded4 100644
--- a/src/nxt_http.h
+++ b/src/nxt_http.h
@@ -46,9 +46,6 @@ typedef struct {
 } nxt_http_request_state_t;
 
 
-typedef struct nxt_http_request_s   nxt_http_request_t;
-
-
 typedef struct {
     nxt_http_request_parse_t        parser;
 
diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index 68d50aa1..3e4c8123 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -9,7 +9,7 @@
 #include <nxt_port.h>
 #include <nxt_main_process.h>
 #include <nxt_conf.h>
-#include <nxt_application.h>
+#include <nxt_router.h>
 
 
 typedef struct {
diff --git a/src/nxt_python_wsgi.c b/src/nxt_python_wsgi.c
index ae0a60d9..ccdf49a5 100644
--- a/src/nxt_python_wsgi.c
+++ b/src/nxt_python_wsgi.c
@@ -13,7 +13,7 @@
 
 #include <nxt_main.h>
 #include <nxt_runtime.h>
-#include <nxt_application.h>
+#include <nxt_router.h>
 
 /*
  * According to "PEP 3333 / A Note On String Types"
diff --git a/src/nxt_router.h b/src/nxt_router.h
index 08505fb7..1370262c 100644
--- a/src/nxt_router.h
+++ b/src/nxt_router.h
@@ -11,6 +11,8 @@
 #include <nxt_main.h>
 #include <nxt_runtime.h>
 #include <nxt_main_process.h>
+
+typedef struct nxt_http_request_s   nxt_http_request_t;
 #include <nxt_application.h>