diff --git a/include/QF/GL/extensions.h b/include/QF/GL/extensions.h
index 8c6a2d87b..4bd6c6906 100644
--- a/include/QF/GL/extensions.h
+++ b/include/QF/GL/extensions.h
@@ -38,6 +38,7 @@
 # ifdef _WIN32
 #  include <windows.h>
 #  define GLAPIENTRY WINAPI
+#  undef LoadImage
 # else
 #  ifdef APIENTRY
 #   define GLAPIENTRY APIENTRY
diff --git a/include/winquake.h b/include/winquake.h
index f6248f27a..77a7d4c15 100644
--- a/include/winquake.h
+++ b/include/winquake.h
@@ -61,6 +61,7 @@
 
 #undef byte
 #undef shutdown
+#undef LoadImage
 
 #include "QF/qtypes.h"
 
diff --git a/libs/image/png.c b/libs/image/png.c
index cb2d25b4e..5d5a01ede 100644
--- a/libs/image/png.c
+++ b/libs/image/png.c
@@ -182,6 +182,7 @@ LoadPNG (QFile *infile)
 #else
 
 #include "QF/image.h"
+#include "QF/png.h"
 
 tex_t *
 LoadPNG (QFile *infile)