Fix include path and include order in src/nat (patch by LRN)

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 50edd5f77edf4d0e0d5719dd018e16b845aa9aed..af06528dbe7caf087fbd2e4f79df90fd71dda47f 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -20,7 +20,6 @@ libgnunetnat_la_SOURCES = \
   nat.c 
 
 libgnunetnat_la_CFLAGS = \
- -I$(top_scrdir)/include \
  -DDEBUG_UPNP -g -O0
 
 libgnunetnat_la_LIBADD = \

diff --git a/src/nat/upnp.c b/src/nat/upnp.c
index 23168d20a5bb97513bf71bafeddb376933a806dc..4435741a0b6bbc85b133a9171fa375e9a3a0456c 100644 (file)
--- a/src/nat/upnp.c
+++ b/src/nat/upnp.c
@@ -30,13 +30,14 @@
  *
  * @author Milan Bouchet-Valat
  */
+#include "platform.h"
+#include "gnunet_common.h"
+
 #include <stdlib.h>
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
-#include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_nat_lib.h"
 #include "nat.h"
 #include "upnp-discover.h"