From b22c57a16f12a4e11e18358b270b1a1ec32edc12 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sun, 2 Jul 2023 16:56:41 +0100
Subject: [PATCH] Dont require special build flags for just one header

---
 Makefile               | 1 -
 include/n2n_typedefs.h | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c4204e1..2457a43 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,6 @@ LDLIBS+=-ln2n
 LDLIBS+=$(LDLIBS_EXTRA)
 
 ifeq ($(CONFIG_TARGET),mingw)
-CFLAGS+=-I. -I./win32
 LDLIBS+=$(abspath win32/n2n_win32.a)
 LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
 N2N_DEPS+=win32/n2n_win32.a
diff --git a/include/n2n_typedefs.h b/include/n2n_typedefs.h
index 0b34f32..303e1b4 100644
--- a/include/n2n_typedefs.h
+++ b/include/n2n_typedefs.h
@@ -52,8 +52,8 @@ typedef int ssize_t;
 
 typedef unsigned long in_addr_t;
 
-#include "n2n_win32.h"
-// FIXME - the above include is from a different subdir
+#include "../win32/n2n_win32.h"
+// FIXME - continue untangling the build and includes - dont have a ".." here
 
 #endif /* #if defined(_MSC_VER) || defined(__MINGW32__) */