diff --git a/GpApp/Android.mk b/GpApp/Android.mk
index 6225bb7..3359f87 100644
--- a/GpApp/Android.mk
+++ b/GpApp/Android.mk
@@ -15,75 +15,7 @@ LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0 -DGP_ZLIB_BUILTIN=1
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \
-	About.cpp	\
-	AnimCursor.cpp	\
-	AppleEvents.cpp	\
-	Banner.cpp	\
-	ColorUtils.cpp	\
-	Coordinates.cpp	\
-	DialogUtils.cpp	\
-	DynamicMaps.cpp	\
-	Dynamics.cpp	\
-	Dynamics2.cpp	\
-	Dynamics3.cpp	\
-	Environ.cpp	\
-	Events.cpp	\
-	FileError.cpp	\
-	GameOver.cpp	\
-	GpAppInterface.cpp	\
-	Grease.cpp	\
-	HighScores.cpp	\
-	House.cpp	\
-	HouseInfo.cpp	\
-	HouseIO.cpp	\
-	HouseLegal.cpp	\
-	Input.cpp	\
-	Interactions.cpp	\
-	InterfaceInit.cpp	\
-	Link.cpp	\
-	Main.cpp	\
-	MainMenuUI.cpp	\
-	MainWindow.cpp	\
-	Map.cpp	\
-	Marquee.cpp	\
-	Menu.cpp	\
-	Modes.cpp	\
-	Music.cpp	\
-	ObjectAdd.cpp	\
-	ObjectDraw.cpp	\
-	ObjectDraw2.cpp	\
-	ObjectDrawAll.cpp	\
-	ObjectEdit.cpp	\
-	ObjectInfo.cpp	\
-	ObjectRects.cpp	\
-	Objects.cpp	\
-	Play.cpp	\
-	Player.cpp	\
-	Prefs.cpp	\
-	RectUtils.cpp	\
-	Render.cpp	\
-	Room.cpp	\
-	RoomGraphics.cpp	\
-	RoomInfo.cpp	\
-	RubberBands.cpp	\
-	SavedGames.cpp	\
-	Scoreboard.cpp	\
-	Scrap.cpp	\
-	SelectHouse.cpp	\
-	Settings.cpp	\
-	Sound.cpp	\
-	SoundSync_Cpp11.cpp	\
-	SourceExport.cpp	\
-	StringUtils.cpp	\
-	StructuresInit.cpp	\
-	StructuresInit2.cpp	\
-	Tools.cpp	\
-	Transit.cpp	\
-	Transitions.cpp	\
-	Triggers.cpp	\
-	Trip.cpp	\
-	Utilities.cpp	\
-	WindowUtils.cpp
+	GpApp_Combined.cpp
 
 LOCAL_STATIC_LIBRARIES := PortabilityLayer
 
diff --git a/GpShell/Android.mk b/GpShell/Android.mk
index d45af9c..ea38797 100644
--- a/GpShell/Android.mk
+++ b/GpShell/Android.mk
@@ -13,13 +13,6 @@ LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \
-	GpAppEnvironment.cpp	\
-	GpAudioDriverFactory.cpp	\
-	GpDisplayDriverFactory.cpp	\
-	GpFontHandlerFactory.cpp	\
-	GpGlobalConfig.cpp	\
-	GpInputDriverFactory.cpp	\
-	GpMain.cpp	\
-	GpVOSEventQueue.cpp
+	GpShell_Combined.cpp
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/PortabilityLayer/Android.mk b/PortabilityLayer/Android.mk
index 18452c0..a01634f 100644
--- a/PortabilityLayer/Android.mk
+++ b/PortabilityLayer/Android.mk
@@ -17,92 +17,7 @@ LOCAL_EXPORT_LDLIBS := -lz
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \
-	AntiAliasTable.cpp	\
-	AppEventHandler.cpp	\
-	BinHex4.cpp	\
-	BitmapImage.cpp	\
-	ByteSwap.cpp	\
-	CFileStream.cpp	\
-	DeflateCodec.cpp	\
-	DialogManager.cpp	\
-	DisplayDeviceManager.cpp	\
-	EllipsePlotter.cpp	\
-	FileBrowserUI.cpp	\
-	FileManager.cpp	\
-	FileSectionStream.cpp	\
-	FontFamily.cpp	\
-	FontManager.cpp	\
-	FontRenderer.cpp	\
-	GPArchive.cpp	\
-	HostSuspendHook.cpp	\
-	IconLoader.cpp	\
-	InflateStream.cpp	\
-	InputManager.cpp	\
-	LinePlotter.cpp	\
-	MacBinary2.cpp	\
-	MacFileInfo.cpp	\
-	MacFileMem.cpp	\
-	MemoryManager.cpp	\
-	MemReaderStream.cpp	\
-	MenuManager.cpp	\
-	MMBlock.cpp	\
-	MMHandleBlock.cpp	\
-	PLApplication.cpp	\
-	PLButtonWidget.cpp	\
-	PLControlDefinitions.cpp	\
-	PLCore.cpp	\
-	PLCTabReducer.cpp	\
-	PLDialogs.cpp	\
-	PLDrivers.cpp	\
-	PLEditboxWidget.cpp	\
-	PLEventQueue.cpp	\
-	PLHacks.cpp	\
-	PLHandle.cpp	\
-	PLIconWidget.cpp	\
-	PLImageWidget.cpp	\
-	PLInvisibleWidget.cpp	\
-	PLKeyEncoding.cpp	\
-	PLLabelWidget.cpp	\
-	PLMenus.cpp	\
-	PLMovies.cpp	\
-	PLNumberFormatting.cpp	\
-	PLPopupMenuWidget.cpp	\
-	PLQDOffscreen.cpp	\
-	PLQDraw.cpp	\
-	PLResourceManager.cpp	\
-	PLResources.cpp	\
-	PLScrollBarWidget.cpp	\
-	PLSound.cpp	\
-	PLStandardColors.cpp	\
-	PLStringCompare.cpp	\
-	PLSysCalls.cpp	\
-	PLTimeTaggedVOSEvent.cpp	\
-	PLWidgets.cpp	\
-	QDGraf.cpp	\
-	QDManager.cpp	\
-	QDPictDecoder.cpp	\
-	QDPictEmitContext.cpp	\
-	QDPictHeader.cpp	\
-	QDPixMap.cpp	\
-	QDPort.cpp	\
-	QDStandardPalette.cpp	\
-	RandomNumberGenerator.cpp	\
-	ResolveCachingColor.cpp	\
-	ResourceCompiledRef.cpp	\
-	ResourceFile.cpp	\
-	ScanlineMask.cpp	\
-	ScanlineMaskBuilder.cpp	\
-	ScanlineMaskConverter.cpp	\
-	ScanlineMaskIterator.cpp	\
-	SimpleGraphic.cpp	\
-	TextPlacer.cpp	\
-	UTF8.cpp	\
-	UTF16.cpp	\
-	WindowDef.cpp	\
-	WindowManager.cpp	\
-	WorkerThread.cpp	\
-	XModemCRC.cpp	\
-	ZipFileProxy.cpp
+	PortabilityLayer_Combined.cpp
 	
 
 LOCAL_STATIC_LIBRARIES := MacRomanConversion stb