diff --git a/po/POTFILES.in b/po/POTFILES.in
index a8b9fb24249c0051918ec6743b84ea1aa47849e7..03682b231e4940f77835bd1b6da2b9672a93eee4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -79,7 +79,6 @@ src/config/cmdline.c
 src/config/configuration.h
 src/config/core.c
 src/config/dirs_macos.c
-src/config/dirs_win.c
 src/config/dirs_xdg.c
 src/config/file.c
 src/config/intf.c
@@ -163,7 +162,6 @@ src/misc/update.c
 src/misc/update.h
 src/misc/variables.c
 src/misc/variables.h
-src/misc/win32_specific.c
 src/misc/xml.c
 src/missing.c
 src/modules/cache.c
@@ -180,7 +178,6 @@ src/network/rootbind.c
 src/network/tcp.c
 src/network/tls.c
 src/network/udp.c
-src/network/winsock.c
 src/osd/osd.c
 src/osd/osd_text.c
 src/osd/osd_widgets.c
diff --git a/src/Makefile.am b/src/Makefile.am
index c20f17a990d76163d2d04a644db633d506ab5240..7d6dee72db36fc374850d2d6afe54bb7a4c1a4aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -279,10 +279,10 @@ SOURCES_libvlc_linux = \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
-	config/dirs_win.c \
-	misc/w32thread.c \
-	misc/win32_specific.c \
-	network/winsock.c \
+	win32/dirs.c \
+	win32/specific.c \
+	win32/thread.c \
+	win32/winsock.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
diff --git a/src/config/dirs_win.c b/src/win32/dirs.c
similarity index 100%
rename from src/config/dirs_win.c
rename to src/win32/dirs.c
diff --git a/src/misc/win32_specific.c b/src/win32/specific.c
similarity index 99%
rename from src/misc/win32_specific.c
rename to src/win32/specific.c
index e341bae9bd0dd120dbe8dd29bec7e6f3b09b2044..ea8a504fe8bcec7bbab97ac93daf9c4ada1fd324 100644
--- a/src/misc/win32_specific.c
+++ b/src/win32/specific.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
- * win32_specific.c: Win32 specific features
+ * specific.c: Win32 specific initilization
  *****************************************************************************
  * Copyright (C) 2001-2004 the VideoLAN team
- * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@videolan.org>
diff --git a/src/misc/w32thread.c b/src/win32/thread.c
similarity index 99%
rename from src/misc/w32thread.c
rename to src/win32/thread.c
index 234ef8becbef3b9f06a1ecbdeb35f7024df9fe91..f231e496f8415e990c9b29e34fc272c16818f482 100644
--- a/src/misc/w32thread.c
+++ b/src/win32/thread.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
- * w32thread.c : Win32 back-end for LibVLC
+ * thread.c : Win32 back-end for LibVLC
  *****************************************************************************
  * Copyright (C) 1999-2009 the VideoLAN team
- * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
diff --git a/src/network/winsock.c b/src/win32/winsock.c
similarity index 100%
rename from src/network/winsock.c
rename to src/win32/winsock.c