diff --git a/Makefile b/Makefile
index 42ef8b08e5..783971fdbf 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ FFLIBS := avutil
 
 DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
 
-SKIPHEADERS = cmdutils_common_opts.h
+SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
 
 include $(SRC_PATH)/common.mak
 
diff --git a/libavcodec/w32pthreads.h b/compat/w32pthreads.h
similarity index 98%
rename from libavcodec/w32pthreads.h
rename to compat/w32pthreads.h
index c58da49a61..a5ff6ac258 100644
--- a/libavcodec/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
  * w32threads to pthreads wrapper
  */
 
-#ifndef AVCODEC_W32PTHREADS_H
-#define AVCODEC_W32PTHREADS_H
+#ifndef LIBAV_W32PTHREADS_H
+#define LIBAV_W32PTHREADS_H
 
 /* Build up a pthread-like API using underlying Windows API. Have only static
  * methods so as to not conflict with a potentially linked in pthread-win32
@@ -276,4 +276,4 @@ static void w32thread_init(void)
 
 }
 
-#endif /* AVCODEC_W32PTHREADS_H */
+#endif /* LIBAV_W32PTHREADS_H */
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f94b7725ee..acc2a934ff 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -679,7 +679,6 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
 SKIPHEADERS-$(CONFIG_VDA)              += vda.h
 SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
-SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
 
 EXAMPLES = api
 
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 9855b3587b..7eac335f74 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -58,7 +58,7 @@
 #if HAVE_PTHREADS
 #include <pthread.h>
 #elif HAVE_W32THREADS
-#include "w32pthreads.h"
+#include "compat/w32pthreads.h"
 #endif
 
 typedef int (action_func)(AVCodecContext *c, void *arg);
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 8631c8f5db..6ec3879667 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -36,7 +36,7 @@
 #if HAVE_PTHREADS
 #include <pthread.h>
 #elif HAVE_W32THREADS
-#include "w32pthreads.h"
+#include "compat/w32pthreads.h"
 #endif
 
 #define VP8_MAX_QUANT 127
diff --git a/libavformat/network.c b/libavformat/network.c
index 1f6bc10995..f493c29e81 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -26,7 +26,7 @@
 #if HAVE_PTHREADS
 #include <pthread.h>
 #else
-#include "libavcodec/w32pthreads.h"
+#include "compat/w32pthreads.h"
 #endif
 #endif