diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 43e4011a8..0f318db90 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -559,13 +559,13 @@ set( PLAT_SDL_SOURCES
 	)
 	
 set( PLAT_UNIX_SOURCES
-	build/src/dynamicgtk.cpp
-	build/src/gtkbits.cpp
+	platform/gtk/dynamicgtk.cpp
+	platform/gtk/gtkbits.cpp
 	)
 	
 set( PLAT_OSX_SOURCES
-	build/src/SDLMain.mm
-	build/src/osxbits.mm
+	platform/macos/SDLMain.mm
+	platform/macos/osxbits.mm
 	)
 	
 set( PLAT_COCOA_SOURCES
diff --git a/source/build/src/dynamicgtk.cpp b/source/platform/gtk/dynamicgtk.cpp
similarity index 100%
rename from source/build/src/dynamicgtk.cpp
rename to source/platform/gtk/dynamicgtk.cpp
diff --git a/source/build/src/gtkbits.cpp b/source/platform/gtk/gtkbits.cpp
similarity index 100%
rename from source/build/src/gtkbits.cpp
rename to source/platform/gtk/gtkbits.cpp
diff --git a/source/build/include/gtkbits.h b/source/platform/gtk/gtkbits.h
similarity index 100%
rename from source/build/include/gtkbits.h
rename to source/platform/gtk/gtkbits.h
diff --git a/source/build/include/gtkpixdata.h b/source/platform/gtk/gtkpixdata.h
similarity index 100%
rename from source/build/include/gtkpixdata.h
rename to source/platform/gtk/gtkpixdata.h
diff --git a/source/build/include/gtkpixdata_shim.h b/source/platform/gtk/gtkpixdata_shim.h
similarity index 100%
rename from source/build/include/gtkpixdata_shim.h
rename to source/platform/gtk/gtkpixdata_shim.h
diff --git a/source/build/src/SDLMain.mm b/source/platform/macos/SDLMain.mm
similarity index 100%
rename from source/build/src/SDLMain.mm
rename to source/platform/macos/SDLMain.mm
diff --git a/source/build/include/osxbits.h b/source/platform/macos/osxbits.h
similarity index 100%
rename from source/build/include/osxbits.h
rename to source/platform/macos/osxbits.h
diff --git a/source/build/src/osxbits.mm b/source/platform/macos/osxbits.mm
similarity index 100%
rename from source/build/src/osxbits.mm
rename to source/platform/macos/osxbits.mm
diff --git a/source/build/include/osxmain.h b/source/platform/macos/osxmain.h
similarity index 100%
rename from source/build/include/osxmain.h
rename to source/platform/macos/osxmain.h