diff --git a/include/common.hpp b/include/common.hpp
index 64e9920..eeeab00 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -19,6 +19,7 @@
 
 #include_next "common.hpp"
 
+// Make binary resources work the same no matter the OS
 #undef BINARY
 #undef BINARY_START
 #undef BINARY_END
diff --git a/include/mingw-compat/Windows.h b/include/mingw-compat/Windows.h
index 3b1ea78..9a5e944 100644
--- a/include/mingw-compat/Windows.h
+++ b/include/mingw-compat/Windows.h
@@ -15,4 +15,6 @@
  * For a full copy of the GNU General Public License see the LICENSE file.
  */
 
+#pragma once
+
 #include <windows.h>
diff --git a/include/rack.hpp b/include/rack.hpp
new file mode 100644
index 0000000..60cf56f
--- /dev/null
+++ b/include/rack.hpp
@@ -0,0 +1,32 @@
+/*
+ * DISTRHO Cardinal Plugin
+ * Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of
+ * the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * For a full copy of the GNU General Public License see the LICENSE file.
+ */
+
+#pragma once
+
+#include_next "rack.hpp"
+
+// If building for Windows, make sure to import the windows header now so we can undef some stuff
+#ifdef _WIN32
+# include <windows.h>
+# undef IN
+# undef OUT
+# undef VOID
+# undef far
+# undef near
+# define ABC ABC_
+# define VOID VOID_
+#endif
diff --git a/plugins/Makefile b/plugins/Makefile
index e4a344b..67ff33f 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -175,7 +175,6 @@ PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/*.cpp)
 PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/osc/*.cpp)
 ifeq ($(WINDOWS),true)
 PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/win32/*.cpp)
-# LDFLAGS += -lws2_32 -lwinmm
 else
 PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/posix/*.cpp)
 endif
diff --git a/src/Makefile b/src/Makefile
index 4f4aa6b..3a78dbe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -132,6 +132,8 @@ ifeq ($(MACOS),true)
 LINK_FLAGS += -framework IOKit
 else ifeq ($(WINDOWS),true)
 LINK_FLAGS += -ldbghelp -lshlwapi
+# needed by JW-Modules
+EXTRA_LIBS += -lws2_32 -lwinmm
 endif
 
 # --------------------------------------------------------------