diff --git a/Makefile.am b/Makefile.am
index 371d61e506cc478c43a5e45630431c25f5555eb2..68e03007d0ef143e2f965c7899b2b1f73397b994 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ libopusfile_la_SOURCES = \
 	src/internal.c src/internal.h \
 	src/opusfile.c src/stream.c
 if OS_WIN32
-libopusfile_la_SOURCES += src/win32/wsockwrapper.c
+libopusfile_la_SOURCES += src/wsockwrapper.c
 endif
 libopusfile_la_LIBADD = $(DEPS_LIBS)
 if OS_WIN32
diff --git a/src/win32/winerrno.h b/src/winerrno.h
similarity index 100%
rename from src/win32/winerrno.h
rename to src/winerrno.h
diff --git a/src/win32/wsockwrapper.c b/src/wsockwrapper.c
similarity index 100%
rename from src/win32/wsockwrapper.c
rename to src/wsockwrapper.c
diff --git a/src/win32/wsockwrapper.h b/src/wsockwrapper.h
similarity index 100%
rename from src/win32/wsockwrapper.h
rename to src/wsockwrapper.h