diff --git a/build.xml b/build.xml
index 7fc51c82..8144db6d 100644
--- a/build.xml
+++ b/build.xml
@@ -153,7 +153,7 @@
 	<fileset id="lwjgl.source.fileset" dir=".">
 		<include name="build.xml" />
 		<include name="src/**" />
-		<include name="platform_build/win32_ms_cmdline/*.bat" />
+		<include name="platform_build/**/*" />
 	</fileset>
 	
 	<!-- files in the base package -->
@@ -201,7 +201,7 @@
 	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" >
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
 	    <srcfiles dir= "${lwjgl.src.native}/generated" includes="*.c"/>
-	    <srcfiles dir= "${lwjgl.src.native}/win32" includes="*.cpp"/>
+	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
 	</uptodate>	
 	
 	<uptodate property="lwjgl.fmod.built" targetfile="${lwjgl.lib}/win32/lwjgl-fmod3.dll" >
@@ -356,9 +356,20 @@
 
 	<target name="runtest" depends="all">
 		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
+		<condition property="native_path" value="libs/win32">
+			<os family="windows" />
+		</condition>
+
+		<condition property="native_path" value="libs/linux">
+			<os name="Linux" />
+		</condition>
+
+		<condition property="native_path" value="libs/macosx">
+			<os name="Mac OS X" />
+		</condition>
 		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar" fork="true">
 			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
-			<jvmarg value="-Djava.library.path=libs/linux:libs/win32:libs/macosx"/>
+			<jvmarg value="-Djava.library.path=${native_path}"/>
 		</java>
 	</target>
 
@@ -507,7 +518,7 @@
 			<class name="org.lwjgl.opengl.LinuxCanvasImplementation" />
 		</javah>
 		
-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/win32" force="yes">
+		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows" force="yes">
 			<class name="org.lwjgl.opengl.WindowsKeyboard" />
 			<class name="org.lwjgl.opengl.WindowsDirectInput8" />
 			<class name="org.lwjgl.opengl.WindowsDirectInputDevice8" />
diff --git a/platform_build/windows_ant/build.xml b/platform_build/windows_ant/build.xml
index 85f4c349..04104aac 100644
--- a/platform_build/windows_ant/build.xml
+++ b/platform_build/windows_ant/build.xml
@@ -18,9 +18,9 @@
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
 			<arg value="/I${native}\common"/>
-			<arg value="/I${native}\win32"/>
+			<arg value="/I${native}\windows"/>
 			<srcfile/>
-			<fileset dir="${native}/win32" includes="*.c"/>
+			<fileset dir="${native}/windows" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
 			<fileset dir="${native}/generated" includes="*.c"/>
 			<mapper type="glob" from="*.c" to="*.obj"/>
diff --git a/src/native/win32/LWJGL.c b/src/native/windows/LWJGL.c
similarity index 100%
rename from src/native/win32/LWJGL.c
rename to src/native/windows/LWJGL.c
diff --git a/src/native/win32/Window.h b/src/native/windows/Window.h
similarity index 100%
rename from src/native/win32/Window.h
rename to src/native/windows/Window.h
diff --git a/src/native/win32/context.c b/src/native/windows/context.c
similarity index 100%
rename from src/native/win32/context.c
rename to src/native/windows/context.c
diff --git a/src/native/win32/context.h b/src/native/windows/context.h
similarity index 100%
rename from src/native/win32/context.h
rename to src/native/windows/context.h
diff --git a/src/native/win32/dinputhelper.c b/src/native/windows/dinputhelper.c
similarity index 100%
rename from src/native/win32/dinputhelper.c
rename to src/native/windows/dinputhelper.c
diff --git a/src/native/win32/dinputhelper.h b/src/native/windows/dinputhelper.h
similarity index 100%
rename from src/native/win32/dinputhelper.h
rename to src/native/windows/dinputhelper.h
diff --git a/src/native/win32/display.c b/src/native/windows/display.c
similarity index 100%
rename from src/native/win32/display.c
rename to src/native/windows/display.c
diff --git a/src/native/win32/display.h b/src/native/windows/display.h
similarity index 100%
rename from src/native/win32/display.h
rename to src/native/windows/display.h
diff --git a/src/native/win32/extgl_wgl.c b/src/native/windows/extgl_wgl.c
similarity index 100%
rename from src/native/win32/extgl_wgl.c
rename to src/native/windows/extgl_wgl.c
diff --git a/src/native/win32/extgl_wgl.h b/src/native/windows/extgl_wgl.h
similarity index 100%
rename from src/native/win32/extgl_wgl.h
rename to src/native/windows/extgl_wgl.h
diff --git a/src/native/win32/org_lwjgl_Sys.c b/src/native/windows/org_lwjgl_Sys.c
similarity index 100%
rename from src/native/win32/org_lwjgl_Sys.c
rename to src/native/windows/org_lwjgl_Sys.c
diff --git a/src/native/win32/org_lwjgl_input_Cursor.c b/src/native/windows/org_lwjgl_input_Cursor.c
similarity index 100%
rename from src/native/win32/org_lwjgl_input_Cursor.c
rename to src/native/windows/org_lwjgl_input_Cursor.c
diff --git a/src/native/win32/org_lwjgl_opengl_Display.c b/src/native/windows/org_lwjgl_opengl_Display.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Display.c
rename to src/native/windows/org_lwjgl_opengl_Display.c
diff --git a/src/native/win32/org_lwjgl_opengl_Pbuffer.c b/src/native/windows/org_lwjgl_opengl_Pbuffer.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Pbuffer.c
rename to src/native/windows/org_lwjgl_opengl_Pbuffer.c
diff --git a/src/native/win32/org_lwjgl_opengl_Win32AWTGLCanvasPeerInfo.c b/src/native/windows/org_lwjgl_opengl_Win32AWTGLCanvasPeerInfo.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Win32AWTGLCanvasPeerInfo.c
rename to src/native/windows/org_lwjgl_opengl_Win32AWTGLCanvasPeerInfo.c
diff --git a/src/native/win32/org_lwjgl_opengl_Win32ContextImplementation.c b/src/native/windows/org_lwjgl_opengl_Win32ContextImplementation.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Win32ContextImplementation.c
rename to src/native/windows/org_lwjgl_opengl_Win32ContextImplementation.c
diff --git a/src/native/win32/org_lwjgl_opengl_Win32DisplayPeerInfo.c b/src/native/windows/org_lwjgl_opengl_Win32DisplayPeerInfo.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Win32DisplayPeerInfo.c
rename to src/native/windows/org_lwjgl_opengl_Win32DisplayPeerInfo.c
diff --git a/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c b/src/native/windows/org_lwjgl_opengl_Win32PeerInfo.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c
rename to src/native/windows/org_lwjgl_opengl_Win32PeerInfo.c
diff --git a/src/native/win32/org_lwjgl_opengl_Win32Registry.c b/src/native/windows/org_lwjgl_opengl_Win32Registry.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_Win32Registry.c
rename to src/native/windows/org_lwjgl_opengl_Win32Registry.c
diff --git a/src/native/win32/org_lwjgl_opengl_WindowsDirectInput3.c b/src/native/windows/org_lwjgl_opengl_WindowsDirectInput3.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_WindowsDirectInput3.c
rename to src/native/windows/org_lwjgl_opengl_WindowsDirectInput3.c
diff --git a/src/native/win32/org_lwjgl_opengl_WindowsDirectInput8.c b/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_WindowsDirectInput8.c
rename to src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
diff --git a/src/native/win32/org_lwjgl_opengl_WindowsDirectInputDevice3.c b/src/native/windows/org_lwjgl_opengl_WindowsDirectInputDevice3.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_WindowsDirectInputDevice3.c
rename to src/native/windows/org_lwjgl_opengl_WindowsDirectInputDevice3.c
diff --git a/src/native/win32/org_lwjgl_opengl_WindowsDirectInputDevice8.c b/src/native/windows/org_lwjgl_opengl_WindowsDirectInputDevice8.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_WindowsDirectInputDevice8.c
rename to src/native/windows/org_lwjgl_opengl_WindowsDirectInputDevice8.c
diff --git a/src/native/win32/org_lwjgl_opengl_WindowsKeyboard.c b/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c
similarity index 100%
rename from src/native/win32/org_lwjgl_opengl_WindowsKeyboard.c
rename to src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c
diff --git a/src/native/win32/win32_al.c b/src/native/windows/win32_al.c
similarity index 100%
rename from src/native/win32/win32_al.c
rename to src/native/windows/win32_al.c