From a4af4a66b2ce7e35b51944192e1045b16c8b082c Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 14 Mar 2018 00:36:12 +0100
Subject: [PATCH] miniupnpc: cleanup includes in upnpcommands.h

see #289
---
 miniupnpc/upnpc.c        | 3 ++-
 miniupnpc/upnpcommands.c | 5 +++--
 miniupnpc/upnpcommands.h | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/miniupnpc/upnpc.c b/miniupnpc/upnpc.c
index e4698a5..94917ee 100644
--- a/miniupnpc/upnpc.c
+++ b/miniupnpc/upnpc.c
@@ -1,4 +1,4 @@
-/* $Id: upnpc.c,v 1.117 2017/05/26 15:26:55 nanard Exp $ */
+/* $Id: upnpc.c,v 1.119 2018/03/13 23:34:46 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
  * Copyright (c) 2005-2018 Thomas Bernard
@@ -20,6 +20,7 @@
 #include "miniwget.h"
 #include "miniupnpc.h"
 #include "upnpcommands.h"
+#include "portlistingparse.h"
 #include "upnperrors.h"
 #include "miniupnpcstrings.h"
 
diff --git a/miniupnpc/upnpcommands.c b/miniupnpc/upnpcommands.c
index 9f70449..b6a693a 100644
--- a/miniupnpc/upnpcommands.c
+++ b/miniupnpc/upnpcommands.c
@@ -1,8 +1,8 @@
-/* $Id: upnpcommands.c,v 1.46 2015/07/15 12:19:00 nanard Exp $ */
+/* $Id: upnpcommands.c,v 1.49 2018/03/13 23:34:47 nanard Exp $ */
 /* vim: tabstop=4 shiftwidth=4 noexpandtab
  * Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005-2017 Thomas Bernard
+ * Copyright (c) 2005-2018 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
@@ -12,6 +12,7 @@
 #include "upnpcommands.h"
 #include "miniupnpc.h"
 #include "portlistingparse.h"
+#include "upnpreplyparse.h"
 
 static UNSIGNED_INTEGER
 my_atoui(const char * s)
diff --git a/miniupnpc/upnpcommands.h b/miniupnpc/upnpcommands.h
index 55b7b06..0c6d501 100644
--- a/miniupnpc/upnpcommands.h
+++ b/miniupnpc/upnpcommands.h
@@ -1,14 +1,12 @@
-/* $Id: upnpcommands.h,v 1.30 2015/07/15 12:21:28 nanard Exp $ */
+/* $Id: upnpcommands.h,v 1.32 2018/03/13 23:34:47 nanard Exp $ */
 /* Miniupnp project : http://miniupnp.free.fr/
  * Author : Thomas Bernard
- * Copyright (c) 2005-2015 Thomas Bernard
+ * Copyright (c) 2005-2018 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided within this distribution */
 #ifndef UPNPCOMMANDS_H_INCLUDED
 #define UPNPCOMMANDS_H_INCLUDED
 
-#include "upnpreplyparse.h"
-#include "portlistingparse.h"
 #include "miniupnpc_declspec.h"
 #include "miniupnpctypes.h"
 
@@ -24,6 +22,8 @@
 extern "C" {
 #endif
 
+struct PortMappingParserData;
+
 MINIUPNP_LIBSPEC UNSIGNED_INTEGER
 UPNP_GetTotalBytesSent(const char * controlURL,
 					const char * servicetype);