diff --git a/nfq/Makefile b/nfq/Makefile
index 783f437..7d0a947 100644
--- a/nfq/Makefile
+++ b/nfq/Makefile
@@ -5,7 +5,7 @@ CFLAGS_MAC = -mmacosx-version-min=10.8
 CFLAGS_CYGWIN = -Wno-address-of-packed-member -static
 LIBS_LINUX = -lnetfilter_queue -lnfnetlink -lz
 LIBS_BSD = -lz
-LIBS_CYGWIN = -lz -Lwindivert -lwindivert -lwlanapi -lole32 -loleaut32 -luuid
+LIBS_CYGWIN = -lz -Lwindows/windivert -Iwindows -lwindivert -lwlanapi -lole32 -loleaut32 -luuid
 SRC_FILES = *.c crypto/*.c
 
 all: nfqws
@@ -24,7 +24,7 @@ mac: $(SRC_FILES)
 	rm -f dvtwsx dvtwsa
 
 cygwin:
-	$(CC) -s $(CFLAGS) $(CFLAGS_CYGWIN) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN) winmanifest.o winicon.o
+	$(CC) -s $(CFLAGS) $(CFLAGS_CYGWIN) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN) windows/res/winmanifest.o windows/res/winicon.o
 
 clean:
 	rm -f nfqws dvtws winws.exe
diff --git a/nfq/winicon.o b/nfq/windows/res/winicon.o
similarity index 100%
rename from nfq/winicon.o
rename to nfq/windows/res/winicon.o
diff --git a/nfq/winmanifest.o b/nfq/windows/res/winmanifest.o
similarity index 100%
rename from nfq/winmanifest.o
rename to nfq/windows/res/winmanifest.o
diff --git a/nfq/windivert/libwindivert.a b/nfq/windows/windivert/libwindivert.a
similarity index 100%
rename from nfq/windivert/libwindivert.a
rename to nfq/windows/windivert/libwindivert.a
diff --git a/nfq/windivert/windivert.h b/nfq/windows/windivert/windivert.h
similarity index 100%
rename from nfq/windivert/windivert.h
rename to nfq/windows/windivert/windivert.h