merged trunk into branch, reverted Cruise Singleton changes

svn-id: r51961

256 files changed, 8398 insertions, 17247 deletions

diff --git a/backends/platform/PalmOS/Rsc/Resource.Frk/Starter.rsrc b/backends/platform/PalmOS/Rsc/Resource.Frk/Starter.rsrc
deleted file mode 100644
index 70f74412e7..0000000000
--- a/backends/platform/PalmOS/Rsc/Resource.Frk/Starter.rsrc
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/Starter.rsrc b/backends/platform/PalmOS/Rsc/Starter.rsrc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/backends/platform/PalmOS/Rsc/Starter.rsrc
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/StarterRsc.h b/backends/platform/PalmOS/Rsc/StarterRsc.h
deleted file mode 100644
index fba46b310b..0000000000
--- a/backends/platform/PalmOS/Rsc/StarterRsc.h
+++ /dev/null
@@ -1,395 +0,0 @@
-#ifndef STARTERRSC_H
-#define STARTERRSC_H
-
-//	Header generated by Constructor for Palm OS (R) 1.9.1
-//
-//	Generated at 12:00:06  on samedi 25 août 2007
-//
-//	Generated for file: Starter.rsrc
-//
-//	THIS IS AN AUTOMATICALLY GENERATED HEADER FILE
-//	DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST
-//
-//	Palm App Name:			"ScummVM"
-//
-//	Palm App Version:		"1.0"
-
-
-//	Resource: tFRM 1000
-#define MainForm                                  1000	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 160, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 1000, Default Button ID = 0)
-#define MainCardsButton                           1003	//(Left Origin = 135, Top Origin = 1, Width = 12, Height = 12, Usable = 1, Anchor Left = 1, Frame = 0, Non-bold Frame = 0, Font = Standard)
-#define MainAboutButton                           1012	//(Left Origin = 148, Top Origin = 1, Width = 12, Height = 12, Usable = 1, Anchor Left = 1, Frame = 0, Non-bold Frame = 1, Font = Standard)
-#define MainMSBitMap                              1100	//(Left Origin = 135, Top Origin = 1, Bitmap Resource ID = 1100, Usable = 0)
-#define MainMSNoneBitMap                          1110	//(Left Origin = 135, Top Origin = 1, Bitmap Resource ID = 1110, Usable = 0)
-#define MainUnnamed1010BitMap                     2000	//(Left Origin = 148, Top Origin = 1, Bitmap Resource ID = 2000, Usable = 1)
-
-//	Resource: tFRM 1200
-#define SkinsForm                                 1200	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 1203)
-#define SkinsOKButton                             1202	//(Left Origin = 5, Top Origin = 139, Width = 32, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define SkinsCancelButton                         1203	//(Left Origin = 43, Top Origin = 139, Width = 32, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define SkinsDeleteButton                         1205	//(Left Origin = 119, Top Origin = 139, Width = 32, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define SkinsBeamButton                           1206	//(Left Origin = 81, Top Origin = 139, Width = 32, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define SkinsSoundClickCheckbox                   1204	//(Left Origin = 5, Top Origin = 118, Width = 93, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define SkinsSkinList                             1201	//(Left Origin = 5, Top Origin = 17, Width = 146, Usable = 1, Font = Standard, Visible Items = 9)
-
-//	Resource: tFRM 1500
-#define CardSlotForm                              1500	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define CardSlotOkButton                          1510	//(Left Origin = 3, Top Origin = 140, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define CardSlotCancelButton                      1511	//(Left Origin = 44, Top Origin = 140, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-
-//	Resource: tFRM 2700
-#define MiscForm                                  2700	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define MiscOKButton                              2710	//(Left Origin = 5, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define MiscCancelButton                          2711	//(Left Origin = 46, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-
-//	Resource: tFRM 2000
-#define ConvertForm                               2000	//(Left Origin = 34, Top Origin = 64, Width = 91, Height = 32, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define ConvertUnnamed2001Label                   2001	//(Left Origin = 7, Top Origin = 4, Usable = 1, Font = Standard)
-#define ConvertUnnamed2002Label                   2002	//(Left Origin = 16, Top Origin = 16, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 2100
-#define BeamForm                                  2100	//(Left Origin = 2, Top Origin = 72, Width = 156, Height = 86, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define BeamSendButton                            2105	//(Left Origin = 5, Top Origin = 69, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define BeamCancelButton                          2106	//(Left Origin = 47, Top Origin = 69, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define BeamMathlibCheckbox                       2101	//(Left Origin = 4, Top Origin = 28, Width = 55, Height = 12, Usable = 1, Selected = 1, Group ID = 0, Font = Standard)
-#define BeamGamesCheckbox                         2103	//(Left Origin = 4, Top Origin = 40, Width = 86, Height = 12, Usable = 1, Selected = 1, Group ID = 0, Font = Standard)
-#define BeamSkinCheckbox                          2104	//(Left Origin = 4, Top Origin = 52, Width = 84, Height = 12, Usable = 1, Selected = 1, Group ID = 0, Font = Standard)
-#define BeamUnnamed2102Label                      2102	//(Left Origin = 4, Top Origin = 16, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 2200
-#define MusicForm                                 2200	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define MusicOKButton                             2210	//(Left Origin = 5, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define MusicCancelButton                         2211	//(Left Origin = 46, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-
-//	Resource: tFRM 2300
-#define TabMusicForm                              2300	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 120, Usable = 0, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabMusicMusicCheckbox                     2301	//(Left Origin = 4, Top Origin = 12, Width = 100, Height = 12, Usable = 1, Selected = 1, Group ID = 0, Font = Standard)
-#define TabMusicMultiMidiCheckbox                 2308	//(Left Origin = 4, Top Origin = 24, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMusicTempoField                        2302	//(Left Origin = 54, Top Origin = 36, Width = 16, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 3, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabMusicTitleLabel                        2303	//(Left Origin = 6, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabMusicUnnamed2304Label                  2304	//(Left Origin = 21, Top Origin = 48, Usable = 1, Font = Standard)
-#define TabMusicUnnamed2305Label                  2305	//(Left Origin = 16, Top Origin = 60, Usable = 1, Font = Standard)
-#define TabMusicUnnamed2306Label                  2306	//(Left Origin = 18, Top Origin = 36, Usable = 1, Font = Standard)
-#define TabMusicUnnamed2307Label                  2307	//(Left Origin = 72, Top Origin = 36, Usable = 1, Font = Standard)
-#define TabMusicUnnamed2309Label                  2309	//(Left Origin = 28, Top Origin = 72, Usable = 1, Font = Standard)
-#define TabMusicRateList                          2311	//(Left Origin = 54, Top Origin = 73, Width = 55, Usable = 0, Font = Standard, Visible Items = 3)
-#define TabMusicQualityList                       2313	//(Left Origin = 54, Top Origin = 60, Width = 60, Usable = 0, Font = Standard, Visible Items = 3)
-#define TabMusicDriverList                        2331	//(Left Origin = 54, Top Origin = 24, Width = 65, Usable = 0, Font = Standard, Visible Items = 4)
-#define TabMusicRatePopTrigger                    2310	//(Left Origin = 54, Top Origin = 72, Width = 55, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 2311)
-#define TabMusicQualityPopTrigger                 2312	//(Left Origin = 54, Top Origin = 60, Width = 50, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 2313)
-#define TabMusicDriverPopTrigger                  2330	//(Left Origin = 54, Top Origin = 48, Width = 65, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 2331)
-
-//	Resource: tFRM 2500
-#define TabAudioCDForm                            2500	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 110, Usable = 0, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabAudioCDMP3Checkbox                     2502	//(Left Origin = 4, Top Origin = 12, Width = 125, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabAudioCDLengthSecsField                 2504	//(Left Origin = 112, Top Origin = 60, Width = 16, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 3, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabAudioCDFirstTrackField                 2507	//(Left Origin = 112, Top Origin = 50, Width = 16, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 80, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabAudioCDUnnamed2501Label                2501	//(Left Origin = 6, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabAudioCDUnnamed2503Label                2503	//(Left Origin = 20, Top Origin = 60, Usable = 1, Font = Standard)
-#define TabAudioCDUnnamed2505Label                2505	//(Left Origin = 130, Top Origin = 61, Usable = 1, Font = Standard)
-#define TabAudioCDUnnamed2506Label                2506	//(Left Origin = 21, Top Origin = 48, Usable = 1, Font = Standard)
-#define TabAudioCDUnnamed2508Label                2508	//(Left Origin = 25, Top Origin = 24, Usable = 1, Font = Standard)
-#define TabAudioCDUnnamed2511Label                2511	//(Left Origin = 21, Top Origin = 36, Usable = 1, Font = Standard)
-#define TabAudioCDUnnamed2514Label                2514	//(Left Origin = 4, Top Origin = 80, Usable = 1, Font = Standard)
-#define TabAudioCDDriverList                      2510	//(Left Origin = 58, Top Origin = 24, Width = 90, Usable = 0, Font = Standard, Visible Items = 4)
-#define TabAudioCDFormatList                      2513	//(Left Origin = 58, Top Origin = 36, Width = 70, Usable = 0, Font = Standard, Visible Items = 2)
-#define TabAudioCDDriverPopTrigger                2509	//(Left Origin = 58, Top Origin = 24, Width = 90, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 2510)
-#define TabAudioCDFormatPopTrigger                2512	//(Left Origin = 58, Top Origin = 36, Width = 70, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 2513)
-
-//	Resource: tFRM 2600
-#define TabVolumeForm                             2600	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 100, Usable = 0, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabVolumeUnnamed2601Label                 2601	//(Left Origin = 29, Top Origin = 69, Usable = 1, Font = Standard)
-#define TabVolumeUnnamed2603Label                 2603	//(Left Origin = 6, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabVolumeUnnamed2606Label                 2606	//(Left Origin = 26, Top Origin = 15, Usable = 1, Font = Standard)
-#define TabVolumeUnnamed2607Label                 2607	//(Left Origin = 12, Top Origin = 30, Usable = 1, Font = Standard)
-#define TabVolumeUnnamed2608Label                 2608	//(Left Origin = 20, Top Origin = 45, Usable = 1, Font = Standard)
-#define TabVolumeUnnamed2610Label                 2610	//(Left Origin = 14, Top Origin = 84, Usable = 1, Font = Standard)
-#define TabVolumeMusicSliderControl               2602	//(Left Origin = 58, Top Origin = 12, Width = 93, Height = 15, Usable = 1, Initial Value = 0, Minimum Value = 0, Maximum Value = 255, Page Jump Amount = 1, Thumb Bitmap = 0, Background Bitmap = 0)
-#define TabVolumeSfxSliderControl                 2604	//(Left Origin = 58, Top Origin = 27, Width = 93, Height = 15, Usable = 1, Initial Value = 0, Minimum Value = 0, Maximum Value = 255, Page Jump Amount = 1, Thumb Bitmap = 0, Background Bitmap = 0)
-#define TabVolumePalmSliderControl                2605	//(Left Origin = 58, Top Origin = 66, Width = 93, Height = 15, Usable = 1, Initial Value = 0, Minimum Value = 0, Maximum Value = 100, Page Jump Amount = 1, Thumb Bitmap = 0, Background Bitmap = 0)
-#define TabVolumeSpeechSliderControl              2609	//(Left Origin = 58, Top Origin = 42, Width = 93, Height = 15, Usable = 1, Initial Value = 0, Minimum Value = 0, Maximum Value = 255, Page Jump Amount = 1, Thumb Bitmap = 0, Background Bitmap = 0)
-#define TabVolumeAudioCDSliderControl             2611	//(Left Origin = 58, Top Origin = 81, Width = 93, Height = 15, Usable = 1, Initial Value = 0, Minimum Value = 0, Maximum Value = 100, Page Jump Amount = 1, Thumb Bitmap = 0, Background Bitmap = 0)
-
-//	Resource: tFRM 2800
-#define TabMiscPalmOSForm                         2800	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 120, Usable = 0, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabMiscPalmOSVibratorCheckbox             2802	//(Left Origin = 4, Top Origin = 12, Width = 128, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSNoAutoOffCheckbox            2803	//(Left Origin = 4, Top Origin = 24, Width = 152, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSStdPaletteCheckbox           2804	//(Left Origin = 4, Top Origin = 84, Width = 146, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSLargerStackCheckbox          2805	//(Left Origin = 4, Top Origin = 36, Width = 100, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSAdvancedCheckbox             2806	//(Left Origin = 4, Top Origin = 96, Width = 100, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSArrowCheckbox                2807	//(Left Origin = 4, Top Origin = 72, Width = 150, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSExitLauncherCheckbox         2810	//(Left Origin = 4, Top Origin = 48, Width = 150, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSStylusClickCheckbox          2811	//(Left Origin = 4, Top Origin = 60, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscPalmOSTabTitlePalmLabel            2801	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 2900
-#define TabMiscScummVMForm                        2900	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 120, Usable = 0, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabMiscScummVMAutosaveCheckbox            2902	//(Left Origin = 4, Top Origin = 48, Width = 90, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscScummVMDebugCheckbox               2904	//(Left Origin = 4, Top Origin = 60, Width = 90, Height = 12, Usable = 0, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscScummVMDemoCheckbox                2905	//(Left Origin = 4, Top Origin = 12, Width = 100, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscScummVMCopyProtectionCheckbox      2906	//(Left Origin = 4, Top Origin = 24, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscScummVMAltIntroCheckbox            2908	//(Left Origin = 4, Top Origin = 36, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscScummVMDebugLevelField             2907	//(Left Origin = 101, Top Origin = 60, Width = 12, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 1, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabMiscScummVMAutosaveField               2910	//(Left Origin = 101, Top Origin = 48, Width = 20, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 4, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabMiscScummVMTabTitleScummLabel          2901	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabMiscScummVMUnnamed2903Label            2903	//(Left Origin = 97, Top Origin = 61, Usable = 1, Font = Standard)
-#define TabMiscScummVMUnnamed2909Label            2909	//(Left Origin = 97, Top Origin = 48, Usable = 1, Font = Standard)
-#define TabMiscScummVMUnnamed2911Label            2911	//(Left Origin = 123, Top Origin = 48, Usable = 1, Font = Standard)
-
-//	Resource: tFRM 3000
-#define GameEditForm                              3000	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 1411)
-#define GameEditOKButton                          3020	//(Left Origin = 5, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define GameEditCancelButton                      3021	//(Left Origin = 46, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define GameEditDeleteButton                      3023	//(Left Origin = 109, Top Origin = 139, Width = 42, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define GameEditUnnamed3022GraffitiShift          3022	//(Left Origin = 87, Top Origin = 140)
-
-//	Resource: tFRM 3100
-#define TabGameInfoForm                           3100	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 120, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabGameInfoEntryNameField                 3102	//(Left Origin = 4, Top Origin = 12, Width = 151, Height = 24, Usable = 1, Editable = 1, Underline = 1, Single Line = 0, Dynamic Size = 0, Left Justified = 1, Max Characters = 50, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 0)
-#define TabGameInfoPathField                      3104	//(Left Origin = 37, Top Origin = 38, Width = 118, Height = 24, Usable = 1, Editable = 1, Underline = 1, Single Line = 0, Dynamic Size = 0, Left Justified = 1, Max Characters = 150, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 0)
-#define TabGameInfoGameField                      3106	//(Left Origin = 37, Top Origin = 64, Width = 52, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 15, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 0)
-#define TabGameInfoUnnamed3101Label               3101	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabGameInfoUnnamed3103Label               3103	//(Left Origin = 11, Top Origin = 38, Usable = 1, Font = Standard)
-#define TabGameInfoUnnamed3105Label               3105	//(Left Origin = 6, Top Origin = 64, Usable = 1, Font = Standard)
-#define TabGameInfoUnnamed3107Label               3107	//(Left Origin = 4, Top Origin = 79, Usable = 1, Font = Standard)
-#define TabGameInfoEngineList                     3109	//(Left Origin = 37, Top Origin = 57, Width = 115, Usable = 0, Font = Standard, Visible Items = 3)
-#define TabGameInfoBrowsePushButton               3110	//(Left Origin = 11, Top Origin = 50, Width = 22, Height = 12, Usable = 1, Group ID = 0, Font = Standard)
-#define TabGameInfoEnginePopTrigger               3108	//(Left Origin = 37, Top Origin = 79, Width = 115, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3109)
-
-//	Resource: tFRM 3200
-#define TabGameDisplayForm                        3200	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 95, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabGameDisplayFilterCheckbox              3205	//(Left Origin = 4, Top Origin = 36, Width = 80, Height = 12, Usable = 1, Selected = 1, Group ID = 0, Font = Standard)
-#define TabGameDisplayFullscreenCheckbox          3206	//(Left Origin = 4, Top Origin = 60, Width = 100, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameDisplayAspectRatioCheckbox         3207	//(Left Origin = 4, Top Origin = 48, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameDisplayUnnamed3201Label            3201	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabGameDisplayUnnamed3202Label            3202	//(Left Origin = 5, Top Origin = 24, Usable = 1, Font = Standard)
-#define TabGameDisplayUnnamed3208Label            3208	//(Left Origin = 10, Top Origin = 12, Usable = 1, Font = Standard)
-#define TabGameDisplayGfxListList                 3204	//(Left Origin = 38, Top Origin = 12, Width = 75, Usable = 0, Font = Standard, Visible Items = 2)
-#define TabGameDisplayRenderList                  3210	//(Left Origin = 38, Top Origin = 24, Width = 75, Usable = 0, Font = Standard, Visible Items = 6)
-#define TabGameDisplayGfxPopupPopTrigger          3203	//(Left Origin = 38, Top Origin = 12, Width = 80, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3204)
-#define TabGameDisplayRenderPopTrigger            3209	//(Left Origin = 38, Top Origin = 24, Width = 85, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3209)
-
-//	Resource: tFRM 3300
-#define TabGameOptionsForm                        3300	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 160, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabGameOptionsLoadSlotCheckbox            3302	//(Left Origin = 4, Top Origin = 24, Width = 85, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameOptionsStartRoomCheckbox           3303	//(Left Origin = 4, Top Origin = 36, Width = 84, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameOptionsAmigaCheckbox               3306	//(Left Origin = 4, Top Origin = 48, Width = 81, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameOptionsSubtitlesCheckbox           3307	//(Left Origin = 4, Top Origin = 60, Width = 82, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameOptionsTalkSpeedCheckbox           3308	//(Left Origin = 4, Top Origin = 12, Width = 66, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabGameOptionsLoadSlotField               3304	//(Left Origin = 92, Top Origin = 24, Width = 12, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 2, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabGameOptionsStartRoomField              3305	//(Left Origin = 92, Top Origin = 36, Width = 18, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 4, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabGameOptionsTalkSpeedField              3309	//(Left Origin = 92, Top Origin = 12, Width = 18, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 3, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabGameOptionsUnnamed3301Label            3301	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabGameOptionsUnnamed3314Label            3314	//(Left Origin = 88, Top Origin = 24, Usable = 1, Font = Standard)
-#define TabGameOptionsUnnamed3315Label            3315	//(Left Origin = 88, Top Origin = 36, Usable = 1, Font = Standard)
-#define TabGameOptionsUnnamed3316Label            3316	//(Left Origin = 88, Top Origin = 12, Usable = 1, Font = Standard)
-#define TabGameOptionsUnnamed3317Label            3317	//(Left Origin = 88, Top Origin = 48, Usable = 1, Font = Standard)
-#define TabGameOptionsUnnamed3318Label            3318	//(Left Origin = 88, Top Origin = 60, Usable = 1, Font = Standard)
-#define TabGameOptionsLanguageList                3311	//(Left Origin = 92, Top Origin = 15, Width = 64, Usable = 0, Font = Standard, Visible Items = 5)
-#define TabGameOptionsPlatformList                3313	//(Left Origin = 92, Top Origin = 15, Width = 64, Usable = 0, Font = Standard, Visible Items = 4)
-#define TabGameOptionsLanguagePopTrigger          3310	//(Left Origin = 90, Top Origin = 60, Width = 65, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3311)
-#define TabGameOptionsPlatformPopTrigger          3312	//(Left Origin = 90, Top Origin = 48, Width = 65, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3313)
-
-//	Resource: tFRM 3400
-#define ImportForm                                3400	//(Left Origin = 34, Top Origin = 64, Width = 91, Height = 32, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define ImportUnnamed3401Label                    3401	//(Left Origin = 4, Top Origin = 4, Usable = 1, Font = Standard)
-#define ImportUnnamed3402Label                    3402	//(Left Origin = 16, Top Origin = 16, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 1400
-#define EngineForm                                1400	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define EngineOkButton                            1403	//(Left Origin = 4, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define EngineCancelButton                        1420	//(Left Origin = 45, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-#define EngineUnnamed1402Label                    1402	//(Left Origin = 4, Top Origin = 16, Usable = 1, Font = Bold)
-#define EngineUnnamed1404Label                    1404	//(Left Origin = 4, Top Origin = 88, Usable = 1, Font = Bold)
-#define EngineListList                            1401	//(Left Origin = 4, Top Origin = 30, Width = 148, Usable = 1, Font = Standard, Visible Items = 5)
-#define EngineSupportedList                       1405	//(Left Origin = 4, Top Origin = 102, Width = 148, Usable = 1, Font = Standard, Visible Items = 3)
-
-//	Resource: tFRM 4000
-#define InfoForm                                  4000	//(Left Origin = 2, Top Origin = 2, Width = 156, Height = 156, Usable = 1, Modal = 1, Save Behind = 1, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define InfoOKButton                              4020	//(Left Origin = 5, Top Origin = 139, Width = 36, Height = 12, Usable = 1, Anchor Left = 1, Frame = 1, Non-bold Frame = 1, Font = Standard)
-
-//	Resource: tFRM 4100
-#define TabInfoAboutForm                          4100	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 125, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabInfoAboutTabTitleAboutLabel            4101	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabInfoAboutUnnamed4103Label              4103	//(Left Origin = 23, Top Origin = 58, Usable = 1, Font = Bold)
-#define TabInfoAboutUnnamed4104Label              4104	//(Left Origin = 34, Top Origin = 70, Usable = 1, Font = Standard)
-#define TabInfoAboutUnnamed4105Label              4105	//(Left Origin = 8, Top Origin = 82, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 4200
-#define TabInfoVersionForm                        4200	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 100, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabInfoVersionTabTitleAboutLabel          4201	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabInfoVersionUnnamed4202Label            4202	//(Left Origin = 10, Top Origin = 12, Usable = 1, Font = Standard)
-#define TabInfoVersionUnnamed4203Label            4203	//(Left Origin = 24, Top Origin = 24, Usable = 1, Font = Standard)
-#define TabInfoVersionUnnamed4204Label            4204	//(Left Origin = 4, Top Origin = 42, Usable = 1, Font = Bold)
-#define TabInfoVersionUnnamed4205Label            4205	//(Left Origin = 5, Top Origin = 53, Usable = 1, Font = Standard)
-#define TabInfoVersionUnnamed4206Label            4206	//(Left Origin = 4, Top Origin = 72, Usable = 1, Font = Bold)
-#define TabInfoVersionUnnamed4207Label            4207	//(Left Origin = 4, Top Origin = 84, Usable = 1, Font = Standard)
-
-//	Resource: tFRM 4300
-#define TabInfoSystemForm                         4300	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 100, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabInfoSystemTabTitleAboutLabel           4301	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabInfoSystemUnnamed4302Label             4302	//(Left Origin = 10, Top Origin = 12, Usable = 1, Font = Standard)
-#define TabInfoSystemUnnamed4303Label             4303	//(Left Origin = 13, Top Origin = 24, Usable = 1, Font = Standard)
-#define TabInfoSystemUnnamed4304Label             4304	//(Left Origin = 5, Top Origin = 36, Usable = 1, Font = Standard)
-#define TabInfoSystemUnnamed4305Label             4305	//(Left Origin = 96, Top Origin = 0, Usable = 1, Font = Standard)
-#define TabInfoSystemUnnamed4306Label             4306	//(Left Origin = 132, Top Origin = 0, Usable = 1, Font = Standard)
-
-//	Resource: tFRM 1600
-#define TabCardConfigForm                         1600	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 110, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabCardConfigDetectCheckbox               1602	//(Left Origin = 4, Top Origin = 86, Width = 150, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardConfigCacheCheckbox                1604	//(Left Origin = 4, Top Origin = 62, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardConfigLedCheckbox                  1608	//(Left Origin = 4, Top Origin = 50, Width = 130, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardConfigCacheSizeField               1606	//(Left Origin = 68, Top Origin = 74, Width = 18, Height = 12, Usable = 1, Editable = 1, Underline = 1, Single Line = 1, Dynamic Size = 0, Left Justified = 1, Max Characters = 3, Font = Standard, Auto Shift = 0, Has Scroll Bar = 0, Numeric = 1)
-#define TabCardConfigTabTitleAboutLabel           1601	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabCardConfigUnnamed1605Label             1605	//(Left Origin = 21, Top Origin = 74, Usable = 1, Font = Standard)
-#define TabCardConfigUnnamed1607Label             1607	//(Left Origin = 88, Top Origin = 74, Usable = 1, Font = Standard)
-#define TabCardConfigSlotList                     1620	//(Left Origin = 7, Top Origin = 14, Width = 146, Usable = 1, Font = Standard, Visible Items = 3)
-
-//	Resource: tFRM 1700
-#define TabCardGameListForm                       1700	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 100, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabCardGameListMoveCheckbox               1702	//(Left Origin = 4, Top Origin = 12, Width = 143, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardGameListDeleteCheckbox             1703	//(Left Origin = 4, Top Origin = 24, Width = 142, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardGameListConfirmCheckbox            1704	//(Left Origin = 4, Top Origin = 36, Width = 152, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabCardGameListUnnamed1701Label           1701	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-
-//	Resource: tFRM 3500
-#define TabMiscExtsForm                           3500	//(Left Origin = 0, Top Origin = 0, Width = 160, Height = 80, Usable = 1, Modal = 0, Save Behind = 0, Help ID = 0, Menu Bar ID = 0, Default Button ID = 0)
-#define TabMiscExtsLightspeedCheckbox             3502	//(Left Origin = 4, Top Origin = 24, Width = 95, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscExtsGolcdCheckbox                  3505	//(Left Origin = 4, Top Origin = 12, Width = 120, Height = 12, Usable = 1, Selected = 0, Group ID = 0, Font = Standard)
-#define TabMiscExtsTabTitleMoreLabel              3501	//(Left Origin = 4, Top Origin = 0, Usable = 1, Font = Bold)
-#define TabMiscExtsNothingLabel                   3506	//(Left Origin = 4, Top Origin = 36, Usable = 0, Font = Standard)
-#define TabMiscExtsLightspeedList                 3504	//(Left Origin = 96, Top Origin = 24, Width = 50, Usable = 0, Font = Standard, Visible Items = 3)
-#define TabMiscExtsLightspeedPopTrigger           3503	//(Left Origin = 96, Top Origin = 24, Width = 60, Height = 12, Usable = 1, Anchor Left = 1, Font = Standard, List ID = 3504)
-
-
-//	Resource: Talt 1001
-#define RomIncompatibleAlert                      1001
-#define RomIncompatibleOK                         0
-
-//	Resource: Talt 1000
-#define FrmWarnAlert                              1000
-#define FrmWarnOK                                 0
-
-//	Resource: Talt 1100
-#define FrmErrorAlert                             1100
-#define FrmErrorCancel                            0
-
-//	Resource: Talt 1300
-#define FrmConfirmAlert                           1300
-#define FrmConfirmYes                             0
-#define FrmConfirmNo                              1
-
-//	Resource: Talt 1400
-#define FrmInfoAlert                              1400
-#define FrmInfoOK                                 0
-
-
-//	Resource: MBAR 1000
-#define MainFormMenuBar                           1000
-
-
-//	Resource: MENU 1000
-#define MainOptionsMenu                           1000
-#define MainOptionsMisc                           1000	//  Command Key: I
-#define MainOptionsSkins                          1001
-#define MainOptionsBeam                           1003
-#define MainOptionsAbout                          1005
-
-//	Resource: MENU 1100
-#define MainGamesMenu                             1100
-#define MainGamesNew                              1100	//  Command Key: N
-#define MainGamesEdit                             1101	//  Command Key: E
-#define MainGamesMusicSound                       1102	//  Command Key: M
-#define MainGamesDelete                           1103
-#define MainGamesMemoryCard                       1105	//  Command Key: C
-
-
-//	Resource: tSTR 9991
-#define ClieCatString                             9991	// "32779"
-
-//	Resource: tSTR 9990
-#define ClieDescString                            9990	// "Play your favorite Point'n'Click games"
-
-
-//	Resource: PICT 1001
-#define Bitmap                                    1001
-
-//	Resource: PICT 1002
-#define Bitmap2                                   1002
-
-//	Resource: PICT 1008
-#define Bitmap3                                   1008
-
-//	Resource: PICT 1011
-#define Bitmap4                                   1011
-
-//	Resource: PICT 1012
-#define Bitmap5                                   1012
-
-//	Resource: PICT 1018
-#define Bitmap6                                   1018
-
-//	Resource: PICT 2000
-#define infoBitmap                                2000
-
-//	Resource: PICT 1100
-#define msOnBitmap                                1100
-
-//	Resource: PICT 1009
-#define Bitmap7                                   1009
-
-//	Resource: PICT 1010
-#define Bitmap8                                   1010
-
-//	Resource: PICT 1110
-#define msNoneBitmap                              1110
-
-//	Resource: PICT 1020
-#define BitmapID1020Bitmap                        1020
-
-//	Resource: PICT 1019
-#define BitmapID1019Bitmap                        1019
-
-//	Resource: PICT 1200
-#define msOnD2Bitmap                              1200
-
-//	Resource: PICT 1300
-#define msNoneD2Bitmap                            1300
-
-//	Resource: PICT 2100
-#define infoD2Bitmap                              2100
-
-//	Resource: PICT 1501
-#define ScummVMlogoD1Bitmap                       1501
-
-//	Resource: PICT 1502
-#define ScummVMlogoD2Bitmap                       1502
-
-//	Resource: PICT 1000
-#define icon16bitD2Bitmap                         1000
-
-
-//	Resource: tbmf 1000
-#define Icon_infoBitmapFamily                     1000
-
-//	Resource: tbmf 1100
-#define MsOnBitmapFamily                          1100
-
-//	Resource: tbmf 2000
-#define InfoBitmapFamily                          2000
-
-//	Resource: tbmf 1110
-#define MsNoneBitmapFamily                        1110
-
-//	Resource: tbmf 1200
-#define LogoBitmapFamily                          1200
-
-
-//	Resource: taif 1000
-#define Largeicons12and8bitsAppIconFamily         1000
-
-//	Resource: taif 1001
-#define Smallicons12and8bitsAppIconFamily         1001
-
-
-#endif // STARTERRSC_H
diff --git a/backends/platform/PalmOS/Rsc/batLow.bmp b/backends/platform/PalmOS/Rsc/batLow.bmp
deleted file mode 100644
index 1d18131450..0000000000
--- a/backends/platform/PalmOS/Rsc/batLow.bmp
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/keyAlt.bmp b/backends/platform/PalmOS/Rsc/keyAlt.bmp
deleted file mode 100644
index 28165394f8..0000000000
--- a/backends/platform/PalmOS/Rsc/keyAlt.bmp
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/keyCommand.bmp b/backends/platform/PalmOS/Rsc/keyCommand.bmp
deleted file mode 100644
index 1324037cd3..0000000000
--- a/backends/platform/PalmOS/Rsc/keyCommand.bmp
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/keyCtrl.bmp b/backends/platform/PalmOS/Rsc/keyCtrl.bmp
deleted file mode 100644
index fed20fd8d0..0000000000
--- a/backends/platform/PalmOS/Rsc/keyCtrl.bmp
+++ /dev/null
diff --git a/backends/platform/PalmOS/Rsc/modules.rcp b/backends/platform/PalmOS/Rsc/modules.rcp
deleted file mode 100644
index c7b17221b2..0000000000
--- a/backends/platform/PalmOS/Rsc/modules.rcp
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2010 The ScummVM project
- * Copyright (C) 2002-2006 Chris Apers - PalmOS Backend
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-BITMAP ID 3100
-BEGIN
-	BITMAP "keyCommand.bmp"	BPP 1 DENSITY 2
-END
-BITMAP ID 3101
-BEGIN
-	BITMAP "keyAlt.bmp"		BPP 1 DENSITY 2
-END
-BITMAP ID 3102
-BEGIN
-	BITMAP "keyCtrl.bmp"	BPP 1 DENSITY 2
-END
-BITMAP ID 3120
-BEGIN
-	BITMAP "batLow.bmp"		BPP 1 DENSITY 2
-END
-BITMAP ID 3130
-BEGIN
-	BITMAP "numpad.bmp"		BPP 1 DENSITY 2
-END
-
-/*
-BITMAP ID 3100 "keyCommand.bmp" DENSITY 2
-BITMAP ID 3101 "keyAlt.bmp"		DENSITY 2
-BITMAP ID 3102 "keyCtrl.bmp"	DENSITY 2
-BITMAP ID 3120 "batLow.bmp"		DENSITY 2
-BITMAP ID 3130 "numpad.bmp"		DENSITY 2
-*/
-BITMAP ID 3000 "keyCommand.bmp" DENSITY 1
-BITMAP ID 3001 "keyAlt.bmp"		DENSITY 1
-BITMAP ID 3002 "keyCtrl.bmp"	DENSITY 1
-BITMAP ID 3020 "batLow.bmp"		DENSITY 1
-BITMAP ID 3030 "numpad.bmp"		DENSITY 1
-
-ALERT ID 1200
-	DEFAULTBUTTON 0
-	ERROR
-BEGIN
-	TITLE "ScummVM Fatal Error"
-	MESSAGE "^1"
-	BUTTONS "Exit"
-END
-
diff --git a/backends/platform/PalmOS/Rsc/modulesrsc.h b/backends/platform/PalmOS/Rsc/modulesrsc.h
deleted file mode 100644
index 14b32ee0b6..0000000000
--- a/backends/platform/PalmOS/Rsc/modulesrsc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MODULESRSC_H
-#define MODULESRSC_H
-
-#define FrmFatalErrorAlert	1200
-
-#endif
diff --git a/backends/platform/PalmOS/Rsc/numpad.bmp b/backends/platform/PalmOS/Rsc/numpad.bmp
deleted file mode 100644
index 7763d76c05..0000000000
--- a/backends/platform/PalmOS/Rsc/numpad.bmp
+++ /dev/null
diff --git a/backends/platform/PalmOS/Src/args.cpp b/backends/platform/PalmOS/Src/args.cpp
deleted file mode 100644
index bfc34866e3..0000000000
--- a/backends/platform/PalmOS/Src/args.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include <PalmOS.h>
-#include "palmdefs.h"
-#include "args.h"
-#include "pace.h"
-#include "endianutils.h"
-
-Char **ArgsInit() {
-	// first 4 bytes keep the real address of the chunk
-	MemHandle argvH = MemHandleNew(sizeof(Char *) + (MAX_ARG * sizeof(Char **) + 2));
-	// real addr
-	Char *lockP = (Char *)MemHandleLock(argvH);
-	// 4byte aligned
-	Char **argvP = (Char **)ALIGN_4BYTE(lockP);
-	// save real addr
-	argvP[0] = lockP;
-	// initial position
-	argvP++;
-
-	for (UInt8 count = 0; count < MAX_ARG; count++)
-		argvP[count] = NULL;
-
-	return argvP;
-}
-
-void ArgsAdd(Char **argvP, const Char *argP, const Char *parmP, UInt8 *countArgP) {
-	if (argP) {
-		MemHandle newArg;
-		UInt16 len2 = 0;
-		UInt16 len1 = StrLen(argP);
-
-		if (len1 > 0) {
-			if (parmP)
-				len2 = StrLen(parmP);
-
-			(*countArgP)++;
-			newArg = MemHandleNew(len1 + len2 + 1); // +1 = NULL CHAR
-			*argvP = (Char *)MemHandleLock(newArg);
-			StrCopy(*argvP, argP);
-
-			if (parmP)
-				StrCat(*argvP, parmP);
-		}
-	}
-}
-
-void ArgsFree(Char **argvP) {
-	if (!argvP)
-		return;
-
-	MemHandle oldH;
-
-	for (UInt8 count = 0; count < MAX_ARG; count++)
-		if (argvP[count]) {
-			oldH = MemPtrRecoverHandle(argvP[count]);
-			MemHandleUnlock(oldH);
-			MemHandleFree(oldH);
-		}
-
-	argvP--;
-	oldH = MemPtrRecoverHandle(argvP[0]);
-	MemHandleUnlock(oldH);
-	MemHandleFree(oldH);
-}
-
-void ArgsSetOwner(Char **argvP, UInt16 owner) {
-	if (!argvP)
-		return;
-
-	MemHandle oldH;
-
-	for (UInt8 count = 0; count < MAX_ARG; count++)
-		if (argvP[count]) {
-			oldH = MemPtrRecoverHandle(argvP[count]);
-			MemHandleSetOwner(oldH, owner);
-		}
-
-	argvP--;
-	oldH = MemPtrRecoverHandle(argvP[0]);
-	MemHandleSetOwner(oldH, owner);
-}
-
-void ArgsExportInit(Char **argvP, UInt32 countArg, Boolean arm) {
-	if (arm) {
-		for (UInt8 count = 0; count < MAX_ARG; count++)
-			if (argvP[count])
-				argvP[count] = (Char *)ByteSwap32(argvP[count]);
-	}
-
-	FtrSet(appFileCreator, ftrArgsData , (UInt32)argvP);
-	FtrSet(appFileCreator, ftrArgsCount, (UInt32)countArg);
-}
-
-void ArgsExportRelease(Boolean arm) {
-	if (arm) {
-		Char **argvP;
-		Err e = FtrGet(appFileCreator, ftrArgsData, (UInt32 *)&argvP);
-
-		if (argvP)
-			for (UInt8 count = 0; count < MAX_ARG; count++)
-				if (argvP[count])
-					argvP[count] = (Char *)ByteSwap32(argvP[count]);
-	}
-
-	FtrUnregister(appFileCreator, ftrArgsCount);
-	FtrUnregister(appFileCreator, ftrArgsData);
-}
diff --git a/backends/platform/PalmOS/Src/args.h b/backends/platform/PalmOS/Src/args.h
deleted file mode 100644
index fa988fe35f..0000000000
--- a/backends/platform/PalmOS/Src/args.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef ARGS_H
-#define ARGS_H
-
-#define MAX_ARG	25
-
-#define ftrArgsData		1300
-#define ftrArgsCount	1301
-#define ftrVars			1302
-#define ftrStack		1303
-
-Char **ArgsInit();
-void ArgsAdd(Char **argvP, const Char *argP, const Char *parmP, UInt8 *countArgP);
-void ArgsFree(Char **argvP);
-void ArgsSetOwner(Char **argvP, UInt16 owner);
-
-void ArgsExportInit(Char **argvP, UInt32 countArg, Boolean arm);
-void ArgsExportRelease(Boolean arm);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/base_event.cpp b/backends/platform/PalmOS/Src/base_event.cpp
deleted file mode 100644
index ae93514e34..0000000000
--- a/backends/platform/PalmOS/Src/base_event.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_base.h"
-#include "common/events.h"
-
-#ifdef STDLIB_TRACE_MEMORY
-#	include <stdlib.h>
-#endif
-
-#if defined(COMPILE_OS5) && defined(PALMOS_ARM)
-extern "C" void SysEventGet(EventType *eventP, Int32 timeout);
-extern "C" void SysEventAddToQueue (const EventType *eventP);
-#endif
-
-void OSystem_PalmBase::timer_handler() {
-	UInt32 msecs = getMillis();
-
-	if (_timer.active && (msecs >= _timer.nextExpiry)) {
-		_timer.duration = _timer.callback(_timer.duration);
-		_timer.nextExpiry = msecs + _timer.duration;
-	}
-}
-
-void OSystem_PalmBase::battery_handler() {
-	// check battery level every 15secs
-	if ((TimGetTicks() - _batCheckLast) > _batCheckTicks) {
-		UInt16 voltage, warnThreshold, criticalThreshold;
-		Boolean pluggedIn;
-		voltage = SysBatteryInfoV20(false, &warnThreshold, &criticalThreshold, NULL, NULL, &pluggedIn);
-
-		if (!pluggedIn) {
-			if (voltage <= warnThreshold) {
-				if (!_showBatLow) {
-					_showBatLow = true;
-					draw_osd(kDrawBatLow, _screenDest.w - 18, -16, true, 2);
-					displayMessageOnOSD("Battery low.");
-				}
-			} else {
-				if (_showBatLow) {
-					_showBatLow = false;
-					draw_osd(kDrawBatLow, _screenDest.w - 18, -16, false);
-				}
-			}
-
-			if (voltage <= criticalThreshold) {
-				::EventType event;
-				event.eType = keyDownEvent;
-				event.data.keyDown.chr = vchrPowerOff;
-				event.data.keyDown.modifiers = commandKeyMask;
-#if defined(COMPILE_OS5) && defined(PALMOS_ARM)
-				SysEventAddToQueue(&event);
-#else
-				EvtAddEventToQueue(&event);
-#endif
-			}
-		}
-
-		_batCheckLast = TimGetTicks();
-	}
-}
-
-bool OSystem_PalmBase::pollEvent(Common::Event &event) {
-	::EventType ev;
-	Boolean handled;
-	UInt32 keyCurrentState;
-	Coord x, y;
-
-	battery_handler();
-	timer_handler();
-	sound_handler();
-
-	for (;;) {
-		// check for hardkey repeat for mouse emulation
-		keyCurrentState = KeyCurrentState();
-
-		// if it was a key pressed, let the keyup event raise
-		if (_keyExtraPressed) {
-			if (gVars->arrowKeys) {
-				if (_keyExtraPressed & _keyExtra.bitLeft) {
-					if (!(keyCurrentState & _keyExtra.bitLeft)) {
-						_keyExtraPressed &= ~_keyExtra.bitLeft;
-
-						event.type = Common::EVENT_KEYUP;
-						event.kbd.keycode = Common::KEYCODE_LEFT;
-						event.kbd.ascii = event.kbd.keycode;
-						event.kbd.flags = 0;
-						return true;
-					}
-				}
-				if (_keyExtraPressed & _keyExtra.bitRight) {
-					if (!(keyCurrentState & _keyExtra.bitRight)) {
-						_keyExtraPressed &= ~_keyExtra.bitRight;
-
-						event.type = Common::EVENT_KEYUP;
-						event.kbd.keycode = Common::KEYCODE_RIGHT;
-						event.kbd.ascii = event.kbd.keycode;
-						event.kbd.flags = 0;
-						return true;
-					}
-				}
-				if (_keyExtraPressed & _keyExtra.bitUp) {
-					if (!(keyCurrentState & _keyExtra.bitUp)) {
-						_keyExtraPressed &= ~_keyExtra.bitUp;
-
-						event.type = Common::EVENT_KEYUP;
-						event.kbd.keycode = Common::KEYCODE_UP;
-						event.kbd.ascii = event.kbd.keycode;
-						event.kbd.flags = 0;
-						return true;
-					}
-				}
-				if (_keyExtraPressed & _keyExtra.bitDown) {
-					if (!(keyCurrentState & _keyExtra.bitDown)) {
-						_keyExtraPressed &= ~_keyExtra.bitDown;
-
-						event.type = Common::EVENT_KEYUP;
-						event.kbd.keycode = Common::KEYCODE_DOWN;
-						event.kbd.ascii = event.kbd.keycode;
-						event.kbd.flags = 0;
-						return true;
-					}
-				}
-			}
-
-			if (_keyExtraPressed & _keyExtra.bitActionA) {
-				if (!(keyCurrentState & _keyExtra.bitActionA)) {
-					_keyExtraPressed &= ~_keyExtra.bitActionA;
-
-					event.type = Common::EVENT_LBUTTONUP;
-					event.mouse.x = _mouseCurState.x;
-					event.mouse.y = _mouseCurState.y;
-					return true;
-				}
-			}
-
-			if (_keyExtraPressed & _keyExtra.bitActionB) {
-				if (!(keyCurrentState & _keyExtra.bitActionB)) {
-					_keyExtraPressed &= ~_keyExtra.bitActionB;
-
-					event.type = Common::EVENT_RBUTTONUP;
-					event.mouse.x = _mouseCurState.x;
-					event.mouse.y = _mouseCurState.y;
-					return true;
-				}
-			}
-
-			// no more event till up is raised
-			return false;
-		}
-
-		if (!(keyCurrentState & _keyExtraMask)) {
-			_lastKeyRepeat = 0;
-
-		} else if (getMillis() >= (_keyExtraRepeat + _keyExtraDelay)) {
-			_keyExtraRepeat = getMillis();
-
-			if (gVars->arrowKeys) {
-				if (keyCurrentState & _keyExtra.bitLeft) {
-					_keyExtraPressed |= _keyExtra.bitLeft;
-					event.kbd.keycode = Common::KEYCODE_LEFT;
-
-				} else if (keyCurrentState & _keyExtra.bitRight) {
-					_keyExtraPressed |= _keyExtra.bitRight;
-					event.kbd.keycode = Common::KEYCODE_RIGHT;
-
-				} else if (keyCurrentState & _keyExtra.bitUp) {
-					_keyExtraPressed |= _keyExtra.bitUp;
-					event.kbd.keycode = Common::KEYCODE_UP;
-
-				} else if (keyCurrentState & _keyExtra.bitDown) {
-					_keyExtraPressed |= _keyExtra.bitDown;
-					event.kbd.keycode = Common::KEYCODE_DOWN;
-				}
-
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.ascii = event.kbd.keycode;
-				event.kbd.flags = 0;
-				return true;
-
-			} else {
-				Int8 sx = 0;
-				Int8 sy = 0;
-
-				if (keyCurrentState & _keyExtra.bitUp)
-					sy = -1;
-				else if (keyCurrentState & _keyExtra.bitDown)
-					sy = +1;
-
-				if (keyCurrentState & _keyExtra.bitLeft)
-					sx = -1;
-				else if (keyCurrentState & _keyExtra.bitRight)
-					sx = +1;
-
-				if (sx || sy) {
-					simulate_mouse(event, sx, sy, &x, &y);
-					event.type = Common::EVENT_MOUSEMOVE;
-					event.mouse.x = x;
-					event.mouse.y = y;
-					warpMouse(x, y);
-
-					return true;
-				}
-			}
-		}
-
-#if defined(COMPILE_OS5) && defined(PALMOS_ARM)
-		SysEventGet(&ev, evtNoWait);
-#else
-		EvtGetEvent(&ev, evtNoWait);
-#endif
-
-		if (ev.eType == keyUpEvent) {
-			Common::KeyCode k = Common::KEYCODE_INVALID;
-			switch (ev.data.keyUp.chr) {
-
-			// arrow keys
-			case chrUpArrow:
-				k = Common::KEYCODE_UP; break;
-			case chrDownArrow:
-				k = Common::KEYCODE_DOWN; break;
-			case chrRightArrow:
-				k = Common::KEYCODE_RIGHT; break;
-			case chrLeftArrow:
-				k = Common::KEYCODE_LEFT; break;
-			}
-
-			if (k) {
-				event.type = Common::EVENT_KEYUP;
-				event.kbd.keycode = k;
-				event.kbd.ascii = k;
-				event.kbd.flags = 0;
-				return true;
-			}
-
-		} else if (ev.eType == keyDownEvent) {
-			Common::KeyCode k = Common::KEYCODE_INVALID;
-			switch (ev.data.keyDown.chr) {
-			// ESC key
-			case vchrLaunch:
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = Common::KEYCODE_ESCAPE;
-				event.kbd.ascii = Common::ASCII_ESCAPE;
-				event.kbd.flags = 0;
-				return true;
-
-			// F5 = menu
-			case vchrMenu:
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = Common::KEYCODE_F5;
-				event.kbd.ascii = Common::ASCII_F5;
-				event.kbd.flags = 0;
-				return true;
-
-			// if hotsync pressed, etc...
-			case vchrHardCradle:
-			case vchrHardCradle2:
-			case vchrLowBattery:
-			case vchrFind:
-//			case vchrBrightness:	// volume control on Zodiac, let other backends disable it
-			case vchrContrast:
-				// do nothing
-				return true;
-
-			// arrow keys
-			case chrUpArrow:
-				k = Common::KEYCODE_UP; break;
-			case chrDownArrow:
-				k = Common::KEYCODE_DOWN; break;
-			case chrRightArrow:
-				k = Common::KEYCODE_RIGHT; break;
-			case chrLeftArrow:
-				k = Common::KEYCODE_LEFT; break;
-
-			// return
-			case chrLineFeed:
-			case chrCarriageReturn:
-				k = Common::KEYCODE_RETURN; break;
-
-			}
-
-			if (k) {
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = k;
-				event.kbd.ascii = k;
-				event.kbd.flags = 0;
-				return true;
-			}
-		}
-
-		if (check_event(event, &ev))
-			return true;
-
-		// prevent crash when alarm is raised
-		handled = ((ev.eType == keyDownEvent) &&
-						(ev.data.keyDown.modifiers & commandKeyMask) &&
-						((ev.data.keyDown.chr == vchrAttnStateChanged) ||
-						(ev.data.keyDown.chr == vchrAttnUnsnooze)));
-
-		// graffiti strokes, auto-off, etc...
-		if (!handled)
-			if (SysHandleEvent(&ev))
-				continue;
-
-		switch (ev.eType) {
-		case penMoveEvent:
-			get_coordinates(&ev, x, y);
-
-			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
-				return false;
-
-			if (abs(y - event.mouse.y) <= 2 || abs(x - event.mouse.x) <= 2)
-				return false;
-
-			event.type = Common::EVENT_MOUSEMOVE;
-			event.mouse.x = x;
-			event.mouse.y = y;
-			warpMouse(x, y);
-			return true;
-
-		case penDownEvent:
-			get_coordinates(&ev, x, y);
-
-			// indy fight mode
-			if (_useNumPad && !_overlayVisible) {
-				char num = '1';
-				num += 9 -
-						(3 - (3 * x / _screenWidth )) -
-						(3 * (3 * y / _screenHeight));
-
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = (Common::KeyCode)num;
-				event.kbd.ascii = num;
-				event.kbd.flags = 0;
-
-				_wasKey = true;
-				return true;
-			}
-
-			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
-				return false;
-
-			event.type = ((gVars->stylusClick || _overlayVisible) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_MOUSEMOVE);
-			event.mouse.x = x;
-			event.mouse.y = y;
-			warpMouse(x, y);
-			return true;
-
-		case penUpEvent:
-			get_coordinates(&ev, x, y);
-
-			event.type = ((gVars->stylusClick || _overlayVisible) ? Common::EVENT_LBUTTONUP : Common::EVENT_MOUSEMOVE);
-			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
-				return false;
-
-			event.mouse.x = x;
-			event.mouse.y = y;
-			warpMouse(x, y);
-			return true;
-
-		case keyDownEvent:
-			if (ev.data.keyDown.chr == vchrCommand &&
-				(ev.data.keyDown.modifiers & commandKeyMask)) {
-
-				_lastKeyModifier++;
-				_lastKeyModifier %= kModifierCount;
-
-				if (_lastKeyModifier)
-					draw_osd((kDrawKeyState + _lastKeyModifier - 1), 2, _screenDest.h + 2, true);
-				else
-					draw_osd(kDrawKeyState, 2, _screenDest.h + 2, false);
-
-				return false;
-			}
-
-			char mask = 0;
-			UInt16 key = ev.data.keyDown.chr;
-
-			if (_lastKeyModifier == kModifierNone) {
-				// for keyboard mode
-				if (ev.data.keyDown.modifiers & shiftKeyMask)	mask |= Common::KBD_SHIFT;
-				if (ev.data.keyDown.modifiers & controlKeyMask)	mask |= Common::KBD_CTRL;
-				if (ev.data.keyDown.modifiers & optionKeyMask)	mask |= Common::KBD_ALT;
-				if (ev.data.keyDown.modifiers & commandKeyMask) mask |= Common::KBD_CTRL|Common::KBD_ALT;
-			} else {
-				// for grafiti mode
-				if (_lastKeyModifier == kModifierCommand)	mask = Common::KBD_CTRL|Common::KBD_ALT;
-				if (_lastKeyModifier == kModifierAlt)		mask = Common::KBD_ALT;
-				if (_lastKeyModifier == kModifierCtrl)		mask = Common::KBD_CTRL;
-			}
-
-			if (_lastKeyModifier)
-				draw_osd(kDrawKeyState, 2, _screenDest.h + 2, false);
-			_lastKeyModifier = kModifierNone;
-
-			// F1 -> F10 key
-			if  (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
-				key = (key == '0') ? 324 : (315 + key - '1');
-				mask = 0;
-
-#ifdef STDLIB_TRACE_MEMORY
-			// print memory
-			} else if  (key == 'm' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
-				printf("Used memory: %d\n", __stdlib_trace_memory);
-#endif
-			// exit
-			} else if  ((key == 'z' && mask == Common::KBD_CTRL) || (mask == Common::KBD_ALT && key == 'x')) {
-				event.type = Common::EVENT_QUIT;
-				return true;
-
-			// num pad (indy fight mode)
-			} else if (key == 'n' && mask == (Common::KBD_CTRL|Common::KBD_ALT) && !_overlayVisible) {
-				_useNumPad = !_useNumPad;
-				draw_osd(kDrawFight, _screenDest.w - 34, _screenDest.h + 2, _useNumPad, 1);
-				displayMessageOnOSD(_useNumPad ? "Fight mode on." : "Fight mode off.");
-				return false;
-			}
-
-			// other keys
-			_wasKey = true;
-			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = (Common::KeyCode)key;
-			event.kbd.ascii = key;
-			event.kbd.flags = mask;
-			return true;
-
-		default:
-			if (_wasKey && ev.eType != keyHoldEvent) {
-				event.type = Common::EVENT_KEYUP;
-				_wasKey = false;
-				return true;
-			}
-			return false;
-		};
-	}
-}
diff --git a/backends/platform/PalmOS/Src/base_gfx.cpp b/backends/platform/PalmOS/Src/base_gfx.cpp
deleted file mode 100644
index 46238efdc2..0000000000
--- a/backends/platform/PalmOS/Src/base_gfx.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_base.h"
-
-/*
- * Graphics modes
- *
- */
-
-static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
-	{"1x", "Normal", GFX_NORMAL},
-	{"wide", "Wide", GFX_WIDE},
-	{0, 0, 0}
-};
-
-int OSystem_PalmBase::getDefaultGraphicsMode() const {
-	return GFX_NORMAL;
-}
-
-const OSystem::GraphicsMode *OSystem_PalmBase::getSupportedGraphicsModes() const {
-	return int_getSupportedGraphicsModes();
-}
-
-const OSystem::GraphicsMode *OSystem_PalmBase::int_getSupportedGraphicsModes() const {
-	return s_supportedGraphicsModes;
-}
-
-int OSystem_PalmBase::getGraphicsMode() const {
-	return _mode;
-}
-
-bool OSystem_PalmBase::setGraphicsMode(int mode) {
-	switch (mode) {
-	case GFX_NORMAL:
-	case GFX_WIDE:
-		_setMode = mode;
-		break;
-
-	default:
-		warning("unknown gfx mode %d", mode);
-		_setMode = GFX_NORMAL;
-		return false;
-	}
-
-	return true;
-}
-
-/*
- * Init
- *
- */
-
-void OSystem_PalmBase::initSize(uint w, uint h, const Graphics::PixelFormat *format) {
-	_screenWidth	= w;
-	_screenHeight	= h;
-
-	_screenDest.w = _screenWidth;
-	_screenDest.h = _screenHeight;
-
-	unload_gfx_mode();
-	_mode = _setMode;
-	load_gfx_mode();
-
-	warpMouse(200, 150);
-	int_initSize(w, h);
-}
-
-/*
- * Palette
- *
- */
-void OSystem_PalmBase::setPalette(const byte *colors, uint start, uint num) {
-	RGBColorType *base = _currentPalette + start;
-
-	for (uint i = 0; i < num; i++) {
-		base[i].r = colors[0];
-		base[i].g = colors[1];
-		base[i].b = colors[2];
-
-		extras_palette(i + start, colors[0], colors[1], colors[2]);
-		colors += 4;
-	}
-
-	if (start < _paletteDirtyStart)
-		_paletteDirtyStart = start;
-
-	if (start + num > _paletteDirtyEnd)
-		_paletteDirtyEnd = start + num;
-}
-
-void OSystem_PalmBase::grabPalette(byte *colors, uint start, uint num) {
-	const RGBColorType *base = _currentPalette + start;
-
-	for (uint i = 0; i < num; ++i) {
-		colors[i * 4] = base[i].r;
-		colors[i * 4 + 1] = base[i].g;
-		colors[i * 4 + 2] = base[i].b;
-		colors[i * 4 + 3] = 0xFF;
-	}
-}
-
-/*
- * Screen
- *
- */
-
-void OSystem_PalmBase::setShakePos(int shakeOffset) {
-	_new_shake_pos = shakeOffset;
-	int_setShakePos(shakeOffset);
-}
-
-void OSystem_PalmBase::updateScreen() {
-	// Check whether the palette was changed in the meantime and update the
-	// screen surface accordingly.
-	if (_paletteDirtyEnd != 0 && _setPalette) {
-		WinSetDrawWindow(WinGetDisplayWindow());
-		WinPalette(winPaletteSet, _paletteDirtyStart, _paletteDirtyEnd - _paletteDirtyStart, _currentPalette + _paletteDirtyStart);
-		_paletteDirtyEnd = 0;
-		//_redawOSD = true;
-	}
-	if (_redawOSD) {
-		_redawOSD = false;
-		draw_osd(kDrawBatLow, _screenDest.w - 18, -16, _showBatLow, 2);
-		draw_osd(kDrawFight, _screenDest.w - 34, _screenDest.h + 2, (_useNumPad && !_overlayVisible), 1);
-	}
-	int_updateScreen();
-
-}
-
-void OSystem_PalmBase::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {
-//return;
-
-	MemHandle hTemp = DmGetResource('abmp', id + 100);
-
-	if (hTemp) {
-		/*static const UInt32 pal[3] = {
-			(TwGfxComponentsToPackedRGB(0,255,0)),
-			(TwGfxComponentsToPackedRGB(255,255,0)),
-			(TwGfxComponentsToPackedRGB(255,0,0))
-		};*/
-
-		BitmapType *bmTemp;
-		bmTemp	= (BitmapType *)MemHandleLock(hTemp);
-
-		Coord w, h;
-		BmpGetDimensions(bmTemp, &w, &h, 0);
-
-		PointType dst = { _screenOffset.x + x, _screenOffset.y + y };
-		RectangleType r = { dst.x, dst.y, w, h };
-
-		RectangleType c;
-
-		UInt16 old = WinSetCoordinateSystem(kCoordinatesNative);
-		WinGetClip(&c);
-		WinResetClip();
-		if (show) {
-			WinSetDrawWindow(_screenH);
-			WinSetBackColor(0);
-			WinSetForeColor(120);	// pal[color]
-			WinFillRectangle(&r, 0);
-			WinSetDrawMode(winOverlay);
-			WinDrawBitmap(bmTemp, 0, 0);
-			WinSetDrawMode(winPaint);
-
-		} else {
-			WinSetBackColor(0);
-			WinFillRectangle(&r, 0);
-		}
-		WinSetClip(&c);
-		WinSetCoordinateSystem(old);
-
-		MemPtrUnlock(bmTemp);
-		DmReleaseResource(hTemp);
-	}
-}
diff --git a/backends/platform/PalmOS/Src/base_mouse.cpp b/backends/platform/PalmOS/Src/base_mouse.cpp
deleted file mode 100644
index bf11a4b106..0000000000
--- a/backends/platform/PalmOS/Src/base_mouse.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_base.h"
-
-void OSystem_PalmBase::warpMouse(int x, int y) {
-	if (x != _mouseCurState.x || y != _mouseCurState.y) {
-		x = x >= _screenWidth  ? _screenWidth  - 1 : x;
-		y = y >= _screenHeight ? _screenHeight - 1 : y;
-
-		_mouseCurState.x = x;
-		_mouseCurState.y = y;
-	}
-}
-
-bool OSystem_PalmBase::showMouse(bool visible) {
-	bool last = _mouseVisible;
-	_mouseVisible = visible;
-
-	return last;
-}
-
-void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
-	if (w == 0 || h == 0)
-		return;
-
-	_mouseHotspotX = hotspotX;
-	_mouseHotspotY = hotspotY;
-
-	_mouseKeyColor = keycolor;
-
-	if (_mouseCurState.w != w || _mouseCurState.h != h) {
-		_mouseCurState.w = w;
-		_mouseCurState.h = h;
-
-		if (_mouseDataP)
-			free(_mouseDataP);
-
-		if (_mouseBackupP)
-			free(_mouseBackupP);
-
-		_mouseDataP = (byte *)malloc(w * h);
-		_mouseBackupP = (byte *)malloc(w * h * 2); // if 16bit = *2
-	}
-
-	if (!_mouseBackupP) {
-		free(_mouseDataP);
-		_mouseDataP = NULL;
-	}
-
-	if (_mouseDataP)
-		memcpy(_mouseDataP, buf, w * h);
-}
-
-void OSystem_PalmBase::simulate_mouse(Common::Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr) {
-	Int16 x = _mouseCurState.x;
-	Int16 y = _mouseCurState.y;
-	Int16 slow, fact;
-
-	_lastKeyRepeat++;
-	fact = _screenWidth / 320;
-	fact = (fact) ? fact : 1;
-
-	if (_lastKeyRepeat > 32 * fact)
-		_lastKeyRepeat = 32 * fact;
-
-	slow = (iHoriz && iVert) ? 2 : 1;
-
-	x += iHoriz * (_lastKeyRepeat >> 2) / slow * fact;
-	y += iVert * (_lastKeyRepeat >> 2) / slow * fact;
-
-	x = (x < 0				) ? 0					: x;
-	x = (x >= _screenWidth	) ? _screenWidth - 1	: x;
-	y = (y < 0				) ? 0					: y;
-	y = (y >= _screenHeight	) ? _screenHeight - 1	: y;
-
-	*xr = x;
-	*yr = y;
-}
diff --git a/backends/platform/PalmOS/Src/be_68k.cpp b/backends/platform/PalmOS/Src/be_68k.cpp
deleted file mode 100644
index 77b1e22615..0000000000
--- a/backends/platform/PalmOS/Src/be_68k.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-/* More to come */
diff --git a/backends/platform/PalmOS/Src/be_68k.h b/backends/platform/PalmOS/Src/be_68k.h
deleted file mode 100644
index 77b1e22615..0000000000
--- a/backends/platform/PalmOS/Src/be_68k.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-/* More to come */
diff --git a/backends/platform/PalmOS/Src/be_base.cpp b/backends/platform/PalmOS/Src/be_base.cpp
deleted file mode 100644
index b3caee105d..0000000000
--- a/backends/platform/PalmOS/Src/be_base.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_base.h"
-#include "common/config-file.h"
-#include "common/config-manager.h"
-#include "backends/saves/default/default-saves.h"
-#include "backends/timer/default/default-timer.h"
-#include "backends/fs/palmos/palmos-fs-factory.h"
-#include "sound/mixer_intern.h"
-
-#define DEFAULT_SAVE_PATH "/PALM/Programs/ScummVM/Saved/"
-
-
-OSystem_PalmBase::OSystem_PalmBase() {
-	_overlayVisible = false;
-
-	_current_shake_pos = 0;
-	_new_shake_pos = 0;
-
-	_paletteDirtyStart = 0;
-	_paletteDirtyEnd = 0;
-
-	_gfxLoaded = false;
-	_modeChanged = false;
-	_setMode = GFX_NORMAL;
-	_mode = _setMode;
-	_redawOSD = false;
-	_setPalette = true;
-
-	_offScreenH = NULL;
-	_screenH = NULL;
-	_offScreenP = NULL;
-	_screenP = NULL;
-	_screenPitch = gVars->screenPitch;
-
-	_wasKey = false;
-	_lastKeyModifier = kModifierNone;
-	_lastKeyRepeat = 100;
-	_useNumPad = false;
-	_showBatLow = false;
-	_batCheckTicks = SysTicksPerSecond() * 15;
-	_batCheckLast = TimGetTicks();
-
-	_saveMgr = 0;
-	_timerMgr = 0;
-	_mixerMgr = 0;
-
-	_mouseDataP = NULL;
-	_mouseBackupP = NULL;
-	_mouseVisible = false;
-	_mouseDrawn = false;
-	MemSet(&_keyExtra, sizeof(_keyExtra), 0);
-	MemSet(&_mouseCurState, sizeof(_mouseCurState), 0);
-	MemSet(&_mouseOldState, sizeof(_mouseOldState), 0);
-	MemSet(&_timer, sizeof(TimerType), 0);
-	MemSet(&_sound, sizeof(SoundType), 0);
-
-	_keyExtraRepeat = 0;
-	_keyExtraPressed = 0;
-	_keyExtraDelay = (gVars->arrowKeys) ? computeMsecs(125) : computeMsecs(25);
-}
-
-static int timer_handler(int t) {
-	DefaultTimerManager *tm = (DefaultTimerManager *)g_system->getTimerManager();
-	tm->handler();
-	return t;
-}
-
-void OSystem_PalmBase::initBackend() {
-	if (gVars->autoSave != -1)
-		ConfMan.setInt("autosave_period", gVars->autoSave);
-
-	_keyExtra.bitUp		= keyBitPageUp;
-	_keyExtra.bitDown	= keyBitPageDown;
-	_keyExtra.bitLeft	= keyBitHard2;
-	_keyExtra.bitRight	= keyBitHard3;
-
-	int_initBackend();
-	_keyExtraMask = (_keyExtra.bitUp | _keyExtra.bitDown | _keyExtra.bitLeft | _keyExtra.bitRight | _keyExtra.bitActionA | _keyExtra.bitActionB);
-
-	// Create the savefile manager, if none exists yet (we check for this to
-	// allow subclasses to provide their own).
-	if (_saveMgr == 0) {
-		_saveMgr = new DefaultSaveFileManager(DEFAULT_SAVE_PATH);
-	}
-
-	// Create and hook up the mixer, if none exists yet (we check for this to
-	// allow subclasses to provide their own).
-	if (_mixerMgr == 0) {
-		setupMixer();
-	}
-
-	// Create and hook up the timer manager, if none exists yet (we check for
-	// this to allow subclasses to provide their own).
-	if (_timerMgr == 0) {
-		_timerMgr = new DefaultTimerManager();
-		setTimerCallback(::timer_handler, 10);
-	}
-
-	OSystem::initBackend();
-}
-
-void OSystem_PalmBase::getTimeAndDate(TimeDate &td) const {
-	time_t curTime = time(0);
-	struct tm t = *localtime(&curTime);
-	td.tm_sec = t.tm_sec;
-	td.tm_min = t.tm_min;
-	td.tm_hour = t.tm_hour;
-	td.tm_mday = t.tm_mday;
-	td.tm_mon = t.tm_mon;
-	td.tm_year = t.tm_year;
-}
-
-uint32 OSystem_PalmBase::getMillis() {
-	return TimGetTicks() * 1000 / SysTicksPerSecond();
-}
-
-void OSystem_PalmBase::delayMillis(uint msecs) {
-	Int32 delay = computeMsecs(msecs);
-
-	if (delay > 0)
-		SysTaskDelay(delay);
-}
-
-void OSystem_PalmBase::setTimerCallback(TimerProc callback, int timer) {
-	if (callback != NULL) {
-		_timer.duration = timer;
-		_timer.nextExpiry = getMillis() + timer;
-		_timer.callback = callback;
-		_timer.active = true;
-	} else {
-		_timer.active = false;
-	}
-}
-
-void OSystem_PalmBase::quit() {
-	int_quit();
-	clearSoundCallback();
-	unload_gfx_mode();
-
-	if (_mouseDataP) {
-		MemPtrFree(_mouseBackupP);
-		MemPtrFree(_mouseDataP);
-	}
-
-	delete _saveMgr;
-	delete _timerMgr;
-	delete _mixerMgr;
-
-	exit(0);
-}
-
-Common::SaveFileManager *OSystem_PalmBase::getSavefileManager() {
-	return _saveMgr;
-}
-
-Audio::Mixer *OSystem_PalmBase::getMixer() {
-	return _mixerMgr;
-}
-
-Common::TimerManager *OSystem_PalmBase::getTimerManager() {
-	return _timerMgr;
-}
-
-FilesystemFactory *OSystem_PalmBase::getFilesystemFactory() {
-	return &PalmOSFilesystemFactory::instance();
-}
-
-
-#define PALMOS_CONFIG_FILE "/PALM/Programs/ScummVM/scummvm.ini"
-
-Common::SeekableReadStream *OSystem_PalmBase::createConfigReadStream() {
-	Common::FSNode file(PALMOS_CONFIG_FILE);
-	return file.createReadStream();
-}
-
-Common::WriteStream *OSystem_PalmBase::createConfigWriteStream() {
-	Common::FSNode file(PALMOS_CONFIG_FILE);
-	return file.createWriteStream();
-}
diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
deleted file mode 100644
index 1885114ace..0000000000
--- a/backends/platform/PalmOS/Src/be_base.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BE_BASE_H
-#define BE_BASE_H
-
-#include <time.h>
-
-#include "PalmVersion.h"
-#include "globals.h"
-
-#include "backends/base-backend.h"
-#include "common/scummsys.h"
-#include "common/events.h"
-#include "graphics/surface.h"
-#include "graphics/colormasks.h"
-
-namespace Audio {
-	class MixerImpl;
-}
-
-namespace Common {
-	class SaveFileManager;
-	class TimerManager;
-}
-
-enum {
-	GFX_NORMAL = 0,
-	GFX_WIDE,
-};
-
-// OSD key state
-enum {
-	kModifierNone = 0,
-	kModifierCommand,
-	kModifierAlt,
-	kModifierCtrl,
-	kModifierCount
-};
-
-// Mouse button event
-enum {
-	vchrMouseLeft = vchrHardKeyMax - 2,
-	vchrMouseRight = vchrHardKeyMax - 1
-};
-
-// OSD resource id
-#define kDrawKeyState	3000
-#define kDrawNumPad		3010
-#define kDrawBatLow		3020
-#define kDrawFight		3030
-
-#define computeMsecs(x) ((SysTicksPerSecond() * x) / 1000)
-
-
-//typedef void (*SoundProc)(void *param, byte *buf, int len);
-typedef void (*SoundProc)(byte *buf, uint len);
-typedef int (*TimerProc)(int interval);
-
-typedef struct {
-	UInt32 duration, nextExpiry;
-	Boolean active;
-	TimerProc callback;
-} TimerType, *TimerPtr;
-
-typedef struct {
-	Boolean	active;
-	void *proc;
-	void *param;
-} SoundType, *SoundPtr;
-
-class OSystem_PalmBase : public BaseBackend {
-private:
-	virtual void int_initBackend() { }
-
-	virtual const GraphicsMode *int_getSupportedGraphicsModes() const;
-	virtual void int_updateScreen() = 0;
-	virtual void int_initSize(uint w, uint h) = 0;
-	virtual void int_setShakePos(int shakeOffset) { }
-
-	virtual void extras_palette(uint8 index, uint8 r, uint8 g, uint8 b) { }
-	virtual void int_quit() { }
-
-	virtual void unload_gfx_mode() = 0;
-	virtual void load_gfx_mode() = 0;
-
-	virtual void draw_mouse() = 0;
-	virtual void undraw_mouse() = 0;
-
-	virtual bool check_event(Common::Event &event, EventPtr ev) = 0;
-
-	virtual void timer_handler();
-	void battery_handler();
-	virtual void get_coordinates(EventPtr ev, Coord &x, Coord &y) = 0;
-	void simulate_mouse(Common::Event &event, Int8 iHoriz, Int8 iVert, Coord *xr, Coord *yr);
-
-	virtual void sound_handler() = 0;
-	virtual bool setupMixer() = 0;
-	virtual void clearSoundCallback() = 0;
-
-protected:
-	OSystem_PalmBase();
-
-	virtual void draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color = 0);
-	virtual void clear_screen() = 0;
-
-	struct MousePos {
-		int16 x,y,w,h;
-	};
-
-	TimerType _timer;
-	SoundType _sound;
-
-	Common::SaveFileManager *_saveMgr;
-	Audio::MixerImpl *_mixerMgr;
-	Common::TimerManager *_timerMgr;
-
-	RGBColorType _currentPalette[256];
-	uint _paletteDirtyStart, _paletteDirtyEnd;
-
-	int _mode, _setMode;
-	int16 _screenWidth, _screenHeight;
-	Boolean _modeChanged, _gfxLoaded;
-	UInt32 _screenPitch;
-
-	PointType _screenOffset;
-	struct {
-		Coord w, h;
-	} _screenDest;
-	byte *_screenP, *_offScreenP;
-	WinHandle _screenH, _offScreenH;
-
-	int _current_shake_pos;
-	int _new_shake_pos;
-
-	Boolean _overlayVisible;
-	Boolean _redawOSD, _setPalette;
-
-	UInt32 _keyExtraMask, _keyExtraPressed, _keyExtraRepeat, _keyExtraDelay;
-	struct {
-		UInt32 bitUp;
-		UInt32 bitDown;
-		UInt32 bitLeft;
-		UInt32 bitRight;
-		UInt32 bitActionA;	// left mouse button
-		UInt32 bitActionB;	// right mouse button
-	} _keyExtra;
-
-	bool _mouseVisible;
-	bool _mouseDrawn;
-	MousePos _mouseCurState;
-	MousePos _mouseOldState;
-	int16 _mouseHotspotX;
-	int16 _mouseHotspotY;
-	byte _mouseKeyColor;
-	byte *_mouseDataP, *_mouseBackupP;
-
-
-	bool _wasKey;
-	UInt8 _lastKeyModifier;
-	UInt32 _lastKeyRepeat;
-	Boolean _useNumPad, _showBatLow;
-	UInt32 _batCheckTicks, _batCheckLast;
-
-public:
-	void initBackend();
-
-/*
-	virtual void setFeatureState(Feature f, bool enable) {};
-
-
-	bool hasFeature(Feature f);
-	bool getFeatureState(Feature f);
-
-	virtual void beginGFXTransaction();
-	virtual void endGFXTransaction();
-
-	virtual int16 getOverlayHeight();
-	virtual int16 getOverlayWidth();
-
-	virtual void setCursorPalette(const byte *colors, uint start, uint num);
-	virtual void disableCursorPalette(bool disable);
-
-	virtual void displayMessageOnOSD(const char *msg);
-*/
-	const GraphicsMode *getSupportedGraphicsModes() const;
-	int getGraphicsMode() const;
-	virtual int getDefaultGraphicsMode() const;
-	virtual bool setGraphicsMode(int mode);
-
-	void initSize(uint w, uint h, const Graphics::PixelFormat *format);
-	int16 getWidth() { return _screenWidth; }
-	int16 getHeight() { return _screenHeight; }
-
-	void setShakePos(int shakeOffset);
-	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) = 0;
-	virtual void updateScreen();
-
-	bool showMouse(bool visible);
-	void warpMouse(int x, int y);
-	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
-
-	virtual void showOverlay() = 0;
-	virtual void hideOverlay() = 0;
-	virtual void clearOverlay() = 0;
-	virtual void grabOverlay(OverlayColor *buf, int pitch) = 0;
-	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) = 0;
-
-	int16 getOverlayWidth() { return getWidth(); }
-	int16 getOverlayHeight() { return getHeight(); }
-
-	void setPalette(const byte *colors, uint start, uint num);
-	void grabPalette(byte *colors, uint start, uint num);
-	virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
-
-	bool pollEvent(Common::Event &event);
-
-
-	void getTimeAndDate(TimeDate& td) const;
-	virtual uint32 getMillis();
-	virtual void delayMillis(uint msecs);
-
-	virtual void setTimerCallback(TimerProc callback, int interval);
-
-	virtual MutexRef createMutex() { return NULL; }
-	virtual void lockMutex(MutexRef mutex) {}
-	virtual void unlockMutex(MutexRef mutex) {}
-	virtual void deleteMutex(MutexRef mutex) {}
-
-	virtual Audio::Mixer *getMixer();
-
-	void quit();
-	virtual void setWindowCaption(const char *caption) = 0;
-
-	Common::SaveFileManager *getSavefileManager();
-	Common::TimerManager *getTimerManager();
-	FilesystemFactory *getFilesystemFactory();
-
-	virtual Common::SeekableReadStream *createConfigReadStream();
-	virtual Common::WriteStream *createConfigWriteStream();
-};
-
-#endif
diff --git a/backends/platform/PalmOS/Src/be_os5.cpp b/backends/platform/PalmOS/Src/be_os5.cpp
deleted file mode 100644
index c9ef9ecf7c..0000000000
--- a/backends/platform/PalmOS/Src/be_os5.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-#include <HsKeyCommon.h>
-
-OSystem_PalmOS5::OSystem_PalmOS5() : OSystem_PalmBase() {
-	_sound.active = false;
-	_setPalette = false;
-
-	_workScreenH = NULL;
-	_overlayH = NULL;
-	_isSwitchable = false;
-	_wasRotated = false;
-	_cursorPaletteDisabled = true;
-
-	MemSet(&_soundEx, sizeof(SoundExType), 0);
-	_soundEx.sound = &_sound;
-}
-
-void OSystem_PalmOS5::calc_scale() {
-	for (int y = 0; y < _screenDest.h; y++) {
-		int ys = y * _screenHeight / _screenDest.h;
-		_scaleTableY[y] = ys * _screenWidth;
-	}
-
-	for (int x = 0; x < _screenDest.w; x++) {
-		int xs = x * _screenWidth / _screenDest.w;
-		_scaleTableX[x] = xs;
-	}
-}
-
-void OSystem_PalmOS5::calc_rect(Boolean fullscreen) {
-	Int32 w, h;
-
-	if (fullscreen) {
-		w = (_ratio.adjustAspect == kRatioWidth) ? _ratio.width : gVars->screenFullWidth;
-		h = (_ratio.adjustAspect == kRatioHeight) ? _ratio.height : gVars->screenFullHeight;
-
-		_screenOffset.x = (_ratio.adjustAspect == kRatioWidth) ? (gVars->screenFullWidth - _ratio.width) / 2 : 0;
-		_screenOffset.y = (_ratio.adjustAspect == kRatioHeight) ? (gVars->screenFullHeight - _ratio.height) / 2 : 0;
-
-	} else {
-		w = gVars->screenWidth;
-		h = gVars->screenHeight * _screenHeight / _screenWidth;
-
-		_screenOffset.x = 0;
-		_screenOffset.y = (gVars->screenHeight - h) / 2;
-	}
-
-	_screenDest.w = w;
-	_screenDest.h = h;
-}
-
-void OSystem_PalmOS5::int_initBackend() {
-	_keyExtra.bitUp		= keyBitRockerUp|keyBitPageUp;
-	_keyExtra.bitDown	= keyBitRockerDown|keyBitPageDown;
-	_keyExtra.bitLeft	= keyBitRockerLeft;
-	_keyExtra.bitRight	= keyBitRockerRight;
-	_keyExtra.bitActionA	= keyBitHard3;
-	_keyExtra.bitActionB	= keyBitHard4;
-}
-
-bool OSystem_PalmOS5::hasFeature(Feature f) {
-	switch (f) {
-		case kFeatureCursorHasPalette:
-			return true;
-	}
-
-	return false;
-}
-
-void OSystem_PalmOS5::setFeatureState(Feature f, bool enable) {
-	switch (f) {
-/*		case kFeatureFullscreenMode:
-			if (_gfxLoaded)
-				if (OPTIONS_TST(kOptModeWide) && _initMode != GFX_WIDE) {
-					_fullscreen = enable;
-					hotswap_gfx_mode(_mode);
-				}
-			break;
-*/
-		case kFeatureAspectRatioCorrection:
-			if (_mode == GFX_WIDE) {
-				_ratio.adjustAspect = (_ratio.adjustAspect + 1) % 3;
-				//calc_rect(true);
-				hotswap_gfx_mode(_mode);
-//				TwGfxSetClip(_palmScreenP, &_dstRect);
-				clear_screen();
-			}
-			break;
-	}
-}
-
-void OSystem_PalmOS5::setWindowCaption(const char *caption) {
-/*
-FIXME/TODO: Convert caption from ISO Latin 1 to "right" encoding ?
-If the output encoding is unclear or conversion impossible,
-then one could just skip over any chars > 0x7F and display the rest
-*/
-	Err e;
-	Char buf[64];
-	Coord w, y, h = FntLineHeight() + 2;
-	const Char *loading = "Loading, please wait\0";
-
-	// allocate bitmap
-	BitmapTypeV3 *bmp2P;
-	BitmapType *bmp1P = BmpCreate(320, (h * 3), 8, NULL, &e);
-	WinHandle tmpH = WinCreateBitmapWindow(bmp1P, &e);
-
-	WinSetDrawWindow(tmpH);
-	WinSetBackColor(0);
-	WinSetTextColor(255);
-	WinEraseWindow();
-
-	// loading message
-	FntSetFont(boldFont);
-	w = FntCharsWidth(loading, StrLen(loading));
-	w = (320 - w) / 2;
-	WinDrawChars(loading, StrLen(loading), w, 0 + h);
-
-	// caption
-	FntSetFont(stdFont);
-	w = FntCharsWidth(caption, StrLen(caption));
-	w = (320 - w) / 2;
-	WinDrawChars(caption, StrLen(caption), w, 0);
-
-	// memory size
-	StrPrintF(buf, "memory : %ld KB", gVars->startupMemory);
-	w = FntCharsWidth(buf, StrLen(buf));
-	w = (320 - w) / 2;
-	WinDrawChars(buf, StrLen(buf), w, h * 2);
-
-	// set the bitmap as v3
-	bmp2P = BmpCreateBitmapV3(bmp1P, kDensityDouble, BmpGetBits(bmp1P), NULL);
-	y = (80 - (h / 4) - 5);
-
-	// draw it
-	WinSetDrawWindow(WinGetDisplayWindow());
-	WinEraseWindow();
-	WinDrawBitmap((BitmapPtr)bmp2P, 0, y);
-
-	// free
-	WinDeleteWindow(tmpH, 0);
-	BmpDelete((BitmapPtr)bmp2P);
-	BmpDelete(bmp1P);
-}
diff --git a/backends/platform/PalmOS/Src/be_os5.h b/backends/platform/PalmOS/Src/be_os5.h
deleted file mode 100644
index 2040c7faea..0000000000
--- a/backends/platform/PalmOS/Src/be_os5.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BE_OS5_H
-#define BE_OS5_H
-
-#include "be_base.h"
-
-#if !defined(SYSTEM_CALLBACK) || defined(PALMOS_68K)
-#	define SYSTEM_CALLBACK
-#	ifdef PALMOS_ARM
-#		define CALLBACK_PROLOGUE \
-			__asm { \
-				stmfd  r13!,{r9,r10}; \
-				ldr	   r9,[r0]; \
-				ldr	   r10,[r0,#4]; \
-			}
-#		define CALLBACK_EPILOGUE __asm { ldmfd  r13!,{r9,r10} }
-#		define CALLBACK_INIT(regs) \
-			__asm { \
-				ldr  r0, = regs; \
-				add	 r0,r0,r10; \
-				str	 r9,[r0]; \
-				str	 r10,[r0,#4]; \
-			}
-#	else
-#		define CALLBACK_PROLOGUE \
-			asm (	\
-				movem.l a4-a5, -(sp);	\
-				move.l UserDataP, a0;	\
-				move.l 0(a0), a4;	\
-				move.l 4(a0), a5;	\
-			);
-#		define CALLBACK_EPILOGUE asm ( movem.l (sp)+, a4-a5 );
-#		define CALLBACK_INIT(regs) \
-			{	\
-				void *ptr = &regs; \
-				asm (	\
-					move.l	ptr, a0;	\
-					move.l	a4, 0(a0);	\
-					move.l	a5, 4(a0);	\
-				); \
-			}
-#	endif
-#else
-#	define CALLBACK_PROLOGUE
-#	define CALLBACK_EPILOGUE
-#	define CALLBACK_INIT(regs)
-#endif
-
-// TODO : change / remove this
-#define gfxMakeDisplayRGB_BigEndian(_r,_g,_b) \
-  ( (((_g) & 0xFC) << 11) | (((_b) & 0xF8) << 5) | ((_r) & 0xF8) | (((_g) & 0xFF) >> 5) )
-
-#define gfxMakeDisplayRGB_LittleEndian(_r,_g,_b) \
-  ( (((_r) & 0xF8) << 8) | (((_g) & 0xFC) << 3) | (((_b) & 0xF8) >> 3) )
-
-#if CPU_TYPE == CPU_68K
-#define gfxMakeDisplayRGB(_r,_g,_b) gfxMakeDisplayRGB_BigEndian(_r,_g,_b)
-#else
-#define gfxMakeDisplayRGB(_r,_g,_b) gfxMakeDisplayRGB_LittleEndian(_r,_g,_b)
-#endif
-
-typedef struct {
-	// for real thread version only
-	UInt32 __reg1;
-	UInt32 __reg2;
-
-	// no real thread version
-	Boolean set;
-	UInt32	size;
-	void *dataP;
-
-	// default sound stuff
-	SndStreamRef handle;
-	SoundPtr sound;
-} SoundExType, *SoundExPtr;
-extern SoundExType _soundEx;
-
-class OSystem_PalmOS5 : public OSystem_PalmBase {
-protected:
-	uint16 _nativePal[256], _mousePal[256];
-
-private:
-	uint16 _scaleTableX[512];
-	uint32 _scaleTableY[512];
-
-	typedef void (OSystem_PalmOS5::*RendererProc)(RectangleType &r, PointType &p);
-	RendererProc _render;
-
-	Graphics::Surface _framebuffer;
-
-	OverlayColor *_overlayP;
-	WinHandle _overlayH, _workScreenH;
-	uint16 *_workScreenP;
-
-	Boolean _isSwitchable, _wasRotated;
-
-	virtual void int_initBackend();
-	virtual void int_updateScreen();
-	virtual void int_initSize(uint w, uint h);
-
-	virtual void unload_gfx_mode();
-	virtual void load_gfx_mode();
-	virtual void hotswap_gfx_mode(int mode);
-
-	void draw_mouse();
-	void undraw_mouse();
-	virtual bool check_event(Common::Event &event, EventPtr ev);
-	void extras_palette(uint8 index, uint8 r, uint8 g, uint8 b);
-	void calc_scale();
-
-	void render_landscapeAny(RectangleType &r, PointType &p);
-	void render_landscape15x(RectangleType &r, PointType &p);
-	void render_1x(RectangleType &r, PointType &p);
-	WinHandle alloc_screen(Coord w, Coord h);
-	virtual void draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color = 0);
-
-	virtual SndStreamVariableBufferCallback sound_callback();
-	virtual void sound_handler();
-	virtual bool setupMixer();
-	void clearSoundCallback();
-
-protected:
-	UInt16 _sysOldCoord, _sysOldOrientation, _sysOldTriggerState;
-	Boolean _stretched, _cursorPaletteDisabled;
-
-	enum {
-		kRatioNone = 0,
-		kRatioHeight,
-		kRatioWidth
-	};
-	struct {
-		UInt8 adjustAspect;
-		Coord width;	// (width x 320)
-		Coord height;	// (480 x height)
-	} _ratio;
-
-	void calc_rect(Boolean fullscreen);
-	void get_coordinates(EventPtr ev, Coord &x, Coord &y);
-	void clear_screen();
-
-public:
-	OSystem_PalmOS5();
-	static OSystem *create();
-
-	bool hasFeature(Feature f);
-	void setFeatureState(Feature f, bool enable);
-
-	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
-	virtual Graphics::Surface *lockScreen();
-	virtual void unlockScreen();
-
-	void setCursorPalette(const byte *colors, uint start, uint num);
-	void disableCursorPalette(bool disable);
-
-	void showOverlay();
-	void hideOverlay();
-	virtual void clearOverlay();
-	virtual void grabOverlay(OverlayColor *buf, int pitch);
-	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
-
-	void setWindowCaption(const char *caption);
-
-};
-
-#endif
diff --git a/backends/platform/PalmOS/Src/be_os5ex.cpp b/backends/platform/PalmOS/Src/be_os5ex.cpp
deleted file mode 100644
index 05bf5e49ce..0000000000
--- a/backends/platform/PalmOS/Src/be_os5ex.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-// for DAL.h
-#define ALLOW_ACCESS_TO_INTERNALS_OF_BITMAPS
-
-#include "be_os5ex.h"
-#include "palmdefs.h"
-
-#include <System/WIP.h>
-#include <System/DAL.h>
-
-static TimerExType _timerEx;
-
-OSystem_PalmOS5Ex::OSystem_PalmOS5Ex() : OSystem_PalmOS5() {
-	_timerEx.timerID = 0;
-	_timerEx.timer = &_timer;
-	_timerEx.ticks = SysTicksPerSecond();
-}
-
-static SYSTEM_CALLBACK void timer_handler(void *userDataP) {
-	CALLBACK_PROLOGUE
-	TimerExPtr _timerEx = (TimerExPtr)userDataP;
-	TimerPtr _timer = _timerEx->timer;
-	_timer->duration = _timer->callback(_timer->duration);
-	KALTimerSet(_timerEx->timerID, (_timer->duration * _timerEx->ticks / 1000));
-	CALLBACK_EPILOGUE
-}
-
-void OSystem_PalmOS5Ex::setTimerCallback(TimerProc callback, int timer) {
-	if (_timer.active && _timerEx.timerID)
-		KALTimerDelete(_timerEx.timerID);
-
-	if (callback != NULL) {
-		Err e;
-		CALLBACK_INIT(_timerEx);
-		_timer.duration = timer;
-		_timer.callback = callback;
-
-		// create the timer
-		e = KALTimerCreate(&_timerEx.timerID, appFileCreator, &::timer_handler, &_timerEx);
-		if (!e) {
-			e = KALTimerSet(_timerEx.timerID, (timer * _timerEx.ticks / 1000));
-			if (e) KALTimerDelete(_timerEx.timerID);
-		}
-		_timer.active = (!e);
-
-	} else {
-		_timer.active = false;
-	}
-
-	if (!_timer.active)
-		_timerEx.timerID = 0;
-}
-
-OSystem::MutexRef OSystem_PalmOS5Ex::createMutex() {
-	UInt32 mutexID;
-	Err e = KALMutexCreate(&mutexID, appFileCreator);
-	return (MutexRef)(e ? NULL : mutexID);
-
-}
-
-void OSystem_PalmOS5Ex::lockMutex(MutexRef mutex) {
-	if (mutex)
-		KALMutexReserve((UInt32)mutex);
-}
-
-void OSystem_PalmOS5Ex::unlockMutex(MutexRef mutex) {
-	if (mutex)
-		KALMutexRelease((UInt32)mutex, 0);
-}
-
-void OSystem_PalmOS5Ex::deleteMutex(MutexRef mutex) {
-	if (mutex)
-		KALMutexDelete((UInt32)mutex);
-}
-
-void OSystem_PalmOS5Ex::int_quit() {
-	if (_timerEx.timerID)
-		KALTimerDelete(_timerEx.timerID);
-}
diff --git a/backends/platform/PalmOS/Src/be_os5ex.h b/backends/platform/PalmOS/Src/be_os5ex.h
deleted file mode 100644
index f9842d82ac..0000000000
--- a/backends/platform/PalmOS/Src/be_os5ex.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BE_OS5EX_H
-#define BE_OS5EX_H
-
-#include "be_os5.h"
-
-#undef dprintf	// fix compilation in Zodiac mode
-
-#ifndef PALMOS_ARM
-// Not usable with 68k mode (?), so ...
-#define OSystem_PalmOS5Ex	OSystem_PalmOS5
-#else
-
-typedef struct {
-	UInt32 __r9;
-	UInt32 __r10;
-	UInt32 timerID;
-	UInt32 ticks;
-
-	TimerPtr timer;
-} TimerExType, *TimerExPtr;
-
-class OSystem_PalmOS5Ex : public OSystem_PalmOS5 {
-private:
-	void timer_handler() {}
-	void sound_handler() {}
-	void int_quit();
-
-	SndStreamVariableBufferCallback sound_callback();
-
-public:
-	OSystem_PalmOS5Ex();
-	static OSystem *create();
-
-	void setTimerCallback(TimerProc callback, int interval);
-
-	MutexRef createMutex();
-	void lockMutex(MutexRef mutex);
-	void unlockMutex(MutexRef mutex);
-	void deleteMutex(MutexRef mutex);
-};
-#endif
-
-#endif
diff --git a/backends/platform/PalmOS/Src/be_zodiac.cpp b/backends/platform/PalmOS/Src/be_zodiac.cpp
deleted file mode 100644
index d6e7e2c292..0000000000
--- a/backends/platform/PalmOS/Src/be_zodiac.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_zodiac.h"
-
-OSystem_PalmZodiac::OSystem_PalmZodiac() : OSystem_PalmOS5Ex() {
-	_gfxH = NULL;
-	_overlayP = NULL;
-	_palmScreenP = NULL;
-	_tmpScreenP = NULL;
-	_stretched = false;
-}
-
-void OSystem_PalmZodiac::int_initBackend() {
-	_keyExtra.bitUp			= keyBitRockerUp;
-	_keyExtra.bitDown		= keyBitRockerDown;
-	_keyExtra.bitLeft		= keyBitRockerLeft;
-	_keyExtra.bitRight		= keyBitRockerRight;
-
-//	_keyExtra.bitActionA	= keyBitActionD;
-//	_keyExtra.bitActionB	= keyBitActionB;
-}
-
-void OSystem_PalmZodiac::calc_rect(Boolean fullscreen) {
-	OSystem_PalmOS5::calc_rect(fullscreen);
-
-	_dstRect.x = _screenOffset.x;
-	_dstRect.y = _screenOffset.y;
-	_dstRect.w = _screenDest.w;
-	_dstRect.h = _screenDest.h;
-}
-
-void OSystem_PalmZodiac::setFeatureState(Feature f, bool enable) {
-	switch (f) {
-/*		case kFeatureFullscreenMode:
-			if (_gfxLoaded)
-				if (OPTIONS_TST(kOptModeWide) && _initMode != GFX_WIDE) {
-					_fullscreen = enable;
-					hotswap_gfx_mode(_mode);
-				}
-			break;
-*/
-		case kFeatureAspectRatioCorrection:
-			if (_mode == GFX_WIDE) {
-				_ratio.adjustAspect = (_ratio.adjustAspect + 1) % 3;
-				calc_rect(true);
-				TwGfxSetClip(_palmScreenP, &_dstRect);
-				clear_screen();
-			}
-			break;
-	}
-}
diff --git a/backends/platform/PalmOS/Src/be_zodiac.h b/backends/platform/PalmOS/Src/be_zodiac.h
deleted file mode 100644
index 28fcf29ddd..0000000000
--- a/backends/platform/PalmOS/Src/be_zodiac.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BE_ZODIAC_H
-#define BE_ZODIAC_H
-
-#include <tapwave.h>
-#include "be_os5ex.h"
-
-#define MIN_OFFSET	20
-
-class OSystem_PalmZodiac : public OSystem_PalmOS5Ex {
-private:
-
-	TwGfxType *_gfxH;
-	TwGfxSurfaceType *_palmScreenP, *_tmpScreenP;
-	TwGfxSurfaceType *_overlayP;
-	Boolean _fullscreen;
-
-	TwGfxPointType _srcPos;
-	TwGfxRectType _srcRect, _dstRect;
-	TwGfxBitmapType _srcBmp;
-
-	void int_initBackend();
-	void int_setShakePos(int shakeOffset);
-
-	void draw_mouse();
-	void undraw_mouse();
-
-	void unload_gfx_mode();
-	void load_gfx_mode();
-	void hotswap_gfx_mode(int mode);
-
-	void calc_rect(Boolean fullscreen);
-	bool check_event(Common::Event &event, EventPtr ev);
-	void draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color = 0);
-
-public:
-	OSystem_PalmZodiac();
-
-	static OSystem *create();
-
-	void setFeatureState(Feature f, bool enable);
-
-	int getDefaultGraphicsMode() const;
-
-	void updateScreen();
-
-	void clearOverlay();
-	void grabOverlay(OverlayColor *buf, int pitch);
-	void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
-};
-
-#endif
diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
deleted file mode 100644
index c30fba595c..0000000000
--- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/system.h"
-#include "common/config-manager.h"
-
-#include "cd_aeroplayer.h"
-
-AeroCDPlayer::AeroCDPlayer(OSystem *sys) {
-	_sys = sys;
-	StrCopy(gameP, ConfMan.getActiveDomainName().c_str());
-}
-
-bool AeroCDPlayer::init() {
-	aeroplayer_Startup();
-	_isInitialized = aeroplayer_PlayerIsActive();
-
-	if (_isInitialized)
-		_volumeLimit = aeroplayer_GetMaxVolumeIndex();
-
-	return _isInitialized;
-}
-
-void AeroCDPlayer::release() {
-	aeroplayer_Shutdown();
-
-	// self delete
-	delete this;
-}
-
-UInt32 AeroCDPlayer::getStatus() {
-	return aeroplayer_GetPlaybackStatus();
-}
-
-UInt32 AeroCDPlayer::getPosition() {
-	return aeroplayer_GetPosition_msec();
-}
-
-UInt32 AeroCDPlayer::getDuration() {
-	return aeroplayer_GetDuration_msec();
-}
-
-void AeroCDPlayer::setPosition(UInt32 value) {
-	aeroplayer_Seek_abs_msec(value);
-}
-
-void AeroCDPlayer::setVolume(int volume) {
-	_volumeLevel = volume;
-	aeroplayer_SetVolumeIndex((_volumeLimit * volume) / 100);
-}
-
-bool AeroCDPlayer::poll() {
-	return
-	(	_pckLoops != 0 &&
-		(	getPosition() < _pckTrackEndFrame &&
-			getStatus() == AEROPLAYER_STATUS_PLAY
-		)
-	);
-}
-
-void AeroCDPlayer::update() {
-
-	// stop replay upon request of stopCD()
-	if (_pckStopTime != 0 && _sys->getMillis() >= _pckStopTime) {
-		forceStop();
-		_pckLoops = 0;
-		_pckStopTime = 0;
-		_pckTrackEndFrame = 0;
-		return;
-	}
-
-	// not fully played
-	if (getPosition() < _pckTrackEndFrame && getStatus() == AEROPLAYER_STATUS_PLAY)
-		return;
-
-	aeroplayer_Pause();
-//	_pckStopTime = _sys->getMillis();
-
-	// loop again ?
-	if (_pckLoops > 0)
-		_pckLoops--;
-
-	// loop if needed
-	if (_pckLoops == 0)
-		forceStop();
-	else {
-		//_pckStopTime = 0;
-
-		if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
-			setPosition(0);
-		} else {
-			setPosition(_pckTrackStartFrame);
-		}
-
-		aeroplayer_Play();
-		_pckEndTime = _sys->getMillis() + _pckTrackDuration;
-	}
-}
-
-void AeroCDPlayer::stop() {
-	_pckStopTime = _sys->getMillis();
-	_pckLoops = 0;
-	return;
-}
-
-void AeroCDPlayer::forceStop() {
-	if (getStatus() != AEROPLAYER_STATUS_STOP)
-		aeroplayer_PlayTrack(vfsInvalidVolRef, NULL);
-}
-
-void AeroCDPlayer::play(int track, int num_loops, int start_frame, int duration) {
-	if (!num_loops && !start_frame)
-		return;
-
-	Char fileP[100];
-	static const Char *ext[] = { "mp3", "ogg" };
-
-//	if (duration > 0)
-//		duration += 5;
-
-	_pckTrack = track;
-	_pckLoops = num_loops;
-	_pckTrackStartFrame = TO_MSECS(start_frame);
-	_pckTrackDuration = TO_MSECS(duration);
-
-	StrPrintF(fileP, "/Palm/Programs/ScummVM/Audio/%s_%03ld.%s", gameP, (track + gVars->CD.firstTrack - 1), ext[gVars->CD.format]);
-	aeroplayer_Pause();
-	aeroplayer_PlayTrack(gVars->VFS.volRefNum, fileP);
-	aeroplayer_Pause();
-
-	if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
-		_pckTrackDuration = getDuration();
-	} else {
-		setPosition(_pckTrackStartFrame);
-		if (_pckTrackDuration == 0)
-			_pckTrackDuration = getDuration() - _pckTrackStartFrame;
-	}
-
-	aeroplayer_Play();
-
-	_pckStopTime = 0;
-	_pckTrackEndFrame = _pckTrackStartFrame + _pckTrackDuration;
-	_pckEndTime = _sys->getMillis() + _pckTrackDuration;
-}
diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.h b/backends/platform/PalmOS/Src/cd_aeroplayer.h
deleted file mode 100644
index e661e06d52..0000000000
--- a/backends/platform/PalmOS/Src/cd_aeroplayer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef CD_AEROPLAYER_H
-#define CD_AEROPLAYER_H
-
-#include "cdaudio.h"
-#include "aeroplayer_public.h"
-
-class AeroCDPlayer : public CDAudio {
-public:
-	AeroCDPlayer(OSystem *sys);
-
-	bool init();
-	void release();
-
-	bool poll();
-	void update();
-	void play(int track, int num_loops, int start_frame, int duration);
-	void stop();
-
-	void setVolume(int volume);
-
-private:
-	OSystem *_sys;
-	Char gameP[15];
-
-	UInt32 getStatus();
-	void setPosition(UInt32 value);
-	UInt32 getDuration();
-	UInt32 getPosition();
-	void forceStop();
-
-	UInt16 _volumeLimit;
-
-	Boolean _isPlaying;
-	// cdrom
-	UInt16 _pckLoops, _pckTrack;
-	UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
-	UInt32 _pckStopTime, _pckEndTime, _pckTrackDuration;
-};
-
-#endif
diff --git a/backends/platform/PalmOS/Src/cd_default.cpp b/backends/platform/PalmOS/Src/cd_default.cpp
deleted file mode 100644
index 416701524d..0000000000
--- a/backends/platform/PalmOS/Src/cd_default.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-#include "common/system.h"
-#include "cd_default.h"
-
-DefaultCDPlayer::DefaultCDPlayer(OSystem *sys) {
-	_sys = sys;
-}
-
-bool DefaultCDPlayer::init() {
-	_isInitialized = true;
-	return _isInitialized;
-}
-
-void DefaultCDPlayer::release() {
-	// self delete
-	delete this;
-}
-
-bool DefaultCDPlayer::poll() {
-	return (_defLoops != 0 && _sys->getMillis() < _defTrackEndFrame);
-}
-
-void DefaultCDPlayer::update() {
-
-	// stop replay upon request of stopCD()
-	if (_defStopTime != 0 && _sys->getMillis() >= _defStopTime) {
-		_defLoops = 0;
-		_defStopTime = 0;
-		_defTrackEndFrame = 0;
-		return;
-	}
-
-	// not fully played
-	if (_sys->getMillis() < _defTrackEndFrame)
-		return;
-
-	if (_defLoops == 0)
-		return;
-
-	// loop again ?
-	if (_defLoops > 0)
-		_defLoops--;
-
-	// loop if needed
-	if (_defLoops != 0) {
-		_defTrackEndFrame = _sys->getMillis() + _defTrackLength;
-	}
-}
-
-void DefaultCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
-	_defStopTime = _sys->getMillis() + 100;
-	_defLoops = 0;
-	return;
-}
-
-void DefaultCDPlayer::play(int track, int num_loops, int start_frame, int duration) {
-	if (!num_loops && !start_frame)
-		return;
-
-	UInt32 fullLength;
-
-	_defLoops = num_loops;
-	start_frame = TO_MSECS(start_frame);
-	duration = TO_MSECS(duration);
-
-	// frame in milli-seconds
-	_defStopTime = 0;
-	fullLength  = start_frame + gVars->CD.defaultTrackLength * 1000;
-
-	if (duration > 0) {
-		_defTrackLength = duration;
-	} else if (start_frame > 0) {
-		_defTrackLength = fullLength;
-		_defTrackLength -= start_frame;
-	} else {
-		_defTrackLength = fullLength;
-	}
-
-	// try to play the track
-	_defTrackEndFrame = _sys->getMillis() + _defTrackLength;
-}
diff --git a/backends/platform/PalmOS/Src/cd_default.h b/backends/platform/PalmOS/Src/cd_default.h
deleted file mode 100644
index 69d909b1e7..0000000000
--- a/backends/platform/PalmOS/Src/cd_default.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
- #ifndef CD_DEFAULT_H
- #define CD_DEFAULT_H
-
- #include "cdaudio.h"
-
- class DefaultCDPlayer : public CDAudio {
- public:
-	DefaultCDPlayer(OSystem *sys);
-
-	bool init();
-	void release();
-
-	bool poll();
-	void update();
-	void play(int track, int num_loops, int start_frame, int duration);
-	void stop();
-
- private:
-	OSystem *_sys;
-
-	// cdrom
-	UInt16 _defLoops;
-	UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength;
- };
-
- #endif
diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp
deleted file mode 100644
index 5812d49b6d..0000000000
--- a/backends/platform/PalmOS/Src/cd_msa.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-#include <SonyClie.h>
-#include "common/system.h"
-#include "cd_msa.h"
-#include "start.h"	// for appFileCreat
-
-static void doErr(Err e, const Char *msg) {
-	Char err[100];
-	StrPrintF(err, "%ld : " , e);
-	StrCat(err,msg);
-	FrmCustomAlert(1000,err,0,0);
-}
-
-MsaCDPlayer::MsaCDPlayer(OSystem *sys) {
-	_sys = sys;
-	_msaRefNum = sysInvalidRefNum;
-
-	_msaLoops = 0;
-	_msaStopTime = 0;
-	_msaTrackEndSu = 0;
-}
-
-bool MsaCDPlayer::init() {
-	SonySysFtrSysInfoP sonySysFtrSysInfoP;
-	Err error = errNone;
-
-	if (!(error = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
-		// not found with audio adapter ?!
-		//if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) {
-			if ((error = SysLibFind(sonySysLibNameMsa, &_msaRefNum)))
-				if (error == sysErrLibNotFound)
-					error = SysLibLoad(sonySysFileTMsaLib, sonySysFileCMsaLib, &_msaRefNum);
-
-			// FIXME : still don't understand how this lib works, it seems to be very unstable
-			// and with the very bad documentation provided by Sony it's difficult to find out why
-			// this doesn't work the same way on build-in MP3 device and external MP3 devices
-			if (!error) {
-				//MsaLibClose(_msaRefNum, msaLibOpenModeAlbum);	// close the lib if we previously let it open (?) Need to add Notify for sonySysNotifyMsaEnforceOpenEvent just in case ...
-				error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum);
-
-				//if (error == msaErrAlreadyOpen)
-				//	error = MsaLibEnforceOpen(_msaRefNum, msaLibOpenModeAlbum, appFileCreator);
-
-				//error = (error != msaErrStillOpen) ? error : errNone;
-			}
-		//}
-	}
-
-//	if (error)
-//		_msaRefNum = sysInvalidRefNum;
-
-	_isInitialized = (_msaRefNum != sysInvalidRefNum);
-	initInternal();
-	return _isInitialized;
-}
-
-void MsaCDPlayer::initInternal() {
-	if (!_isInitialized)
-		return;
-
-	Err e;
-	Char nameP[256];
-	UInt32 dummy, albumIterater = albumIteratorStart;
-
-	MemSet(&_msaAlbum, sizeof(_msaAlbum), 0);
-	_msaAlbum.maskflag = msa_INF_ALBUM;
-	_msaAlbum.code = msa_LANG_CODE_ASCII;
-	_msaAlbum.nameP = nameP;
-	_msaAlbum.fileNameLength = 256;
-
-	e = MsaAlbumEnumerate(_msaRefNum, &albumIterater, &_msaAlbum);
-	e = MsaSetAlbum(_msaRefNum, _msaAlbum.albumRefNum, &dummy);
-
-	// TODO : use RMC to control volume
-	MsaOutCapabilityType capability;
-	MsaOutGetCapability(_msaRefNum, &capability);
-	_volumeLLimit = capability.volumeLLimit;
-	_volumeRLimit = capability.volumeRLimit;
-}
-
-void MsaCDPlayer::setVolume(int volume) {
-	_volumeLevel = volume;
-	MsaOutSetVolume(_msaRefNum, (_volumeLLimit * volume) / 100, (_volumeRLimit * volume) / 100);
-}
-
-void MsaCDPlayer::release() {
-	if (_isInitialized) {
-		if (_msaRefNum != sysInvalidRefNum) {
-			// stop the current track if any (needed if we use enforce open to prevent the track to play after exit)
-			MsaStop(_msaRefNum, true);
-			MsaLibClose(_msaRefNum, msaLibOpenModeAlbum);
-		}
-	}
-
-	// self delete
-	delete this;
-}
-
-bool MsaCDPlayer::poll() {
-	if (!_isInitialized)
-		return false;
-
-	MsaPBStatus pb;
-	MsaGetPBStatus(_msaRefNum, &pb);
-	return (_msaLoops != 0 && (pb.currentSU < _msaTrackEndSu || pb.status != msa_STOPSTATUS));
-}
-
-void MsaCDPlayer::update() {
-	if (!_isInitialized)
-		return;
-
-	// get playback status
-	MsaPBStatus pb;
-	MsaGetPBStatus(_msaRefNum, &pb);
-
-	// stop replay upon request of stopCD()
-	if (_msaStopTime != 0 && _sys->getMillis() >= _msaStopTime) {
-		MsaStop(_msaRefNum, true);
-		_msaLoops = 0;
-		_msaStopTime = 0;
-		_msaTrackEndSu = 0;
-		return;
-	}
-
-	// not fully played nad still playing the correct track
-	// (when playing a full track the return SU is not correct
-	// and so we need to check if we are still playing the correct track)
-	if (pb.currentSU < _msaTrackEndSu) {
-		UInt16 trackNo;
-		MsaPBListIndexToTrackNo(_msaRefNum, pb.currentpblistindex, &trackNo);
-		if (trackNo == _msaTrack)
-			return;
-	}
-
-	MsaStop(_msaRefNum, true);
-
-	if (_msaLoops == 0)
-		return;
-
-	// track ends and last play, force stop if still playing
-/*	if (_msaLoops != 1 && pb.status != msa_STOPSTATUS) {
-		MsaStop(_msaRefNum, true);
-		return;
-	}
-*/
-	// loop again ?
-	if (_msaLoops > 0)
-		_msaLoops--;
-
-	// loop if needed
-	if (_msaLoops != 0) {
-		if (_msaStartFrame == 0 && _msaDuration == 0)
-			MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
-		else
-			MsaPlay(_msaRefNum, _msaTrack, _msaTrackStartSu, msa_PBRATE_SP);
-	}
-}
-
-void MsaCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
-	if (!_isInitialized)
-		return;
-
-	_msaStopTime = _sys->getMillis() + 100;
-	_msaLoops = 0;
-	return;
-}
-
-void MsaCDPlayer::play(int track, int num_loops, int start_frame, int duration) {
-	if (!_isInitialized)
-		return;
-
-	if (!num_loops && !start_frame)
-		return;
-
-	_msaTrack = track + gVars->CD.firstTrack - 1;	// first track >= 1 ?, not 0 (0=album)
-	_msaLoops = num_loops;
-	_msaStartFrame = TO_MSECS(start_frame);
-	_msaDuration = TO_MSECS(duration);
-
-	Err e;
-	MemHandle trackH;
-
-	// stop current play if any
-	MsaStop(_msaRefNum, true);
-	_msaStopTime = 0;
-
-	// retreive track infos
-	e = MsaGetTrackInfo(_msaRefNum, _msaTrack, 0, msa_LANG_CODE_ASCII, &trackH);
-
-	// track exists
-	if (!e && trackH) {
-		MsaTime msaTime;
-		MsaTrackInfo *trackP;
-		UInt32 SU, fullLength;
-
-		// FIXME (?) : this enable MsaSuToTime to return the right value in some cases
-		MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
-		MsaStop(_msaRefNum, true);
-
-		// get the msa time
-		trackP = (MsaTrackInfo *)MemHandleLock(trackH);
-		MsaSuToTime(_msaRefNum, trackP->totalsu, &msaTime);
-		SU = trackP->totalsu;
-		MemPtrUnlock(trackP);
-		MemHandleFree(trackH);
-
-		// MSA frame in milli-seconds
-		fullLength  = FROM_MIN(msaTime.minute);
-		fullLength += FROM_SEC(msaTime.second);
-		fullLength += msaTime.frame;
-
-		if (_msaDuration > 0) {
-			_msaTrackLength = _msaDuration;
-		} else if (_msaStartFrame > 0) {
-			_msaTrackLength = fullLength;
-			_msaTrackLength -= _msaStartFrame;
-		} else {
-			_msaTrackLength = fullLength;
-		}
-
-		// try to play the track
-		if (start_frame == 0 && duration == 0) {
-			MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
-			_msaTrackEndSu = SU;
-		} else {
-			// FIXME : MsaTimeToSu doesn't work ... (may work with previous FIXME)
-			_msaTrackStartSu = (UInt32) ((float)(_msaStartFrame)  / ((float)fullLength / (float)SU));
-			_msaTrackEndSu	 = (UInt32) ((float)(_msaTrackLength) / ((float)fullLength / (float)SU));
-			_msaTrackEndSu	+= _msaTrackStartSu;
-
-			if (_msaTrackEndSu > SU)
-				_msaTrackEndSu = SU;
-
-			MsaPlay(_msaRefNum, _msaTrack, _msaTrackStartSu, msa_PBRATE_SP);
-		}
-	}
-	// TODO : use default track length if track not found
-}
diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp
deleted file mode 100644
index 5a9f3874eb..0000000000
--- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-#include "common/system.h"
-#include "common/config-manager.h"
-
-#include "cd_pockettunes.h"
-
-PckTunesCDPlayer::PckTunesCDPlayer(OSystem *sys) {
-	_sys = sys;
-	StrCopy(gameP, ConfMan.getActiveDomainName().c_str());
-}
-
-bool PckTunesCDPlayer::init() {
-	PocketTunesStart();
-	_isInitialized = PocketTunesIsRunning();
-	_isPlaying = false;
-	_pAction = NULL;
-
-	if (_isInitialized) {
-		_pAction = (PocketTunesAction*)MemPtrNew(sizeof(PocketTunesAction));
-		_volumeLimit = getVolumeLimit();
-	}
-
-	_isInitialized = (_isInitialized && _pAction);
-	return _isInitialized;
-}
-
-void PckTunesCDPlayer::release() {
-	PocketTunesStop();
-	if (_pAction)
-		MemPtrFree(_pAction);
-
-	// self delete
-	delete this;
-}
-
-UInt32 PckTunesCDPlayer::getVolumeLimit() {
-	UInt32 value = 0;
-
-	if (!_pAction)
-		return value;
-
-	_pAction->action = kPocketTunesActionGetValue;
-	_pAction->data.getValueAction.which = kPtunesValueMaxVolume;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	if (PocketTunesCallSynch(_pAction) == errNone)
-		value = _pAction->data.getValueAction.value;
-
-	return value;
-}
-
-UInt32 PckTunesCDPlayer::getStatus() {
-	UInt32 status = kPtunesStopped;
-
-	if (!_isPlaying || !_pAction)
-		return status;
-
-	_pAction->action = kPocketTunesActionGetStatus;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	if (PocketTunesCallSynch(_pAction) == errNone)
-		status = _pAction->data.getStatusAction.status;
-
-	return status;
-}
-
-UInt32 PckTunesCDPlayer::getPosition(UInt32 deflt) {
-	UInt32 value = deflt;
-
-	if (!_isPlaying || !_pAction)
-		return value;
-
-	_pAction->action = kPocketTunesActionGetValue;
-	_pAction->data.getValueAction.which = kPtunesValueSongPosition;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	if (PocketTunesCallSynch(_pAction) == errNone)
-		value = _pAction->data.getValueAction.value;
-
-	return value;
-}
-
-UInt32 PckTunesCDPlayer::getDuration() {
-	UInt32 value = gVars->CD.defaultTrackLength;
-
-	if (!_isPlaying || !_pAction)
-		return value;
-
-	_pAction->action = kPocketTunesActionGetValue;
-	_pAction->data.getValueAction.which = kPtunesValueSongDuration;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	if (PocketTunesCallSynch(_pAction) == errNone)
-		value = _pAction->data.getValueAction.value;
-
-	return value;
-}
-
-void PckTunesCDPlayer::setPosition(UInt32 value) {
-	if (!_isPlaying)
-		return;
-
-	PocketTunesAction *pAction = AllocateAsynchronousActionStruct();
-	if (!pAction)
-		return;
-
-	pAction->action = kPocketTunesActionSetValue;
-	pAction->data.getValueAction.which = kPtunesValueSongPosition;
-	pAction->data.getValueAction.value = value;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	PocketTunesCall(pAction);
-}
-
-void PckTunesCDPlayer::setVolume(int volume) {
-	_volumeLevel = volume;
-
-	PocketTunesAction *pAction = AllocateAsynchronousActionStruct();
-	if (!pAction)
-		return;
-
-	pAction->action = kPocketTunesActionSetValue;
-	pAction->data.getValueAction.which = kPtunesValueVolume;
-	pAction->data.getValueAction.value = (_volumeLimit * volume) / 100;
-
-	EvtGetEvent(&_eAction, evtNoWait);
-	PocketTunesCall(pAction);
-}
-
-bool PckTunesCDPlayer::poll() {
-	return (_pckLoops != 0 && (getPosition(_pckTrackEndFrame) < _pckTrackEndFrame || getStatus() != kPtunesStopped));
-}
-
-void PckTunesCDPlayer::update() {
-
-	// stop replay upon request of stopCD()
-	if (_pckStopTime != 0 && _sys->getMillis() >= _pckStopTime) {
-		PocketTunesStop();
-		_pckLoops = 0;
-		_pckStopTime = 0;
-		_pckTrackEndFrame = 0;
-		return;
-	}
-
-	// not fully played
-	if (getPosition(_pckTrackEndFrame) < _pckTrackEndFrame && getStatus() != kPtunesStopped)
-		return;
-
-	PocketTunesStop();
-
-	if (_pckLoops == 0)
-		return;
-
-	// loop again ?
-	if (_pckLoops > 0)
-		_pckLoops--;
-
-	// loop if needed
-	if (_pckLoops != 0 && _isPlaying) {
-		if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
-			setPosition(0);
-		} else {
-			setPosition(_pckTrackStartFrame);
-		}
-
-		PocketTunesPlay();
-	}
-}
-
-void PckTunesCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
-	_pckStopTime = _sys->getMillis() + 100;
-	_pckLoops = 0;
-	return;
-}
-
-void PckTunesCDPlayer::play(int track, int num_loops, int start_frame, int duration) {
-	if (!num_loops && !start_frame)
-		return;
-
-	EventType e;
-	Char nameP[256], fileP[100];
-	static const Char *ext[] = { "mp3", "ogg" };
-
-	_pckTrack = track;
-	_pckLoops = num_loops;
-	_pckTrackStartFrame = TO_MSECS(start_frame);
-	_pckTrackDuration = TO_MSECS(duration);
-
-	VFSVolumeGetLabel(gVars->VFS.volRefNum, nameP, 256);
-
-	StrPrintF(fileP, "/Palm/Programs/ScummVM/Audio/%s_%03ld.%s", gameP, (track + gVars->CD.firstTrack - 1), ext[gVars->CD.format]);
-
-	if (PocketTunesOpenFile(nameP, fileP, 0) == errNone) {
-		EvtGetEvent(&e, evtNoWait);
-		PocketTunesPauseIfPlaying();
-		_isPlaying = true;
-
-		if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
-			_pckTrackDuration = getDuration();
-		} else {
-			setPosition(_pckTrackStartFrame);
-			if (_pckTrackDuration == 0)
-				_pckTrackDuration = getDuration() - _pckTrackStartFrame;
-		}
-
-		PocketTunesPlay();
-
-	} else {
-		_isPlaying = false;
-		_pckTrackDuration = gVars->CD.defaultTrackLength * 1000;
-	}
-
-	_pckStopTime = 0;
-	_pckTrackEndFrame = _pckTrackStartFrame + _pckTrackDuration;
-}
diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.h b/backends/platform/PalmOS/Src/cd_pockettunes.h
deleted file mode 100644
index 77938d846a..0000000000
--- a/backends/platform/PalmOS/Src/cd_pockettunes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
- #ifndef CD_POCKETTUNES_H
- #define CD_POCKETTUNES_H
-
- #include "cdaudio.h"
- #include "pockettunes.h"
-
- class PckTunesCDPlayer : public CDAudio {
- public:
-	PckTunesCDPlayer(OSystem *sys);
-
-	bool init();
-	void release();
-
-	bool poll();
-	void update();
-	void play(int track, int num_loops, int start_frame, int duration);
-	void stop();
-
-	void setVolume(int volume);
-
- private:
-	OSystem *_sys;
-	Char gameP[15];
-
-	PocketTunesAction *_pAction;	// prevent memory fragmentation
-	EventType _eAction;
-
-	UInt32 getStatus();
-	void setPosition(UInt32 value);
-	UInt32 getDuration();
-	UInt32 getPosition(UInt32 deft);
-
-	UInt32 _volumeLimit;
-	UInt32 getVolumeLimit();
-
-	Boolean _isPlaying;
-	// cdrom
-	UInt16 _pckLoops, _pckTrack;
-	UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
-	UInt32 _pckStopTime, _pckTrackDuration;
- };
-
- #endif
-
diff --git a/backends/platform/PalmOS/Src/cdaudio.h b/backends/platform/PalmOS/Src/cdaudio.h
deleted file mode 100644
index 7a3f5e56e4..0000000000
--- a/backends/platform/PalmOS/Src/cdaudio.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef CDAUDIO_H
-#define CDAUDIO_H
-
-#include "common/system.h"
-
-// CD frames are 1/75 sec
-#define CD_FPS			75
-#define TO_MSECS(frame)	((UInt32)((frame) * 1000 / CD_FPS))
-
-// consider frame at 1/1000 sec
-#define FROM_MIN(mins)	((UInt32)((mins) * 60 * 1000))
-#define FROM_SEC(secs)	((UInt32)((secs) * 1000))
-
-class CDAudio {
-public:
-	CDAudio() {
-		_isInitialized = false;
-		_volumeLevel = 100;
-	};
-
-	virtual bool init() = 0;
-	virtual void release() = 0;
-
-	// OSystem functions
-	virtual bool poll() = 0;
-	virtual void play(int track, int num_loops, int start_frame, int duration) = 0;
-	virtual void stop() = 0;
-	virtual void update() = 0;
-
-	// volume in percent
-	virtual void setVolume(int volume) { _volumeLevel = volume; }
-	virtual int getVolume() const { return _volumeLevel; }
-
-	virtual void upVolume(int value) {}
-	virtual void downVolume(int value) {}
-
-protected:
-	int _volumeLevel;
-	bool _isInitialized;
-};
-
-#endif
diff --git a/backends/platform/PalmOS/Src/extend.cpp b/backends/platform/PalmOS/Src/extend.cpp
deleted file mode 100644
index 430563a302..0000000000
--- a/backends/platform/PalmOS/Src/extend.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "PalmVersion.h"
-#include <stdlib.h>
-#include "globals.h"
-
-#include "modulesrsc.h"
-
-void PalmFatalError(const char *err) {
-	WinSetDrawWindow(WinGetDisplayWindow());
-	WinPalette(winPaletteSetToDefault,0,0,0);
-	WinSetBackColor(0);
-	WinEraseWindow();
-	FrmCustomAlert(FrmFatalErrorAlert, err, 0,0);
-}
-
-void DrawStatus(Boolean show) {
-	if (OPTIONS_TST(kOptDisableOnScrDisp))
-		return;
-
-	UInt8 x,y;
-	UInt32 depth, d1;
-	Boolean d2;
-	WinScreenMode(winScreenModeGet, &d1, &d1, &depth, &d2);
-	Int16 color = (show ? gVars->indicator.on : gVars->indicator.off);
-
-	if (depth == 8) {
-		UInt8 *src = (UInt8 *)BmpGetBits(WinGetBitmap(WinGetDisplayWindow()));
-		src += gVars->screenPitch + 1;
-		for (y=0; y < 4; y++) {
-			for (x=0; x < 4; x++)
-				src[x] = color;
-
-			src += gVars->screenPitch;
-		}
-
-	} else if (depth == 16) {
-		Int16 *src = (Int16 *)BmpGetBits(WinGetBitmap(WinGetDisplayWindow()));
-		src += gVars->screenPitch + 1;
-		for (y=0; y < 4; y++) {
-			for (x=0; x < 4; x++)
-				src[x] = color;
-
-			src += gVars->screenPitch;
-		}
-	}
-}
-
-#ifndef PALMOS_ARM
-
-// This is now required since some classes are now very big :)
-#include "MemGlue.h"
-void *operator new(UInt32 size) {
-	void *ptr = MemGluePtrNew(size);
-	MemSet(ptr, 0, size);
-	return ptr;
-}
-
-void *operator new [] (UInt32 size) {
-	void *ptr = MemGluePtrNew(size);
-	MemSet(ptr, 0, size);
-	return ptr;
-}
-#elif defined(COMPILE_OS5) || defined(STDLIB_TRACE_MEMORY)
-
-void *operator new(UInt32 size) {
-	void *ptr = malloc(size);
-	MemSet(ptr, 0, size);
-	return ptr;
-}
-
-void *operator new [] (UInt32 size) {
-	void *ptr = malloc(size);
-	MemSet(ptr, 0, size);
-	return ptr;
-}
-
-void operator delete(void *ptr) throw() {
-	if (ptr) free(ptr);
-}
-
-void operator delete[](void *ptr) throw() {
-	if (ptr) free(ptr);
-}
-
-#endif
diff --git a/backends/platform/PalmOS/Src/features.h b/backends/platform/PalmOS/Src/features.h
deleted file mode 100644
index f82c7692fa..0000000000
--- a/backends/platform/PalmOS/Src/features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __FEATURES_H__
-#define __FEATURES_H__
-
-enum {
-	ftrBufferOverlay	= 1000,
-	ftrBufferBackup,
-	ftrBufferHotSwap
-};
-
-#define FREE_FTR(num)	\
-	{					\
-		UInt32 ptr;		\
-		FtrGet(appFileCreator, num, &ptr);			\
-		if (ptr) FtrPtrFree(appFileCreator, num);	\
-	}
-
-#endif
diff --git a/backends/platform/PalmOS/Src/globals.h b/backends/platform/PalmOS/Src/globals.h
deleted file mode 100644
index 796832df82..0000000000
--- a/backends/platform/PalmOS/Src/globals.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef GLOBALS_H
-#define GLOBALS_H
-
-#include <VFSMgr.h>
-#include "stuffs.h"
-
-enum {
-	INIT_VIBRATOR	= 1 <<	0x00,
-	INIT_PA1LIB		= 1 <<	0x01,
-	INIT_ARM		= 1 <<	0x02,
-	INIT_AUTOOFF	= 1 <<	0x03,
-	INIT_GOLCD		= 1 <<	0x04
-};
-
-enum {
-	FM_QUALITY_LOW = 0,
-	FM_QUALITY_MED,
-	FM_QUALITY_HI,
-	FM_QUALITY_INI
-};
-
-typedef struct {
-	// common parts
-	UInt32 _4B, _2B;
-
-	// 4 bytes part
-	UInt32 startupMemory;
-	UInt32 slkVersion;
-	UInt32 options;
-	UInt32 screenPitch;
-
-	struct {
-		FileRef	logFile;
-		UInt32 cacheSize;
-		UInt16 volRefNum;
-		UInt16 dummy;
-	} VFS;
-
-	// 2 bytes part
-	UInt16 HRrefNum;
-	UInt16 slkRefNum;
-	Coord screenWidth, screenHeight;			// silkarea shown
-	Coord screenFullWidth, screenFullHeight;	// silkarea hidden
-	Int16 autoSave;
-	struct {
-		Int16 on;
-		Int16 off;
-		Int16 showLED;
-	} indicator;
-
-	// 1 byte part
-	Boolean vibrator;
-	Boolean stdPalette;
-	Boolean filter;
-	Boolean stylusClick;
-	Boolean arrowKeys;
-	UInt8 init;
-	UInt8 palmVolume;
-	UInt8 fmQuality;
-	UInt8 advancedMode;
-
-} GlobalsDataType, *GlobalsDataPtr;
-
-extern GlobalsDataPtr gVars;
-
-#define VARS_EXPORT()		gVars->_4B = 6; \
-							gVars->_2B = 12;
-
-#define DO_VARS(z, t, o) \
-	{	Int8 *tmp = (Int8 *)gVars + o + 8; \
-		for (Int8 cnt = 0; cnt < gVars->z; cnt++) \
-			{	UInt##t val = *((UInt##t *)tmp);	\
-				val = ByteSwap##t(val);	\
-				*((UInt##t *)tmp) = val;	\
-				tmp += (t / 8);	\
-			}	\
-	}
-
-#define OPTIONS_DEF()		gVars->options
-
-#define HWR_INIT(x)			(gVars->init & (x))
-#define HWR_SET(x)			gVars->init |= (x)
-#define HWR_RST(x)			gVars->init &= ~(x)
-#define HWR_RSTALL()		gVars->init = 0
-#define HWR_GET()			(gVars->init)
-
-#define ARM(x)	gVars->arm[x]
-
-#endif
diff --git a/backends/platform/PalmOS/Src/i_zodiac.cpp b/backends/platform/PalmOS/Src/i_zodiac.cpp
deleted file mode 100644
index 20b06aa61f..0000000000
--- a/backends/platform/PalmOS/Src/i_zodiac.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <PalmOS.h>
-#include "extend.h"
-
-#ifndef DISABLE_TAPWAVE
-
-#include "tapwave.h"
-#include "i_zodiac.h"
-
-// _twBmpV3 = offscreen bitmap, must be set before this call
-Err ZodiacInit(void **ptrP, Int32 w, Int32 h) {
-	Err e;
-
-	TwGfxSurfaceInfoType surface = {
-		sizeof(TwGfxSurfaceInfoType),
-		w, h, w * 2,
-		twGfxLocationAcceleratorMemory,
-		twGfxPixelFormatRGB565_LE
-	};
-
-	e = SysSetOrientation(sysOrientationLandscape);
-	e = TwGfxOpen((TwGfxType **)&_twGfxLib, NULL);
-	e = TwGfxAllocSurface(	(TwGfxType *)_twGfxLib,
-							(TwGfxSurfaceType **)&_twSrc,
-							&surface);
-
-	e = TwGfxGetPalmDisplaySurface(	(TwGfxType *)_twGfxLib,
-									(TwGfxSurfaceType **)&_twDst);
-
-	return e;
-}
-
-Err ZodiacRelease(void **ptrP) {
-	Err e = errNone;
-
-	TwGfxFreeSurface((TwGfxSurfaceType *)_twSrc);
-	TwGfxClose((TwGfxType *)_twGfxLib);
-
-	return e;
-}
-
-#endif
diff --git a/backends/platform/PalmOS/Src/i_zodiac.h b/backends/platform/PalmOS/Src/i_zodiac.h
deleted file mode 100644
index 96a373a22e..0000000000
--- a/backends/platform/PalmOS/Src/i_zodiac.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _I_ZODIAC_H_
-#define _I_ZODIAC_H_
-
-#define	_twGfxLib	ptrP[0]
-#define _twSrc		ptrP[1]
-#define _twDst		ptrP[2]
-#define _twBmpV3	ptrP[3]
-
-Err ZodiacInit(void **ptrP, Int32 w, Int32 h);
-Err ZodiacRelease(void **ptrP);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/init_golcd.cpp b/backends/platform/PalmOS/Src/init_golcd.cpp
deleted file mode 100644
index b09d3b104e..0000000000
--- a/backends/platform/PalmOS/Src/init_golcd.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <PalmOS.h>
-#include <PalmGoLCD.h>
-
-#include "init_golcd.h"
-
-// you can use this handle directly
-MemHandle gGoLcdH;
-
-Err GoLCDInit(MemHandle *goLcdH) {
-	if (!goLcdH)
-		return sysErrParamErr;
-
-	Err e;
-	UInt16 refNum;
-	Boolean loaded = false;
-	*goLcdH = NULL;
-
-	if (e = SysLibFind(goLcdLibName, &refNum))
-		loaded = !(e = SysLibLoad(goLcdLibType, goLcdLibCreator, &refNum));
-
-	if (!e)
-		if ((e = GoLcdLibOpen(refNum)))
-			SysLibRemove(refNum);
-
-	if (!e) {
-		MemHandle lcdH = MemHandleNew(sizeof(GoLCDType));
-		GoLCDType *lcdP = (GoLCDType *)MemHandleLock(lcdH);
-		MemSet(lcdP, MemHandleSize(lcdH), 0);
-		lcdP->refNum = refNum;
-		lcdP->timeout = GoLcdGetTimeout(refNum, goLcdPenTapMode);
-		MemPtrUnlock(lcdP);
-		*goLcdH = lcdH;
-	}
-
-	return e;
-}
-
-Err GoLCDRelease(MemHandle goLcdH) {
-	if (!goLcdH)
-		return sysErrParamErr;
-
-	Err e;
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-	if (lcdP->refNum != sysInvalidRefNum)
-		if (!(e = GoLcdLibClose(lcdP->refNum)))
-			e = SysLibRemove(lcdP->refNum);
-
-	MemPtrUnlock(lcdP);
-	MemHandleFree(goLcdH);
-
-	return e;
-}
-
-Boolean GoLCDPointInBounds(MemHandle goLcdH, Coord x, Coord y) {
-	Boolean inBounds = false;
-
-	if (!goLcdH)
-		return inBounds;
-
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-	inBounds = (lcdP->active && RctPtInRectangle(x, y, &(lcdP->bounds)));
-	MemPtrUnlock(lcdP);
-
-	return inBounds;
-}
-
-void GoLCDSetInk(MemHandle goLcdH, RGBColorType *inkP) {
-	if (!goLcdH)
-		return;
-
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-	MemMove(&(lcdP->ink), inkP, sizeof(RGBColorType));
-	MemPtrUnlock(lcdP);
-}
-
-void GoLCDSetBounds(MemHandle goLcdH, RectangleType *boundsP) {
-	if (!goLcdH)
-		return;
-
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-	MemMove(&(lcdP->bounds), boundsP, sizeof(RectangleType));
-	MemPtrUnlock(lcdP);
-}
-
-void GoLCDActivate(MemHandle goLcdH, Boolean active) {
-	if (!goLcdH)
-		return;
-
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-
-	if (active) {
-		if (!lcdP->active) {
-			lcdP->active = true;
-			GoLcdSetInkState(lcdP->refNum, goLcdInkEnabled, goLcdColorOverride, &(lcdP->ink));
-			GoLcdSetBounds(lcdP->refNum, &(lcdP->bounds));
-			GoLcdSetGsiState(lcdP->refNum, goLcdGsiNormal, goLcdColorDefault, 0);
-			GoLcdSetTimeout(lcdP->refNum, goLcdPenTapMode, lcdP->timeout);
-			GoLcdSetStatus(lcdP->refNum, goLcdEnabled);
-		}
-
-	} else {
-			lcdP->active = false;
-			GoLcdSetInkState(lcdP->refNum, goLcdInkDisabled, goLcdColorDefault, 0);
-			GoLcdSetStatus(lcdP->refNum, goLcdDisabled);
-	}
-
-	MemPtrUnlock(lcdP);
-}
-
-Boolean GoLCDToggle(MemHandle goLcdH) {
-	if (!goLcdH)
-		return;
-
-	Boolean active;
-	GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
-	active = lcdP->active;
-	MemPtrUnlock(lcdP);
-
-	GoLCDActivate(goLcdH, !active);
-	return (!active);
-}
diff --git a/backends/platform/PalmOS/Src/init_golcd.h b/backends/platform/PalmOS/Src/init_golcd.h
deleted file mode 100644
index 7750a13a52..0000000000
--- a/backends/platform/PalmOS/Src/init_golcd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef INIT_GOLCD_H
-#define INIT_GOLCD_H
-
-typedef struct {
-	Boolean active;
-	UInt16 refNum;
-	RectangleType bounds;
-	RGBColorType ink;
-	UInt32 timeout;
-} GoLCDType;
-
-extern MemHandle gGoLcdH;
-
-Err GoLCDInit(MemHandle *goLcdH);
-Err GoLCDRelease(MemHandle goLcdH);
-void GoLCDSetInk(MemHandle goLcdH, RGBColorType *inkP);
-void GoLCDSetBounds(MemHandle goLcdH, RectangleType *boundsP);
-void GoLCDActivate(MemHandle goLcdH, Boolean active);
-Boolean GoLCDToggle(MemHandle goLcdH);
-Boolean GoLCDPointInBounds(MemHandle goLcdH, Coord x, Coord y);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/init_mathlib.cpp b/backends/platform/PalmOS/Src/init_mathlib.cpp
deleted file mode 100644
index 1ea39c3e0a..0000000000
--- a/backends/platform/PalmOS/Src/init_mathlib.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <PalmOS.h>
-
-#include "globals.h"
-#include "init_mathlib.h"
-#include "mathlib.h"
-
-Err MathlibInit() {
-	Err e;
-
-	if ((e = SysLibFind(MathLibName, &MathLibRef)))
-		if (e == sysErrLibNotFound)									// couldn't find lib
-			e = SysLibLoad(LibType, MathLibCreator, &MathLibRef);
-
-	if (e) return sysErrLibNotFound;
-
-	e = MathLibOpen(MathLibRef, MathLibVersion);
-	return e;
-}
-
-void MathlibRelease() {
-	UInt16 useCount;
-
-	if (MathLibRef != sysInvalidRefNum) {
-		MathLibClose(MathLibRef, &useCount);
-
-		if (!useCount)
-			SysLibRemove(MathLibRef);
-	}
-}
diff --git a/backends/platform/PalmOS/Src/init_mathlib.h b/backends/platform/PalmOS/Src/init_mathlib.h
deleted file mode 100644
index 1901e1330d..0000000000
--- a/backends/platform/PalmOS/Src/init_mathlib.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef INIT_MATHLIB_H
-#define INIT_MATHLIB_H
-
-Err MathlibInit();
-void MathlibRelease();
-
-#endif
diff --git a/backends/platform/PalmOS/Src/init_pa1lib.cpp b/backends/platform/PalmOS/Src/init_pa1lib.cpp
deleted file mode 100644
index d5b0340cae..0000000000
--- a/backends/platform/PalmOS/Src/init_pa1lib.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <PalmOS.h>
-#include <Sonyclie.h>
-
-#include "pa1lib.h"
-#include "init_pa1lib.h"
-
-void *sndStateOnFuncP = NULL;
-void *sndStateOffFuncP = NULL;
-
-#define SndStateOn(a,b,c)	if (sndStateOnFuncP)((sndStateOnType)(sndStateOnFuncP))(a, b, c);
-#define SndStateOff(a)		if (sndStateOffFuncP)((sndStateOffType)(sndStateOffFuncP))(a);
-
-void Pa1libInit(UInt16 vol) {
-	Pa1Lib_Open();
-
-	// Doesn't work on T4xx and T6xx series ?
-	FtrGet(sonySysFtrCreatorSystem, sonySysFtrNumSystemAOutSndStateOnHandlerP, (UInt32*) &sndStateOnFuncP);
-	FtrGet(sonySysFtrCreatorSystem, sonySysFtrNumSystemAOutSndStateOffHandlerP, (UInt32*) &sndStateOffFuncP);
-
-	SndStateOn(aOutSndKindSp, vol, vol);
-	SndStateOn(aOutSndKindHp, vol, vol);
-
-	Pa1Lib_devHpVolume(vol, vol);
-	Pa1Lib_devSpVolume(vol);
-}
-
-void Pa1libRelease() {
-	SndStateOff(aOutSndKindSp);
-	SndStateOff(aOutSndKindHp);
-
-	Pa1Lib_Close();
-}
diff --git a/backends/platform/PalmOS/Src/init_pa1lib.h b/backends/platform/PalmOS/Src/init_pa1lib.h
deleted file mode 100644
index d5be11d278..0000000000
--- a/backends/platform/PalmOS/Src/init_pa1lib.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef INIT_PA1LIB_H
-#define INIT_PA1LIB_H
-
-// need to move this on a .h file
-#define sonySysFileCSystem			'SsYs'  /* Sony overall System */
-#define sonySysFtrCreatorSystem		sonySysFileCSystem
-
-#define sonySysFtrNumSystemBase						10000
-#define sonySysFtrNumSystemAOutSndStateOnHandlerP	(sonySysFtrNumSystemBase + 4)
-#define sonySysFtrNumSystemAOutSndStateOffHandlerP	(sonySysFtrNumSystemBase + 5)
-
-typedef void (*sndStateOnType)	(UInt8 /* kind */, UInt8 /* L volume 0-31 */, UInt8 /* R volume 0-31 */);
-typedef void (*sndStateOffType)	(UInt8 /* kind */);
-
-/* kind */
-#define aOutSndKindSp       (0) /* Speaker volume */
-#define aOutSndKindHp       (2) /* HeadPhone volume */
-
-void Pa1libInit(UInt16 vol);
-void Pa1libRelease();
-
-#endif
diff --git a/backends/platform/PalmOS/Src/init_palmos.cpp b/backends/platform/PalmOS/Src/init_palmos.cpp
deleted file mode 100644
index 3a72382362..0000000000
--- a/backends/platform/PalmOS/Src/init_palmos.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "globals.h"
-#include "init_palmos.h"
-
-static UInt16 autoOffDelay;
-
-void PalmInit(UInt8 init) {
-	// set screen depth
-	UInt32 depth = 8;
-	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
-
-	if (init & INIT_AUTOOFF) {
-		autoOffDelay = SysSetAutoOffTime(0);
-		EvtResetAutoOffTimer();
-	}
-
-}
-
-void PalmRelease(UInt8 init) {
-	if (init & INIT_AUTOOFF) {
-		SysSetAutoOffTime(autoOffDelay);
-		EvtResetAutoOffTimer();
-	}
-}
-
-Err PalmHRInit(UInt32 depth) {
-	Err e;
-	UInt32 width = 320;
-	UInt32 height = 320;
-	Boolean color = true;
-
-	e = WinScreenMode (winScreenModeSet, &width, &height, &depth, &color);
-
-	if (!e) {
-		UInt32 attr;
-		WinScreenGetAttribute(winScreenDensity, &attr);
-		e = (attr != kDensityDouble);
-	}
-
-	return e;
-}
-
-void PalmHRRelease() {
-	// should i do something here ?
-}
-
-UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh) {
-	UInt32 ftr;
-	UInt8 mode = 0;
-
-	Coord sw = 160;
-	Coord sh = 160;
-
-	// Hi-Density present ?
-	if (!FtrGet(sysFtrCreator, sysFtrNumWinVersion, &ftr)) {
-		if (ftr >= 4) {
-			sw = 320;
-			sh = 320;
-		}
-	}
-
-	Coord fw = sw;
-	Coord fh = sh;
-
-	// if feature set, not set on Garmin iQue3600 ???
-	if (!(FtrGet(sysFtrCreator, sysFtrNumInputAreaFlags, &ftr))) {
-		if (ftr & grfFtrInputAreaFlagCollapsible) {
-			UInt16 curOrientation = SysGetOrientation();
-
-			if (curOrientation == sysOrientationLandscape ||
-				curOrientation == sysOrientationReverseLandscape
-					)
-				mode = PALM_LANDSCAPE;
-			else
-				mode = PALM_PORTRAIT;
-
-			PINSetInputTriggerState(pinInputTriggerEnabled);
-			PINSetInputAreaState(pinInputAreaClosed);
-			StatHide();
-
-			WinGetDisplayExtent(&fw, &fh);
-			fw *= 2;
-			fh *= 2;
-
-			StatShow();
-			PINSetInputAreaState(pinInputAreaOpen);
-			PINSetInputTriggerState(pinInputTriggerDisabled);
-		}
-	}
-
-	if (stdw) *stdw = sw;
-	if (stdh) *stdh = sh;
-	if (fullw) *fullw = fw;
-	if (fullh) *fullh = fh;
-
-	return mode;
-}
-
-void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP) {
-	UInt32		free, max;
-
-	Int16		i;
-	Int16		nCards;
-	UInt16		cardNo;
-	UInt16		heapID;
-
-	UInt32		storageMemory = 0;
-	UInt32		dynamicMemory = 0;
-	UInt32		storageFree = 0;
-	UInt32		dynamicFree = 0;
-
-	// Iterate through each card to support devices with multiple cards.
-	nCards = MemNumCards();
-
-	for (cardNo = 0; cardNo < nCards; cardNo++) {
-		// Iterate through the RAM heaps on a card (excludes ROM).
-		for (i=0; i< MemNumRAMHeaps(cardNo); i++) {
-			// Obtain the ID of the heap.
-			heapID = MemHeapID(cardNo, i);
-			// Calculate the total memory and free memory of the heap.
-			MemHeapFreeBytes(heapID, &free, &max);
-
-			// If the heap is dynamic, increment the dynamic memory total.
-			if (MemHeapDynamic(heapID)) {
-				dynamicMemory += MemHeapSize(heapID);
-				dynamicFree += free;
-
-			// The heap is nondynamic (storage ?).
-			} else {
-				storageMemory += MemHeapSize(heapID);
-				storageFree += free;
-			}
-		}
-	}
-	// Reduce the stats to KB.  Round the results.
-	dynamicMemory = dynamicMemory / 1024L;
-	storageMemory = storageMemory / 1024L;
-
-	dynamicFree = dynamicFree / 1024L;
-	storageFree = storageFree / 1024L;
-
-	if (dynamicMemoryP) *dynamicMemoryP = dynamicMemory;
-	if (storageMemoryP) *storageMemoryP = storageMemory;
-	if (dynamicFreeP) *dynamicFreeP = dynamicFree;
-	if (storageFreeP) *storageFreeP = storageFree;
-}
diff --git a/backends/platform/PalmOS/Src/init_sony.cpp b/backends/platform/PalmOS/Src/init_sony.cpp
deleted file mode 100644
index f6728d08b3..0000000000
--- a/backends/platform/PalmOS/Src/init_sony.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <SonyClie.h>
-#include "init_sony.h"
-
-UInt16 SilkInit(UInt32 *retVersion) {
-	SonySysFtrSysInfoP sonySysFtrSysInfoP;
-	UInt32 version;
-	UInt16 slkRefNum;
-	Err e;
-
-	// Sony HiRes+
-	if (!(e = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
-		if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrSilk) {
-
-			if ((e = SysLibFind(sonySysLibNameSilk, &slkRefNum)))
-				if (e == sysErrLibNotFound)
-					e = SysLibLoad(sonySysFileTSilkLib, sonySysFileCSilkLib, &slkRefNum);
-
-			if (!e) {
-				e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version);
-				if (e) {
-					// v1 = NR
-					e = SilkLibOpen(slkRefNum);
-					if (!e) version = vskVersionNum1;
-
-				} else {
-					// v2 = NX/NZ
-					// v3 = UX...
-					e = VskOpen(slkRefNum);
-				}
-			}
-		} else
-			e = sysErrLibNotFound;
-	}
-
-	if (e) {
-		version = 0;
-		slkRefNum = sysInvalidRefNum;
-	}
-
-	*retVersion = version;
-	return slkRefNum;
-}
-
-void SilkRelease(UInt16 slkRefNum) {
-	if (slkRefNum != sysInvalidRefNum)
-		SilkLibClose(slkRefNum);
-}
-
-UInt16 SonyHRInit(UInt32 depth) {
-	SonySysFtrSysInfoP sonySysFtrSysInfoP;
-	Err e;
-	UInt16 HRrefNum;
-
-	// test if sonyHR is present
-	if (!(e = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
-		if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrHR) {		// HR available
-
-			if ((e = SysLibFind(sonySysLibNameHR, &HRrefNum)))
-				if (e == sysErrLibNotFound)								// can't find lib
-					e = SysLibLoad( 'libr', sonySysFileCHRLib, &HRrefNum);
-
-			// Now we can use HR lib. Executes Open library.
-			if (!e) e = HROpen(HRrefNum);
-		}
-	}
-
-	if (e) HRrefNum = sysInvalidRefNum;
-
-	if (HRrefNum != sysInvalidRefNum) {
-		UInt32 width = hrWidth;
-		UInt32 height = hrHeight;
-		Boolean color = true;
-
-		e = HRWinScreenMode(HRrefNum, winScreenModeSet, &width, &height, &depth, &color);
-		// error ? release and return an invalid reference number
-		if (e) {
-			SonyHRRelease(HRrefNum);
-			HRrefNum = sysInvalidRefNum;
-		}
-	}
-
-	return HRrefNum;
-}
-
-void SonyHRRelease(UInt16 HRrefNum) {
-	if (HRrefNum != sysInvalidRefNum) {
-			HRClose(HRrefNum);
-			//SysLibRemove(HRrefNum);	// never call this !!
-	}
-}
-
-UInt8 SonyScreenSize(UInt16 HRrefNum, Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh) {
-	UInt32 version;
-	UInt16 slkRefNum;
-	UInt8 mode = 0;
-
-	Coord sw = 160;
-	Coord sh = 160;
-	Coord fw = sw;
-	Coord fh = sh;
-
-	if (HRrefNum != sysInvalidRefNum) {
-		sw = hrWidth;
-		sh = hrHeight;
-		fw = sw;
-		fh = sh;
-
-		slkRefNum = SilkInit(&version);
-
-		if (slkRefNum != sysInvalidRefNum) {
-			if (version == vskVersionNum1) {
-				SilkLibEnableResize(slkRefNum);
-				SilkLibResizeDispWin(slkRefNum, silkResizeMax);
-				HRWinGetWindowExtent(HRrefNum, &fw, &fh);
-				SilkLibResizeDispWin(slkRefNum, silkResizeNormal);
-				SilkLibDisableResize(slkRefNum);
-				mode = SONY_PORTRAIT;
-
-			} else {
-				VskSetState(slkRefNum, vskStateEnable, (version == vskVersionNum2 ? vskResizeVertically : vskResizeHorizontally));
-				VskSetState(slkRefNum, vskStateResize, vskResizeNone);
-				HRWinGetWindowExtent(HRrefNum, &fw, &fh);
-				VskSetState(slkRefNum, vskStateResize, vskResizeMax);
-				VskSetState(slkRefNum, vskStateEnable, vskResizeDisable);
-				mode = (version == vskVersionNum3 ? SONY_LANDSCAPE : SONY_PORTRAIT);
-			}
-			SilkRelease(slkRefNum);
-		}
-	}
-
-	*stdw = sw;
-	*stdh = sh;
-	*fullw = fw;
-	*fullh = fh;
-
-	return mode;
-}
diff --git a/backends/platform/PalmOS/Src/init_sony.h b/backends/platform/PalmOS/Src/init_sony.h
deleted file mode 100644
index 86224283f6..0000000000
--- a/backends/platform/PalmOS/Src/init_sony.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef INIT_SONY_H
-#define INIT_SONY_H
-
-#define SONY_PORTRAIT	1
-#define SONY_LANDSCAPE	2
-
-UInt16 SilkInit(UInt32 *retVersion);
-void SilkRelease(UInt16 slkRefNum);
-
-UInt16 SonyHRInit(UInt32 depth);
-void SonyHRRelease(UInt16 HRrefNum);
-
-UInt8 SonyScreenSize(UInt16 HRrefNum, Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/init_stuffs.cpp b/backends/platform/PalmOS/Src/init_stuffs.cpp
deleted file mode 100644
index 51bfe755eb..0000000000
--- a/backends/platform/PalmOS/Src/init_stuffs.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <PalmOS.h>
-
-#ifndef DISABLE_SONY
-#include <SonyClie.h>
-#endif
-
-#include <PalmNavigator.h>
-#include <HsExtCommon.h>
-#include <HsNavCommon.h>
-#include <PalmGoLCD.h>
-
-#include "globals.h"		// for OPTIONS_DEF()
-#include "init_stuffs.h"
-#include "stuffs.h"
-
-#ifndef DISABLE_TAPWAVE
-#define __TWKEYS_H__	// bad hack
-#include "tapwave.h"
-#endif
-
-#ifndef DISABLE_PA1LIB
-#include "Pa1Lib.h"
-#endif
-
-#ifndef DISABLE_LIGHTSPEED
-#include "lightspeed_public.h"
-#endif
-
-// TODO : check the depth to set correct value
-// works only for 8bit for now
-UInt32 StuffsGetPitch(Coord fullw) {
-	UInt32 pitch = 0;
-
-	if (OPTIONS_TST(kOptModeHiDensity)) {
-		WinScreenGetAttribute(winScreenRowBytes, &pitch);
-
-		// FIXME : hack for TT3 simulator (and real ?) return 28 on landscape mode
-		if (pitch < fullw)
-			pitch = fullw;
-
-	} else {
-		pitch = fullw;
-	}
-
-	return pitch;
-}
-
-void *StuffsForceVG() {
-	// create an empty form to force the VG to be shown
-	FormType *frmP = FrmNewForm(4567, NULL, 0,0,0,0, false, 0, 0, 0);
-	FrmDrawForm(frmP);
-	return frmP;
-}
-
-void StuffsReleaseVG(void *vg) {
-	FrmDeleteForm((FormPtr)vg);
-}
-
-void StuffsGetFeatures() {
-	UInt32 ulProcessorType, manufacturer, version, depth;
-	Boolean color;
-
-#ifndef DISABLE_TAPWAVE
-	// Tapwave Zodiac libs ?
-	if (!FtrGet(sysFileCSystem, sysFtrNumOEMCompanyID, &manufacturer))
-		if (manufacturer == twCreatorID) {
-			OPTIONS_SET(kOptDeviceZodiac);
-			OPTIONS_SET(kOpt5WayNavigatorV2);
-		}
-#endif
-
-	// Hi-Density present ?
-	if (!FtrGet(sysFtrCreator, sysFtrNumWinVersion, &version))
-		if (version >= 4)
-			OPTIONS_SET(kOptModeHiDensity);
-
-	// OS5 ?
-	if (!FtrGet(sysFtrCreator, sysFtrNumROMVersion, &version))
-		if (version >= kOS5Version)
-			OPTIONS_SET(kOptDeviceOS5);
-
-	// ARM ?
-	if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType))
-		if (sysFtrNumProcessorIsARM(ulProcessorType))
-			OPTIONS_SET(kOptDeviceARM);
-		else if (ulProcessorType == sysFtrNumProcessorx86)
-			OPTIONS_SET(kOptDeviceProcX86);
-
-	// 5Way Navigator
-	if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) {
-		if (version >= 2)
-			OPTIONS_SET(kOpt5WayNavigatorV2);
-
-	} else if (!FtrGet(sysFtrCreator, sysFtrNumFiveWayNavVersion, &version)) {
-		if (version >= 2)
-			OPTIONS_SET(kOpt5WayNavigatorV2);
-		else
-			OPTIONS_SET(kOpt5WayNavigatorV1);
-
-	} else if (!FtrGet(navFtrCreator, navFtrVersion, &version)) {
-		if (version >= 2)
-			OPTIONS_SET(kOpt5WayNavigatorV2);
-		else
-			OPTIONS_SET(kOpt5WayNavigatorV1);
-	}
-
-	// Palm Sound API ?
-	if (!FtrGet(sysFileCSoundMgr, sndFtrIDVersion, &version))
-		if (version >= 1)
-			OPTIONS_SET(kOptPalmSoundAPI);
-
-#ifndef DISABLE_PA1LIB
-	// Sony Pa1 Sound API
-	if (Pa1Lib_Open()) {
-		OPTIONS_SET(kOptSonyPa1LibAPI);
-		Pa1Lib_Close();
-	}
-#endif
-
-	// GoLCD
-	if (!FtrGet(goLcdLibCreator, goLcdLibFtrNum, &version))
-		OPTIONS_SET(kOptGoLcdAPI);
-
-#ifndef DISABLE_LIGHTSPEED
-	// Lightspeed
-	if (LS_Installed())
-		OPTIONS_SET(kOptLightspeedAPI);
-#endif
-
-	// check for 16bit mode
-	if (!WinScreenMode(winScreenModeGetSupportedDepths, NULL, NULL, &depth, &color))
-		OPTIONS_SET(((depth & 0x8000) ? kOptMode16Bit : kOptNone));
-
-}
diff --git a/backends/platform/PalmOS/Src/init_stuffs.h b/backends/platform/PalmOS/Src/init_stuffs.h
deleted file mode 100644
index 124510eeac..0000000000
--- a/backends/platform/PalmOS/Src/init_stuffs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef INIT_STUFFS_H
-#define INIT_STUFFS_H
-
-#define kOS5Version		sysMakeROMVersion(5,0,0,sysROMStageRelease,0)
-
-void StuffsGetFeatures();
-UInt32 StuffsGetPitch(Coord fullw);
-void *StuffsForceVG();
-void StuffsReleaseVG(void *vg);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp
deleted file mode 100644
index 9bb1c1479b..0000000000
--- a/backends/platform/PalmOS/Src/launcher/app.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <SonyClie.h>
-#include <SysGlue.h>
-
-#include "StarterRsc.h"
-#include "palmdefs.h"
-#include "start.h"
-#include "globals.h"
-#include "rumble.h"
-
-#include "mathlib.h"
-#include "formCards.h"
-#include "games.h"
-
-#include "modules.h"
-#include "init_mathlib.h"
-#include "init_sony.h"
-#include "init_palmos.h"
-#include "init_stuffs.h"
-
-/***********************************************************************
- *
- * FUNCTION:     AppStart
- *
- * DESCRIPTION:  Get the current application's preferences.
- *
- * PARAMETERS:   nothing
- *
- * RETURNED:     Err value 0 if nothing went wrong
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static Err AppStartCheckHRmode()
-{
-	Err e = errNone;
-	UInt32 depth = (OPTIONS_TST(kOptMode16Bit) && OPTIONS_TST(kOptDeviceOS5)) ? 16 : 8;
-
-	// try to init Sony HR mode then Palm HR mode
-	gVars->HRrefNum = SonyHRInit(depth);
-
-	if (gVars->HRrefNum == sysInvalidRefNum) {
-		if (e = PalmHRInit(depth))
-			FrmCustomAlert(FrmErrorAlert,"Your device doesn't seem to support Hi-Res or 256color mode.",0,0);
-	} else {
-		OPTIONS_SET(kOptDeviceClie);
-	}
-
-	return e;
-}
-
-static void AppStopHRMode() {
-	if (gVars->HRrefNum != sysInvalidRefNum)
-		SonyHRRelease(gVars->HRrefNum);
-	else
-		PalmHRRelease();
-}
-
-static Err AppStartCheckNotify() {
-	UInt32 romVersion;
-	Err err;
-
-	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
-	if (!err) {
-		UInt16 cardNo;
-		LocalID dbID;
-
-		err = SysCurAppDatabase(&cardNo, &dbID);
-		if (!err) {
-			SysNotifyRegister(cardNo, dbID, sysNotifyVolumeMountedEvent, NULL, sysNotifyNormalPriority, NULL);
-			SysNotifyRegister(cardNo, dbID, sysNotifyVolumeUnmountedEvent, NULL, sysNotifyNormalPriority, NULL);
-			SysNotifyRegister(cardNo, dbID, sonySysNotifyMsaEnforceOpenEvent, NULL, sysNotifyNormalPriority, NULL);
-			SysNotifyRegister(cardNo, dbID, sysNotifyDisplayResizedEvent, NULL, sysNotifyNormalPriority, NULL);
-		}
-	}
-
-	return err;
-}
-
-static Err AppStartLoadSkin() {
-	Err err = errNone;
-
-	// if skin defined, check if the db still exists
-	if (gPrefs->skin.dbID) {
-		UInt32 type, creator;
-
-		// check if the DB still exists
-		DmSearchStateType state;
-		UInt16 cardNo;
-		LocalID dbID;
-		Boolean found = false;
-		err = DmGetNextDatabaseByTypeCreator(true, &state, 'skin', appFileCreator, false, &cardNo, &dbID);
-		while (!err && dbID && !found) {
-			found = (cardNo == gPrefs->skin.cardNo && dbID == gPrefs->skin.dbID);
-			err = DmGetNextDatabaseByTypeCreator(false, &state, 'skin', appFileCreator, false, &cardNo, &dbID);
-		}
-
-		if (found) {
-			// remember to check version for next revision of the skin
-			err = DmDatabaseInfo (gPrefs->skin.cardNo, gPrefs->skin.dbID, gPrefs->skin.nameP, 0, 0, 0, 0, 0, 0, 0,0, &type, &creator);
-			if (!err)
-				if (type != 'skin' || creator != appFileCreator)
-					err = dmErrInvalidParam;
-		}
-
-		if (!found || err)
-			MemSet(&(gPrefs->skin),sizeof(SkinInfoType),0);
-	}
-
-	// No skin ? try to get the first one
-	if (!gPrefs->skin.dbID) {
-		DmSearchStateType stateInfo;
-
-		err = DmGetNextDatabaseByTypeCreator(true, &stateInfo, 'skin', appFileCreator, false, &gPrefs->skin.cardNo, &gPrefs->skin.dbID);
-		if (!err)
-			err = DmDatabaseInfo (gPrefs->skin.cardNo, gPrefs->skin.dbID, gPrefs->skin.nameP, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	}
-
-	return err;
-}
-
-static Err AppStartCheckMathLib() {
-	Err e = MathlibInit();
-
-	switch (e) {
-		case errNone:
-			break;
-		case sysErrLibNotFound:
-			FrmCustomAlert(FrmErrorAlert,"Can't find MathLib !",0,0);
-			break;
-		default:
-			FrmCustomAlert(FrmErrorAlert,"Can't open MathLib !",0,0);
-			break;
-	}
-
-	return e;
-}
-
-static void AppStopMathLib() {
-	MathlibRelease();
-}
-
-static void AppStartCheckScreenSize() {
-	Coord sw, sh, fw, fh;
-	UInt8 mode;
-
-	OPTIONS_RST(kOptCollapsible);
-	OPTIONS_RST(kOptModeWide);
-	OPTIONS_RST(kOptModeLandscape);
-	OPTIONS_RST(kOptModeRotatable);
-
-	// we are on a sony device
-	if (OPTIONS_TST(kOptDeviceClie)) {
-		mode = SonyScreenSize(gVars->HRrefNum, &sw, &sh, &fw, &fh);
-		if (mode) {
-			OPTIONS_SET(kOptModeWide);
-			OPTIONS_SET((mode == SONY_LANDSCAPE) ? kOptModeLandscape : kOptNone);
-		}
-	} else {
-		mode = PalmScreenSize(&sw, &sh, &fw, &fh);
-		if (mode) {
-			OPTIONS_SET(kOptCollapsible);
-			OPTIONS_SET(kOptModeWide);
-			OPTIONS_SET((mode == PALM_LANDSCAPE) ? kOptModeLandscape : kOptNone);
-			// TODO: doesn't work with Sony
-			OPTIONS_SET(SysGlueTrapExists(pinSysSetOrientation) ? kOptModeRotatable :kOptNone);
-		}
-	}
-
-	gVars->screenWidth = sw;
-	gVars->screenHeight = sh;
-
-	gVars->screenFullWidth = fw;
-	gVars->screenFullHeight = fh;
-}
-
-#define max(id,value)	gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id])
-#define min(id,value)	gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id])
-#define threshold		700
-
-static void AppStartSetMemory() {
-	UInt32 mem, def;
-	PalmGetMemory(0,0,0,&mem);
-	def = (mem > threshold) ? (mem - threshold) * 1024 : 0;
-	gVars->startupMemory = mem;
-}
-
-#undef threshold
-#undef min
-#undef max
-
-Err AppStart(void) {
-	UInt16 dataSize, checkSize = 0;
-	Err error;
-
-#ifndef _DEBUG_ENGINE
-	// delete old databases
-	ModDelete();
-#endif
-
-	// allocate global variables space
-	dataSize = sizeof(GlobalsDataType);
-	gVars = (GlobalsDataType *)MemPtrNew(dataSize);
-	MemSet(gVars, dataSize, 0);
-
-	gVars->indicator.on	= 255;
-	gVars->indicator.off = 0;
-	gVars->HRrefNum = sysInvalidRefNum;
-	gVars->VFS.volRefNum = vfsInvalidVolRef;
-	gVars->slkRefNum = sysInvalidRefNum;
-	gVars->options = kOptNone;
-
-	// set memory required by the differents engines
-	AppStartSetMemory();
-	StuffsGetFeatures();
-
-	// allocate prefs space
-	dataSize = sizeof(GlobalsPreferenceType);
-	gPrefs	= (GlobalsPreferenceType *)MemPtrNew(dataSize);
-	MemSet(gPrefs, dataSize, 0);
-
-	// Read the saved preferences / saved-state information.
-	if (PrefGetAppPreferences(appFileCreator, appPrefID, NULL, &checkSize, true) == noPreferenceFound || checkSize != dataSize) {
-		// reset all elements
-		MemSet(gPrefs, dataSize, 0);
-
-		gPrefs->card.volRefNum = vfsInvalidVolRef;
-		gPrefs->card.cacheSize = 4096;
-		gPrefs->card.useCache = true;
-		gPrefs->card.showLED = true;
-		gPrefs->card.autoDetect = true;
-
-		gPrefs->autoOff = true;
-		gPrefs->vibrator = RumbleExists();
-		gPrefs->debug = false;
-		gPrefs->exitLauncher = true;
-		gPrefs->stdPalette = OPTIONS_TST(kOptDeviceOS5);
-		gPrefs->stylusClick = true;
-
-	} else {
-		PrefGetAppPreferences(appFileCreator, appPrefID, gPrefs, &dataSize, true);
-	}
-
-	if (!OPTIONS_TST(kOptDeviceARM)) {
-		error = AppStartCheckMathLib();
-		if (error) return (error);
-	}
-
-	error = AppStartCheckHRmode();
-	if (error) return (error);
-
-	bDirectMode = (AppStartLoadSkin() != errNone);
-
-	// if volref previously defined, check if it's a valid one
-	if (gPrefs->card.volRefNum != vfsInvalidVolRef) {
-		VolumeInfoType volInfo;
-		Err err = VFSVolumeInfo(gPrefs->card.volRefNum, &volInfo);
-		if (err)
-			gPrefs->card.volRefNum = parseCards();
-	}
-	else
-		gPrefs->card.volRefNum = parseCards();
-	if (gPrefs->card.volRefNum != vfsInvalidVolRef)
-		CardSlotCreateDirs();
-
-	// open games database
-	error = GamOpenDatabase();
-	if (error) return (error);
-	GamImportDatabase();
-
-	AppStartCheckScreenSize();
-	AppStartCheckNotify();		// not fatal error if not avalaible
-
-	return error;
-}
-
-/***********************************************************************
- *
- * FUNCTION:    AppStop
- *
- * DESCRIPTION: Save the current state of the application.
- *
- * PARAMETERS:  nothing
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static Err AppStopCheckNotify()
-{
-	UInt32 romVersion;
-	Err err;
-
-	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
-	if (!err) {
-		UInt16 cardNo;
-		LocalID dbID;
-
-		err = SysCurAppDatabase(&cardNo, &dbID);
-		if (!err) {
-			SysNotifyUnregister(cardNo, dbID, sysNotifyVolumeUnmountedEvent, sysNotifyNormalPriority);
-			SysNotifyUnregister(cardNo, dbID, sysNotifyVolumeMountedEvent, sysNotifyNormalPriority);
-			// sonySysNotifyMsaEnforceOpenEvent
-			SysNotifyUnregister(cardNo, dbID, sysNotifyDisplayResizedEvent, sysNotifyNormalPriority);
-		}
-	}
-
-	return err;
-}
-
-void AppStop(void) {
-	// Close all the open forms.
-	FrmCloseAllForms();
-	WinEraseWindow();
-	WinPalette(winPaletteSetToDefault, 0, 256, NULL);
-
-	// Close and move Game list database
-	GamCloseDatabase(false);
-
-	// Write the saved preferences / saved-state information.  This data
-	// will saved during a HotSync backup.
-	SavePrefs();
-
-	// stop all
-	AppStopCheckNotify();
-	if (!OPTIONS_TST(kOptDeviceARM))
-		AppStopMathLib();
-	AppStopHRMode();
-
-	if (!bLaunched)
-		MemPtrFree(gVars);
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp
deleted file mode 100644
index eb4654ed10..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <VFSMgr.h>
-#include <PmPalmOSNVFS.h>
-
-#include "start.h"
-#include "formTabs.h"
-#include "forms.h"
-#include "globals.h"
-
-typedef struct {
-	UInt16 volRefNum;
-	Char nameP[expCardInfoStringMaxLen+1];
-
-} CardInfoType;
-
-static TabType *myTabP;
-static UInt16 lastTab = 0;
-
-static void CardSlotFormExit(Boolean bSave);
-
-static void CardSlotFreeList() {
-	MemHandle cards = NULL;
-	MemHandle items = NULL;
-
-	if (itemsText && itemsList) {
-		cards = MemPtrRecoverHandle(itemsList);
-		items = MemPtrRecoverHandle(itemsText);
-
-		itemsText = NULL;
-		itemsList = NULL;
-	}
-	itemsType = ITEM_TYPE_UNKNOWN;
-
-	if (items && cards) {
-		MemHandleUnlock(items);
-		MemHandleUnlock(cards);
-		MemHandleFree(items);
-		MemHandleFree(cards);
-	}
-}
-
-static UInt16 CardSlotFillList(Boolean getRefNum = false) {
-	Err err;
-	UInt16 index;
-	UInt16 volRefNum;
-	UInt32 volIterator = vfsIteratorStart|vfsIncludePrivateVolumes;
-	UInt8 counter = 0;
-	UInt32 other = 1;
-
-	MemHandle items = NULL;
-	MemHandle cards = NULL;
-	CardInfoType *cardsInfo;
-
-	// retreive card infos
-	while (volIterator != vfsIteratorStop) {
-		err = VFSVolumeEnumerate(&volRefNum, &volIterator);
-
-		if (!err) {
-			Char labelP[expCardInfoStringMaxLen+1];
-			MemSet(labelP, expCardInfoStringMaxLen+1, 0);
-			err = VFSVolumeGetLabel(volRefNum, labelP, expCardInfoStringMaxLen+1);
-
-			if (err || StrLen(labelP) == 0) {	// if no label try to retreive card type
-				VolumeInfoType volInfo;
-				err = VFSVolumeInfo(volRefNum, &volInfo);
-
-				if (!err) {
-					ExpCardInfoType info;
-					err = ExpCardInfo(volInfo.slotRefNum, &info);
-					StrCopy(labelP, info.deviceClassStr);
-				}
-
-				if (err)	// if err default name
-					StrPrintF(labelP,"Other Card %ld", other++);
-			}
-
-			if (!cards)
-				cards = MemHandleNew(sizeof(CardInfoType));
-			else
-				MemHandleResize(cards, MemHandleSize(cards) + sizeof(CardInfoType));
-
-			cardsInfo = (CardInfoType *)MemHandleLock(cards);
-			cardsInfo[counter].volRefNum = volRefNum;
-			StrCopy(cardsInfo[counter].nameP, labelP);
-			MemHandleUnlock(cards);
-			counter++;
-		}
-	}
-
-	if (counter > 0) {
-		// set the list items ...
-		if (!getRefNum) {
-			for (index = 0; index < counter; index++) {
-				if (!items)
-					items = MemHandleNew(sizeof(Char *));
-				else
-					MemHandleResize(items, MemHandleSize(items) + sizeof(Char *));
-
-				itemsText = (Char **)MemHandleLock(items);
-				itemsText[index] = cardsInfo[index].nameP;
-				MemHandleUnlock(items);
-			}
-
-			// save globals
-			itemsText = (Char **)MemHandleLock(items);
-			itemsList = (void *)MemHandleLock(cards);
-			itemsType = ITEM_TYPE_CARD;
-
-		// ... or just return a default volRefNum
-		} else {
-			UInt16 volRefNum;
-
-			cardsInfo = (CardInfoType *)MemHandleLock(cards);
-			volRefNum =  cardsInfo[0].volRefNum;	// return the first volref
-			MemHandleUnlock(cards);
-			MemHandleFree(cards);
-
-			return volRefNum;
-		}
-
-	// no card found ? free old list in any or return invalid volref
-	} else {
-		if (!getRefNum)
-			CardSlotFreeList();
-		else
-			return vfsInvalidVolRef;
-	}
-
-	return counter;
-}
-
-static void ConfigTabInit(Boolean update = false) {
-	ListPtr listP;
-
-	UInt16 index;
-	Int16 selected = -1;
-
-	UInt16 counter = CardSlotFillList();
-	listP = (ListType *)GetObjectPtr(TabCardConfigSlotList);
-
-	// itemsText can be NULL if counter = 0
-	LstSetListChoices (listP, itemsText, counter);
-	if (counter > 0) {
-		CardInfoType *cardsInfo = (CardInfoType *)itemsList;
-
-		for (index = 0; index < counter; index++) {
-			if (cardsInfo[index].volRefNum == gPrefs->card.volRefNum) {
-				selected = index;
-				break;
-			}
-		}
-
-		LstSetSelection(listP, selected);
-	}
-
-	if (!update) {
-		FieldType *fld1P;
-		Char *cacheP;
-		MemHandle cacheH;
-
-		fld1P = (FieldType *)GetObjectPtr(TabCardConfigCacheSizeField);
-		cacheH = MemHandleNew(FldGetMaxChars(fld1P)+1);
-		cacheP = (Char *)MemHandleLock(cacheH);
-		StrIToA(cacheP, gPrefs->card.cacheSize / 1024);
-		MemHandleUnlock(cacheH);
-
-		FldSetTextHandle(fld1P, cacheH);
-		CtlSetValue((ControlType *)GetObjectPtr(TabCardConfigCacheCheckbox), gPrefs->card.useCache);
-		CtlSetValue((ControlType *)GetObjectPtr(TabCardConfigLedCheckbox), gPrefs->card.showLED);
-		CtlSetValue((ControlType *)GetObjectPtr(TabCardConfigDetectCheckbox), gPrefs->card.autoDetect);
-	// update ? redraw the list
-	} else {
-		WinScreenLock(winLockCopy);
-		LstDrawList(listP);
-		WinScreenUnlock();
-	}
-}
-
-static UInt16 ConfigTabSave() {
-	ControlType *cckP[3];
-	FieldType *fld1P;
-	ListPtr listP;
-	FormPtr frmP;
-	UInt16 updateCode = frmRedrawUpdateMS;
-
-	cckP[0] = (ControlType *)GetObjectPtr(TabCardConfigCacheCheckbox);
-	cckP[1] = (ControlType *)GetObjectPtr(TabCardConfigLedCheckbox);
-	cckP[2] = (ControlType *)GetObjectPtr(TabCardConfigDetectCheckbox);
-
-	gPrefs->card.useCache = CtlGetValue(cckP[0]);
-	gPrefs->card.showLED = CtlGetValue(cckP[1]);
-	gPrefs->card.autoDetect = CtlGetValue(cckP[2]);
-
-	fld1P = (FieldType *)GetObjectPtr(TabCardConfigCacheSizeField);
-	frmP = FrmGetActiveForm();
-	if (FldGetTextLength(fld1P) == 0 && CtlGetValue(cckP[0]) == 1) {
-		TabSetActive(frmP, myTabP, 0);
-		FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabCardConfigCacheSizeField));
-		FrmCustomAlert(FrmWarnAlert,"You must specified a cache size.",0,0);
-		return 0;
-	}
-	gPrefs->card.cacheSize = StrAToI(FldGetTextPtr(fld1P)) * 1024;
-
-	Int16 selected;
-	CardInfoType *cardsInfo = (CardInfoType *)itemsList;
-
-	listP = (ListType *)GetObjectPtr(TabCardConfigSlotList);
-	selected = LstGetSelection(listP);
-	if (selected == -1) {
-		gPrefs->card.volRefNum = vfsInvalidVolRef;
-	} else if (gPrefs->card.volRefNum != cardsInfo[selected].volRefNum) {
-		updateCode = frmRedrawUpdateMSImport;
-		gPrefs->card.volRefNum = cardsInfo[selected].volRefNum;
-	}
-
-	CardSlotCreateDirs();
-	CardSlotFreeList();
-
-	return updateCode;
-}
-
-static void GameListTabInit() {
-	CtlSetValue((ControlType *)GetObjectPtr(TabCardGameListMoveCheckbox), gPrefs->card.moveDB);
-	CtlSetValue((ControlType *)GetObjectPtr(TabCardGameListDeleteCheckbox), gPrefs->card.deleteDB);
-	CtlSetValue((ControlType *)GetObjectPtr(TabCardGameListConfirmCheckbox), gPrefs->card.confirmMoveDB);
-}
-
-static void GameListTabSave() {
-	ControlType *cckP[3];
-
-	cckP[0] = (ControlType *)GetObjectPtr(TabCardGameListMoveCheckbox);
-	cckP[1] = (ControlType *)GetObjectPtr(TabCardGameListDeleteCheckbox);
-	cckP[2] = (ControlType *)GetObjectPtr(TabCardGameListConfirmCheckbox);
-
-	gPrefs->card.moveDB = CtlGetValue(cckP[0]);
-	gPrefs->card.deleteDB = CtlGetValue(cckP[1]);
-	gPrefs->card.confirmMoveDB = CtlGetValue(cckP[2]);
-}
-
-static void GameListTabDraw() {
-	ControlType *cck1P;
-	FormPtr frmP = FrmGetActiveForm();
-
-	cck1P = (ControlType *)GetObjectPtr(TabCardGameListMoveCheckbox);
-	if (CtlGetValue(cck1P)) {
-		FrmShowObject(frmP, FrmGetObjectIndex (frmP, TabCardGameListDeleteCheckbox));
-		FrmShowObject(frmP, FrmGetObjectIndex (frmP, TabCardGameListConfirmCheckbox));
-	} else {
-		FrmHideObject(frmP, FrmGetObjectIndex (frmP, TabCardGameListDeleteCheckbox));
-		FrmHideObject(frmP, FrmGetObjectIndex (frmP, TabCardGameListConfirmCheckbox));
-	}
-}
-
-static void CardSlotFormInit() {
-	TabType *tabP;
-	FormType *frmP = FrmGetActiveForm();
-
-	tabP = TabNewTabs(2);
-	TabAddContent(&frmP, tabP, "Cards", TabCardConfigForm);
-	TabAddContent(&frmP, tabP, "Game List", TabCardGameListForm, GameListTabDraw);
-
-	ConfigTabInit();
-	GameListTabInit();
-
-	FrmDrawForm(frmP);
-	TabSetActive(frmP, tabP, lastTab);
-
-	myTabP = tabP;
-}
-
-static void CardSlotFormSave() {
-	UInt16 updateCode;
-	updateCode = ConfigTabSave();
-	if (!updateCode) return;
-	GameListTabSave();
-	CardSlotCreateDirs();
-
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain(updateCode);
-}
-
-static void CardSlotFormCancel() {
-	CardSlotFreeList();
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-}
-
-Boolean CardSlotFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			CardSlotFormInit();
-			handled = true;
-			break;
-
-		case frmCloseEvent:
-			CardSlotFormCancel();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case (CardSlotForm + 1) :
-				case (CardSlotForm + 2) :
-					lastTab = (eventP->data.ctlSelect.controlID - CardSlotForm - 1);
-					TabSetActive(frmP, myTabP, lastTab);
-					break;
-
-				case CardSlotOkButton:
-					CardSlotFormSave();
-					break;
-
-				case CardSlotCancelButton:
-					CardSlotFormCancel();
-					break;
-
-				case TabCardGameListMoveCheckbox:
-					GameListTabDraw();
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
-
-void CardSlotCreateDirs() {
-	if (gPrefs->card.volRefNum != vfsInvalidVolRef) {
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM/Games");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM/Saved");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM/Audio");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM/Mods");
-		VFSDirCreate(gPrefs->card.volRefNum, "/PALM/Programs/ScummVM/Themes");
-	}
-}
-
-void CardSlotFormUpdate() {
-	if (itemsType == ITEM_TYPE_CARD) {
-		CardSlotFreeList();
-		ConfigTabInit(true);
-	}
-}
-
-UInt16 parseCards() {
-	UInt16 volRefNum = CardSlotFillList(true);
-	CardSlotFreeList();
-	return volRefNum;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.h b/backends/platform/PalmOS/Src/launcher/forms/formCards.h
deleted file mode 100644
index 766c4793b9..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formCards.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __FORMCARDS_H__
-#define __FORMCARDS_H__
-
-UInt16 parseCards();
-void CardSlotFormUpdate();
-void CardSlotCreateDirs();
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp
deleted file mode 100644
index 0540c12577..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <VFSMgr.h>
-#include <FileBrowserLibCommon.h>
-#include <FileBrowserLib68K.h>
-
-#include "formTabs.h"
-#include "forms.h"
-
-#include "start.h"
-#include "games.h"
-#include "skin.h"
-
-#define errBadParam	0x1000
-
-static TabType *myTabP;
-static UInt16 lastTab = 0;
-
-UInt8 gFormEditMode;
-
-static void GameTabInit(GameInfoType *gameInfoP) {
-	FieldType *fld1P, *fld2P, *fld3P;
-	Char *nameP, *pathP, *gameP;
-	MemHandle nameH, pathH, gameH;
-	ListType *list1P;
-
-	list1P = (ListType *)GetObjectPtr(TabGameInfoEngineList);
-
-	itemsText = (Char **)MemPtrNew(ENGINE_COUNT * sizeof(Char *));
-	for (int i = 0; i < ENGINE_COUNT; i++)
-		itemsText[i] = (Char *)engines[i].nameP;
-	LstSetListChoices(list1P, itemsText, ENGINE_COUNT);
-
-	fld1P = (FieldType *)GetObjectPtr(TabGameInfoEntryNameField);
-	fld2P = (FieldType *)GetObjectPtr(TabGameInfoPathField);
-	fld3P = (FieldType *)GetObjectPtr(TabGameInfoGameField);
-
-	nameH = MemHandleNew(FldGetMaxChars(fld1P)+1);
-	pathH = MemHandleNew(FldGetMaxChars(fld2P)+1);
-	gameH = MemHandleNew(FldGetMaxChars(fld3P)+1);
-
-	nameP = (Char *)MemHandleLock(nameH);
-	pathP = (Char *)MemHandleLock(pathH);
-	gameP = (Char *)MemHandleLock(gameH);
-
-	if (gameInfoP) {
-		LstSetSelection(list1P, gameInfoP->engine);
-		LstSetTopItem(list1P, gameInfoP->engine);
-		StrCopy(nameP, gameInfoP->nameP);
-		StrCopy(pathP, gameInfoP->pathP);
-		StrCopy(gameP, gameInfoP->gameP);
-	} else {
-		LstSetSelection(list1P, 0);
-		MemSet(nameP,MemHandleSize(nameH),0);
-		MemSet(pathP,MemHandleSize(pathH),0);
-		MemSet(gameP,MemHandleSize(gameH),0);
-	}
-
-	CtlSetLabel((ControlType *)GetObjectPtr(TabGameInfoEnginePopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-
-	MemHandleUnlock(nameH);
-	MemHandleUnlock(pathH);
-	MemHandleUnlock(gameH);
-
-	FldSetTextHandle(fld1P, nameH);
-	FldSetTextHandle(fld2P, pathH);
-	FldSetTextHandle(fld3P, gameH);
-}
-
-static Err GameTabSave(GameInfoType *gameInfoP) {
-	FieldType *fld1P, *fld2P, *fld3P;
-	ListType *list1P;
-
-	FormType *frmP = FrmGetActiveForm();
-	list1P = (ListType *)GetObjectPtr(TabGameInfoEngineList);
-
-	fld1P = (FieldType *)GetObjectPtr(TabGameInfoEntryNameField);
-	fld2P = (FieldType *)GetObjectPtr(TabGameInfoPathField);
-	fld3P = (FieldType *)GetObjectPtr(TabGameInfoGameField);
-
-	FldTrimText(fld1P);
-	FldTrimText(fld2P);
-	FldTrimText(fld3P);
-
-	// test case
-	if (!gameInfoP) {
-		if (FldGetTextLength(fld1P) == 0) {
-			FrmCustomAlert(FrmWarnAlert,"You must specify an entry name.",0,0);
-			TabSetActive(frmP, myTabP, 0);
-			FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameInfoEntryNameField));
-			return errBadParam;
-
-		} else if (FldGetTextLength(fld2P) == 0) {
-			FrmCustomAlert(FrmWarnAlert,"You must specify a path.",0,0);
-			TabSetActive(frmP, myTabP, 0);
-			FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameInfoPathField));
-			return errBadParam;
-
-		} else if (FldGetTextLength(fld3P) == 0) {
-			FrmCustomAlert(FrmWarnAlert,"You must specify a game.",0,0);
-			TabSetActive(frmP, myTabP, 0);
-			FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameInfoGameField));
-			return errBadParam;
-		}
-
-	} else {
-		gameInfoP->engine = LstGetSelection(list1P);
-		StrCopy(gameInfoP->nameP, FldGetTextPtr(fld1P));
-		StrCopy(gameInfoP->pathP, FldGetTextPtr(fld2P));
-		StrCopy(gameInfoP->gameP, FldGetTextPtr(fld3P));
-
-		if (gameInfoP->pathP[StrLen(gameInfoP->pathP)-1] != '/')
-			StrCat(gameInfoP->pathP, "/");
-
-		MemPtrFree(itemsText);
-		itemsText = NULL;
-	}
-
-	return errNone;
-}
-
-static void DisplayInit(GameInfoType *gameInfoP) {
-	ListType *list1P, *list2P;
-
-	list1P = (ListType *)GetObjectPtr(TabGameDisplayGfxListList);
-	list2P = (ListType *)GetObjectPtr(TabGameDisplayRenderList);
-
-	if (gameInfoP) {
-		LstSetSelection(list1P, gameInfoP->gfxMode);
-		LstSetSelection(list2P, gameInfoP->renderMode);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayFilterCheckbox), gameInfoP->filter);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayFullscreenCheckbox), gameInfoP->fullscreen);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayAspectRatioCheckbox), gameInfoP->aspectRatio);
-
-	} else {
-		LstSetSelection(list1P, 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayFilterCheckbox), 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayFullscreenCheckbox), 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayAspectRatioCheckbox), 0);
-	}
-
-	CtlSetLabel((ControlType *)GetObjectPtr(TabGameDisplayGfxPopupPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-	CtlSetLabel((ControlType *)GetObjectPtr(TabGameDisplayRenderPopTrigger), LstGetSelectionText(list2P, LstGetSelection(list2P)));
-}
-
-static Err DisplaySave(GameInfoType *gameInfoP) {
-	ListType *list1P, *list2P;
-	ControlType *cck6P, *cck7P, *cck8P;
-
-	FormType *frmP = FrmGetActiveForm();
-
-	list1P = (ListType *)GetObjectPtr(TabGameDisplayGfxListList);
-	list2P = (ListType *)GetObjectPtr(TabGameDisplayRenderList);
-	cck6P = (ControlType *)GetObjectPtr(TabGameDisplayFilterCheckbox);
-	cck7P = (ControlType *)GetObjectPtr(TabGameDisplayFullscreenCheckbox);
-	cck8P = (ControlType *)GetObjectPtr(TabGameDisplayAspectRatioCheckbox);
-
-	if (!gameInfoP) {
-	} else {
-		gameInfoP->gfxMode = LstGetSelection(list1P);
-		gameInfoP->renderMode = LstGetSelection(list2P);
-		gameInfoP->filter = CtlGetValue(cck6P);
-		gameInfoP->fullscreen = CtlGetValue(cck7P);
-		gameInfoP->aspectRatio = CtlGetValue(cck8P);
-	}
-
-	return errNone;
-}
-
-static void OptionsInit(GameInfoType *gameInfoP) {
-	ListType *list2P, *list3P;
-	FieldType *fld4P, *fld5P, *fld6P;
-	Char *loadP, *roomP, *talkP;
-	MemHandle loadH, roomH, talkH;
-
-	list2P = (ListType *)GetObjectPtr(TabGameOptionsLanguageList);
-	list3P = (ListType *)GetObjectPtr(TabGameOptionsPlatformList);
-
-	fld4P = (FieldType *)GetObjectPtr(TabGameOptionsLoadSlotField);
-	fld5P = (FieldType *)GetObjectPtr(TabGameOptionsStartRoomField);
-	fld6P = (FieldType *)GetObjectPtr(TabGameOptionsTalkSpeedField);
-
-	loadH = MemHandleNew(FldGetMaxChars(fld4P)+1);
-	roomH = MemHandleNew(FldGetMaxChars(fld5P)+1);
-	talkH = MemHandleNew(FldGetMaxChars(fld6P)+1);
-
-	loadP = (Char *)MemHandleLock(loadH);
-	roomP = (Char *)MemHandleLock(roomH);
-	talkP = (Char *)MemHandleLock(talkH);
-
-	if (gameInfoP) {
-		LstSetSelection(list2P, gameInfoP->language);
-		LstSetTopItem(list2P, gameInfoP->language);
-		LstSetSelection(list3P, gameInfoP->platform);
-		LstSetTopItem(list3P, gameInfoP->platform);
-
-		StrIToA(loadP, gameInfoP->loadSlot);
-		StrIToA(roomP, gameInfoP->bootValue);
-		StrIToA(talkP, gameInfoP->talkValue);
-
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsLoadSlotCheckbox), gameInfoP->autoLoad);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsStartRoomCheckbox), gameInfoP->bootParam);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsAmigaCheckbox), gameInfoP->setPlatform);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsSubtitlesCheckbox), gameInfoP->subtitles);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsTalkSpeedCheckbox), gameInfoP->talkSpeed);
-
-	} else {
-		LstSetSelection(list2P, 0);
-		LstSetSelection(list3P, 0);
-
-		StrIToA(loadP, 0);
-		StrIToA(roomP, 0);
-		StrIToA(talkP, 60);
-
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsLoadSlotCheckbox), 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsStartRoomCheckbox), 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsAmigaCheckbox), 0);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsSubtitlesCheckbox), 1);
-		CtlSetValue((ControlType *)GetObjectPtr(TabGameOptionsTalkSpeedCheckbox), 0);
-	}
-
-	MemHandleUnlock(loadH);
-	MemHandleUnlock(roomH);
-	MemHandleUnlock(talkH);
-
-	FldSetTextHandle(fld4P, loadH);
-	FldSetTextHandle(fld5P, roomH);
-	FldSetTextHandle(fld6P, talkH);
-
-	CtlSetLabel((ControlType *)GetObjectPtr(TabGameOptionsLanguagePopTrigger), LstGetSelectionText(list2P, LstGetSelection(list2P)));
-	CtlSetLabel((ControlType *)GetObjectPtr(TabGameOptionsPlatformPopTrigger), LstGetSelectionText(list3P, LstGetSelection(list3P)));
-}
-
-static Err OptionsSave(GameInfoType *gameInfoP) {
-	FieldType *fld4P, *fld5P, *fld6P;
-	ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P;
-	ListType *list2P, *list3P;
-
-	FormType *frmP = FrmGetActiveForm();
-
-	list2P = (ListType *)GetObjectPtr(TabGameOptionsLanguageList);
-	list3P = (ListType *)GetObjectPtr(TabGameOptionsPlatformList);
-
-	fld4P = (FieldType *)GetObjectPtr(TabGameOptionsLoadSlotField);
-	fld5P = (FieldType *)GetObjectPtr(TabGameOptionsStartRoomField);
-	fld6P = (FieldType *)GetObjectPtr(TabGameOptionsTalkSpeedField);
-
-	cck1P = (ControlType *)GetObjectPtr(TabGameOptionsLoadSlotCheckbox);
-	cck2P = (ControlType *)GetObjectPtr(TabGameOptionsStartRoomCheckbox);
-	cck3P = (ControlType *)GetObjectPtr(TabGameOptionsAmigaCheckbox);
-	cck4P = (ControlType *)GetObjectPtr(TabGameOptionsSubtitlesCheckbox);
-	cck5P = (ControlType *)GetObjectPtr(TabGameOptionsTalkSpeedCheckbox);
-
-	if (!gameInfoP) {
-		if (FldGetTextLength(fld5P) == 0 && CtlGetValue(cck2P) == 1) {
-			FrmCustomAlert(FrmWarnAlert,"You must specify a room number.",0,0);
-			TabSetActive(frmP, myTabP, 2);
-			FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameOptionsStartRoomField));
-			return errBadParam;
-
-		} else if (FldGetTextLength(fld6P) == 0 && CtlGetValue(cck5P) == 1) {
-			FrmCustomAlert(FrmWarnAlert,"You must specify a talk speed.",0,0);
-			TabSetActive(frmP, myTabP, 2);
-			FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameOptionsTalkSpeedField));
-			return errBadParam;
-		}
-	} else {
-		gameInfoP->language = LstGetSelection(list2P);
-		gameInfoP->platform = LstGetSelection(list3P);
-
-		gameInfoP->autoLoad = CtlGetValue(cck1P);
-		gameInfoP->bootParam = CtlGetValue(cck2P);
-		gameInfoP->setPlatform = CtlGetValue(cck3P);
-		gameInfoP->subtitles = (CtlGetValue(cck4P));
-		gameInfoP->talkSpeed = CtlGetValue(cck5P);
-
-		gameInfoP->loadSlot = StrAToI(FldGetTextPtr(fld4P));
-		gameInfoP->bootValue = StrAToI(FldGetTextPtr(fld5P));
-		gameInfoP->talkValue = StrAToI(FldGetTextPtr(fld6P));
-	}
-
-	return errNone;
-}
-
-static void GameManInit(UInt16 index) {
-	TabType *tabP;
-	FormType *frmP = FrmGetActiveForm();
-	UInt16 active = lastTab;
-
-	tabP = TabNewTabs(3);
-	TabAddContent(&frmP, tabP, "Game", TabGameInfoForm);
-	TabAddContent(&frmP, tabP, "Display", TabGameDisplayForm);
-	TabAddContent(&frmP, tabP, "Options", TabGameOptionsForm);
-
-	UInt16 refNum;
-	if (SysLibFind(kFileBrowserLibName, &refNum))
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabGameInfoBrowsePushButton));
-
-	if (index != dmMaxRecordIndex) {
-		MemHandle recordH = NULL;
-		GameInfoType *gameInfoP;
-
-		recordH = DmQueryRecord(gameDB, index);
-		gameInfoP = (GameInfoType *)MemHandleLock(recordH);
-
-		GameTabInit(gameInfoP);
-		DisplayInit(gameInfoP);
-		OptionsInit(gameInfoP);
-
-		MemHandleUnlock(recordH);
-		CtlSetUsable((ControlType *)GetObjectPtr(GameEditDeleteButton),true);
-	} else {
-		active = 0; // new game ? start with first tab
-		GameTabInit(0);
-		DisplayInit(0);
-		OptionsInit(0);
-		CtlSetUsable((ControlType *)GetObjectPtr(GameEditDeleteButton),false);
-	}
-
-	FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabGameInfoEntryNameField));
-	FrmDrawForm(frmP);
-	TabSetActive(frmP, tabP, active);
-
-	myTabP = tabP;
-}
-
-static void GameManSave(UInt16 index) {
-	MemHandle recordH;
-	GameInfoType *gameInfoP, newGameInfo;
-
-	if (GameTabSave(0) == errBadParam) return;
-	if (DisplaySave(0) == errBadParam) return;
-	if (OptionsSave(0) == errBadParam) return;
-
-	if (index != dmMaxRecordIndex) {
-		recordH = DmGetRecord(gameDB, index);
-		gameInfoP = (GameInfoType *)MemHandleLock(recordH);
-		MemMove(&newGameInfo, gameInfoP, sizeof(GameInfoType));
-
-	} else {
-		index = dmMaxRecordIndex;
-		GamUnselect();
-		recordH = DmNewRecord(gameDB, &index, sizeof(GameInfoType));
-		gameInfoP = (GameInfoType *)MemHandleLock(recordH);
-
-		MemSet(&newGameInfo, sizeof(GameInfoType), 0);
-		newGameInfo.version	= curItemVersion;
-		newGameInfo.icnID = 0xFFFF;
-		newGameInfo.selected = true;
-
-		// default sound data
-		newGameInfo.musicInfo.volume.palm = 50;
-		newGameInfo.musicInfo.volume.music = 192;
-		newGameInfo.musicInfo.volume.sfx = 192;
-		newGameInfo.musicInfo.volume.speech = 192;
-		newGameInfo.musicInfo.volume.audiocd = 50;
-
-		newGameInfo.musicInfo.sound.tempo = 100;
-		newGameInfo.musicInfo.sound.defaultTrackLength = 10;
-		newGameInfo.musicInfo.sound.firstTrack = 1;
-	}
-
-	GameTabSave(&newGameInfo);
-	DisplaySave(&newGameInfo);
-	OptionsSave(&newGameInfo);
-
-	DmWrite(gameInfoP, 0, &newGameInfo, sizeof(GameInfoType));
-
-	MemHandleUnlock(recordH);
-	DmReleaseRecord (gameDB, index, 0);
-	GamSortList();
-	// update list position
-	{
-		RectangleType rArea;
-		UInt16 posIndex, maxView;
-
-		// get the sorted index
-		index = GamGetSelected();
-		// if new item is out of the list bounds, change current list pos
-		SknGetListBounds(&rArea, NULL);
-		maxView = rArea.extent.y / sknInfoListItemSize;
-		posIndex = gPrefs->listPosition;
-
-		// if out of the current list position
-		if (!(index >= posIndex && index < (posIndex + maxView)))
-			gPrefs->listPosition = index;	// this value is corrected in SknUpdateList if needed
-	}
-
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-	SknUpdateList();
-}
-
-/***********************************************************************
- *
- * FUNCTION:    EditGameFormSave
- * FUNCTION:    EditGameFormInit
- * FUNCTION:    EditGameFormHandleEvent
- *
- * DESCRIPTION:
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-void EditGameFormDelete(Boolean direct) {
-	UInt16 index = GamGetSelected();
-
-	if (index == dmMaxRecordIndex) {
-		FrmCustomAlert(FrmWarnAlert, "Select an entry first.",0,0);
-		return;
-
-	} else if (FrmCustomAlert(FrmConfirmAlert, "Do you really want to delete this entry ?", 0, 0) == FrmConfirmYes) {
-		DmRemoveRecord(gameDB, index);
-		if (!direct) {
-			TabDeleteTabs(myTabP);
-			FrmReturnToMain();
-		}
-		GamSortList();
-		SknUpdateList();
-	}
-}
-
-static void EditGameCancel() {
-	if (itemsText) {
-		MemPtrFree(itemsText);
-		itemsText = NULL;
-	}
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-}
-
-static void EditGameBowser() {
-	UInt16 refNum;
-	Err e;
-
-	ControlPtr butP = (ControlType *)GetObjectPtr(TabGameInfoBrowsePushButton);
-	CtlSetValue(butP, 0);
-
-	e = SysLibFind (kFileBrowserLibName, &refNum);
-	if (!e) {
-		e = FileBrowserLibOpen (refNum);
-		if (!e) {
-			UInt16 volRefNum = gPrefs->card.volRefNum;
-			Char *textP, *pathP = (Char *)MemPtrNew(kFileBrowserLibPathBufferSize);
-			pathP[0] = chrNull;
-
-			if (FileBrowserLibShowOpenDialog(refNum, &volRefNum, pathP, 0, 0, 0, "Game Data Path", kFileBrowserLibFlagNoFiles)) {
-				FieldPtr fldP;
-				MemHandle textH;
-				Int16 offset, copySize, maxSize;
-
-				fldP = (FieldType *)GetObjectPtr(TabGameInfoPathField);
-				maxSize = FldGetMaxChars(fldP);
-				textH = FldGetTextHandle(fldP);
-
-				FldSetTextHandle(fldP, NULL);
-				textP = (Char *)MemHandleLock(textH);
-				offset = 0;
-				copySize = StrLen(pathP);
-
-				if (StrNCaselessCompare(pathP, "/Palm/Programs/ScummVM/Games/", 29) == 0) {
-					if (StrLen(pathP) == 29) {
-						copySize = 1;
-						pathP[0] = '.';
-					} else {
-						copySize -= 29;
-						offset = 29;
-					}
-				}
-
-				if (copySize > maxSize)
-					copySize = maxSize;
-				StrNCopy(textP, pathP + offset, copySize);
-
-				MemHandleUnlock(textH);
-				FldSetTextHandle(fldP, textH);
-				FldDrawField(fldP);
-				FldGrabFocus(fldP);
-			}
-
-			MemPtrFree(pathP);
-			FileBrowserLibClose(refNum);
-		}
-	}
-}
-
-Boolean EditGameFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmCloseEvent:
-			EditGameCancel();
-			handled = true;
-			break;
-
-		case frmOpenEvent:
-			switch (gFormEditMode) {
-				case edtModeAdd:
-					GameManInit(dmMaxRecordIndex);
-					break;
-				case edtModeEdit:
-				case edtModeParams:
-				default :
-					GameManInit(GamGetSelected());
-					break;
-			}
-			handled = true;
-			break;
-
-		case keyDownEvent:
-			switch (eventP->data.keyDown.chr) {
-				case chrLineFeed:
-				case chrCarriageReturn:
-					return true;
-			}
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case (GameEditForm + 1) :
-				case (GameEditForm + 2) :
-				case (GameEditForm + 3) :
-					lastTab = (eventP->data.ctlSelect.controlID - GameEditForm - 1);
-					TabSetActive(frmP, myTabP, lastTab);
-					break;
-
-				case GameEditOKButton:
-					switch (gFormEditMode) {
-						case edtModeAdd:
-							GameManSave(dmMaxRecordIndex);
-							break;
-						case edtModeEdit:
-						case edtModeParams:
-						default :
-							GameManSave(GamGetSelected());
-							break;
-					}
-					break;
-
-				case GameEditCancelButton:
-					EditGameCancel();
-					break;
-
-				case GameEditDeleteButton:
-					EditGameFormDelete(false);
-					break;
-
-				case TabGameInfoBrowsePushButton:
-					EditGameBowser();
-					break;
-
-				case TabGameInfoEnginePopTrigger:
-					FrmList(eventP, TabGameInfoEngineList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabGameInfoEngineList));
-					break;
-
-				case TabGameDisplayGfxPopupPopTrigger:
-					FrmList(eventP, TabGameDisplayGfxListList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabGameDisplayGfxListList));
-					break;
-
-				case TabGameDisplayRenderPopTrigger:
-					FrmList(eventP, TabGameDisplayRenderList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabGameDisplayRenderList));
-					break;
-
-				case TabGameOptionsLanguagePopTrigger:
-					FrmList(eventP, TabGameOptionsLanguageList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabGameOptionsLanguageList));
-					break;
-
-				case TabGameOptionsPlatformPopTrigger:
-					FrmList(eventP, TabGameOptionsPlatformList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabGameOptionsPlatformList));
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp
deleted file mode 100644
index 35b44486e9..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "start.h"
-#include "formTabs.h"
-#include "forms.h"
-#include "globals.h"
-
-static TabType *myTabP;
-static UInt16 lastTab = 0;
-
-static Boolean ScummVMTabSave() {
-	FieldType *fld1P, *fld2P;
-	ControlType *cckP[11];
-	FormPtr frmP;
-
-	fld1P = (FieldType *)GetObjectPtr(TabMiscScummVMDebugLevelField);
-	fld2P = (FieldType *)GetObjectPtr(TabMiscScummVMAutosaveField);
-
-	cckP[0] = (ControlType *)GetObjectPtr(TabMiscScummVMAutosaveCheckbox);
-	cckP[3] = (ControlType *)GetObjectPtr(TabMiscScummVMDebugCheckbox);
-	cckP[6] = (ControlType *)GetObjectPtr(TabMiscScummVMDemoCheckbox);
-	cckP[9] = (ControlType *)GetObjectPtr(TabMiscScummVMCopyProtectionCheckbox);
-	cckP[10]= (ControlType *)GetObjectPtr(TabMiscScummVMAltIntroCheckbox);
-
-	frmP = FrmGetActiveForm();
-	if (FldGetTextLength(fld1P) == 0 && CtlGetValue(cckP[3]) == 1) {
-		TabSetActive(frmP, myTabP, 1);
-		FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabMiscScummVMDebugLevelField));
-		FrmCustomAlert(FrmWarnAlert,"You must specify a debug level.",0,0);
-		return false;
-
-	} else if (FldGetTextLength(fld2P) == 0 && CtlGetValue(cckP[0]) == 1) {
-		TabSetActive(frmP, myTabP, 1);
-		FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabMiscScummVMAutosaveField));
-		FrmCustomAlert(FrmWarnAlert,"You must specify a period.",0,0);
-		return false;
-	}
-
-	gPrefs->autoSave = CtlGetValue(cckP[0]);
-	gPrefs->debug = CtlGetValue(cckP[3]);
-	gPrefs->demoMode = CtlGetValue(cckP[6]);
-	gPrefs->copyProtection = CtlGetValue(cckP[9]);
-	gPrefs->altIntro = CtlGetValue(cckP[10]);
-
-	gPrefs->debugLevel = StrAToI(FldGetTextPtr(fld1P));
-	gPrefs->autoSavePeriod = StrAToI(FldGetTextPtr(fld2P));
-
-	return true;
-}
-
-static void PalmOSTabSave() {
-	ControlType *cckP[11];
-
-	if (OPTIONS_TST(kOptDeviceARM) && !OPTIONS_TST(kOptDeviceZodiac)) {
-		cckP[3]= (ControlType *)GetObjectPtr(TabMiscPalmOSAdvancedCheckbox);
-		gPrefs->advancedMode = CtlGetValue(cckP[3]);
-	}
-
-	if (!OPTIONS_TST(kOptDeviceARM)) {
-		cckP[2] = (ControlType *)GetObjectPtr(TabMiscPalmOSStdPaletteCheckbox);
-		gPrefs->stdPalette = CtlGetValue(cckP[2]);
-	}
-
-	cckP[0] = (ControlType *)GetObjectPtr(TabMiscPalmOSVibratorCheckbox);
-	cckP[1] = (ControlType *)GetObjectPtr(TabMiscPalmOSNoAutoOffCheckbox);
-	cckP[4] = (ControlType *)GetObjectPtr(TabMiscPalmOSLargerStackCheckbox);
-	cckP[5] = (ControlType *)GetObjectPtr(TabMiscPalmOSExitLauncherCheckbox);
-	cckP[6] = (ControlType *)GetObjectPtr(TabMiscPalmOSStylusClickCheckbox);
-	cckP[7] = (ControlType *)GetObjectPtr(TabMiscPalmOSArrowCheckbox);
-
-	gPrefs->vibrator = CtlGetValue(cckP[0]);
-	gPrefs->autoOff = !CtlGetValue(cckP[1]);
-	gPrefs->setStack = CtlGetValue(cckP[4]);
-	gPrefs->exitLauncher = CtlGetValue(cckP[5]);
-	gPrefs->stylusClick = !CtlGetValue(cckP[6]);
-	gPrefs->arrowKeys = CtlGetValue(cckP[7]);
-}
-
-static void ExtsTabSave() {
-	ControlType *cckP[2];
-
-	if (OPTIONS_TST(kOptLightspeedAPI)) {
-		ListType *list1P = (ListType *)GetObjectPtr(TabMiscExtsLightspeedList);
-		cckP[0] = (ControlType *)GetObjectPtr(TabMiscExtsLightspeedCheckbox);
-
-		gPrefs->lightspeed.enable = CtlGetValue(cckP[0]);
-		gPrefs->lightspeed.mode = LstGetSelection(list1P);
-	}
-	if (OPTIONS_TST(kOptGoLcdAPI)) {
-		cckP[1] = (ControlType *)GetObjectPtr(TabMiscExtsGolcdCheckbox);
-		gPrefs->goLCD = CtlGetValue(cckP[1]);
-	}
-}
-
-static void ScummVMTabInit() {
-	FieldType *fld1P, *fld2P;
-	Char *levelP, *periodP;
-	MemHandle levelH, periodH;
-
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscScummVMAutosaveCheckbox), gPrefs->autoSave);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscScummVMDebugCheckbox), gPrefs->debug);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscScummVMDemoCheckbox), gPrefs->demoMode);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscScummVMCopyProtectionCheckbox), gPrefs->copyProtection);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscScummVMAltIntroCheckbox), gPrefs->altIntro);
-
-	fld1P = (FieldType *)GetObjectPtr(TabMiscScummVMDebugLevelField);
-	fld2P = (FieldType *)GetObjectPtr(TabMiscScummVMAutosaveField);
-
-	levelH = MemHandleNew(FldGetMaxChars(fld1P)+1);
-	levelP = (Char *)MemHandleLock(levelH);
-	StrIToA(levelP, gPrefs->debugLevel);
-	MemHandleUnlock(levelH);
-
-	periodH = MemHandleNew(FldGetMaxChars(fld2P)+1);
-	periodP = (Char *)MemHandleLock(periodH);
-	StrIToA(periodP, gPrefs->autoSavePeriod);
-	MemHandleUnlock(periodH);
-
-	FldSetTextHandle(fld1P, levelH);
-	FldSetTextHandle(fld2P, periodH);
-}
-
-static void PalmOSTabInit() {
-	if (OPTIONS_TST(kOptDeviceARM) && !OPTIONS_TST(kOptDeviceZodiac))
-		CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSAdvancedCheckbox), gPrefs->advancedMode);
-
-	if (!OPTIONS_TST(kOptDeviceARM))
-		CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSStdPaletteCheckbox), gPrefs->stdPalette);
-
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSExitLauncherCheckbox), gPrefs->exitLauncher);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSLargerStackCheckbox), gPrefs->setStack);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSVibratorCheckbox), gPrefs->vibrator);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSNoAutoOffCheckbox), !gPrefs->autoOff);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSStylusClickCheckbox), !gPrefs->stylusClick);
-	CtlSetValue((ControlType *)GetObjectPtr(TabMiscPalmOSArrowCheckbox), gPrefs->arrowKeys);
-}
-
-static void ExtsTabInit() {
-	if (OPTIONS_TST(kOptLightspeedAPI)) {
-		ListType *list1P = (ListType *)GetObjectPtr(TabMiscExtsLightspeedList);
-		LstSetSelection(list1P, gPrefs->lightspeed.mode);
-		CtlSetLabel((ControlType *)GetObjectPtr(TabMiscExtsLightspeedPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-		CtlSetValue((ControlType *)GetObjectPtr(TabMiscExtsLightspeedCheckbox), gPrefs->lightspeed.enable);
-	}
-
-	if (OPTIONS_TST(kOptGoLcdAPI))
-		CtlSetValue((ControlType *)GetObjectPtr(TabMiscExtsGolcdCheckbox), gPrefs->goLCD);
-}
-
-static void MiscFormSave() {
-	if (!ScummVMTabSave()) return;
-	PalmOSTabSave();
-	ExtsTabSave();
-
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-}
-
-static void MiscFormInit() {
-	TabType *tabP;
-	FormType *frmP = FrmGetActiveForm();
-	UInt8 extsCnt = 2;
-
-	tabP = TabNewTabs(3);
-	TabAddContent(&frmP, tabP, "PalmOS", TabMiscPalmOSForm);
-	TabAddContent(&frmP, tabP, "ScummVM", TabMiscScummVMForm);
-	TabAddContent(&frmP, tabP, "More ...", TabMiscExtsForm);
-
-	if (OPTIONS_TST(kOptDeviceARM)) {
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscPalmOSStdPaletteCheckbox));
-		TabMoveUpObject(frmP, TabMiscPalmOSAdvancedCheckbox, 12);
-	}
-
-	if (!OPTIONS_TST(kOptDeviceARM) || OPTIONS_TST(kOptDeviceZodiac))
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscPalmOSAdvancedCheckbox));
-
-	if (!OPTIONS_TST(kOptGoLcdAPI)) {
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsGolcdCheckbox));
-		// move lightspeed
-		TabMoveUpObject(frmP, TabMiscExtsLightspeedCheckbox, 12);
-		TabMoveUpObject(frmP, TabMiscExtsLightspeedPopTrigger, 12);
-		TabMoveUpObject(frmP, TabMiscExtsLightspeedList, 12);
-		TabMoveUpObject(frmP, TabMiscExtsNothingLabel, 12);
-		extsCnt--;
-	}
-
-	if (!OPTIONS_TST(kOptLightspeedAPI)) {
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsLightspeedCheckbox));
-//		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsLightspeedList)); // cannot remove this ?
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsLightspeedPopTrigger));
-		TabMoveUpObject(frmP, TabMiscExtsNothingLabel, 12);
-		extsCnt--;
-	}
-
-	if (extsCnt)
-		FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsNothingLabel));
-
-	PalmOSTabInit();
-	ScummVMTabInit();
-	ExtsTabInit();
-
-	FrmDrawForm(frmP);
-	TabSetActive(frmP, tabP, lastTab);
-
-	myTabP = tabP;
-}
-
-Boolean MiscFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			MiscFormInit();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case (MiscForm + 1) :
-				case (MiscForm + 2) :
-				case (MiscForm + 3) :
-					lastTab = (eventP->data.ctlSelect.controlID - MiscForm - 1);
-					TabSetActive(frmP, myTabP, lastTab);
-					break;
-
-				case TabMiscExtsLightspeedPopTrigger:
-					FrmList(eventP, TabMiscExtsLightspeedList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabMiscExtsLightspeedList));
-					break;
-
-				case MiscOKButton:
-					MiscFormSave();
-					break;
-
-				case MiscCancelButton:
-					TabDeleteTabs(myTabP);
-					FrmReturnToMain();
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp
deleted file mode 100644
index bb0ac894c2..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include "StarterRsc.h"
-#include "formUtil.h"
-#include "games.h"
-#include "start.h"
-
-#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
-
-static Char **items = NULL;
-Int16 selectedEngine = -1;
-
-// Supported games
-static const char *engine_agos[] = {
-	"Demon in my Pocket",
-	"Elvira - Mistress of the Dark",
-	"Elvira II - The Jaws of Cerberus",
-	"Jumble",
-	"NoPatience",
-	"Simon the Sorcerer I",
-	"Simon the Sorcerer II",
-	"Swampy Adventures",
-	"The Feeble Files",
-	"Waxworks"
-};
-
-static const char *engine_sky[] = {
-	"Floppy, CD and Demo"
-};
-
-static const char *engine_sword1[] = {
-	"The Shadow of the Templars (PC/Mac)",
-	"The Shadow of the Templars (Demo)"
-};
-
-static const char *engine_sword2[] = {
-	"The Smoking Mirror",
-	"The Smoking Mirror (Demo)"
-};
-
-static const char *engine_cine[] = {
-	"Future Wars",
-	"Operation Stealth"
-};
-
-static const char *engine_queen[] = {
-	"Flight of the Amazon Queen"
-};
-
-static const char *engine_lure[] = {
-	"Lure of the Tempress"
-};
-
-static const char *engine_gob[] = {
-	"Bargon Attack",
-	"Gobliiins",
-	"Gobliins 2",
-	"Goblins Quest 3",
-	"The Bizarre Adventures of Woodruff and the Schnibble",
-	"Ween: The Prophecy",
-};
-
-static const char *engine_kyra[] = {
-	"The Legend of Kyrandia",
-	"The Legend of Kyrandia: The Hand of Fate",
-	"The Legend of Kyrandia: Malcolm's Revenge"
-};
-
-static const char *engine_parallaction[] = {
-	"Nippon Safes Inc."
-};
-
-static const char *engine_saga[] = {
-	"I Have No Mouth And I Must Scream",
-	"Inherit the earth"
-};
-
-static const char *engine_scumm[] = {
-	"Day of the Tentacle",
-	"Indiana Jones and the Fate of Atlantis",
-	"Indiana Jones and the Last Crusade",
-	"Loom",
-	"Maniac Mansion",
-	"Monkey Island 2: LeChuck's Revenge",
-	"Passport to Adventure",
-	"Sam & Max Hit the Road",
-	"The Secret of Monkey Island"
-	"Zak McKracken and the Alien Mindbenders"
-};
-
-static const char *engine_agi[] = {
-	"AGI Tetris",
-	"Caitlyn's Destiny",
-	"Donald Duck's Playground",
-	"Fanmade AGI game",
-	"Gold Rush!",
-	"King's Quest I: Quest for the Crown",
-	"King's Quest II: Romancing the Throne",
-	"King's Quest III: To Heir Is Human",
-	"King's Quest IV: The Perils of Rosella",
-	"Leisure Suit Larry in the Land of the Lounge Lizards",
-	"Mixed-Up Mother Goose",
-	"Manhunter 1: New York",
-	"Manhunter 2: San Francisco",
-	"Police Quest I: In Pursuit of the Death Angel",
-	"Serguei's Destiny 1",
-	"Serguei's Destiny 2",
-	"Space Quest 0: Replicated",
-	"Space Quest I: The Sarien Encounter",
-	"Space Quest II: Vohaul's Revenge",
-	"Space Quest X: The Lost Chapter",
-	"The Black Cauldron",
-	"Xmas Card"
-};
-
-static const char *engine_touche[] = {
-	"Touche: The Adventures of the Fifth Musketeer"
-};
-
-static const char *engine_cruise[] = {
-	"Cruise for a Corpse"
-};
-
-static const struct {
-	int size;
-	const char **listP;
-} supported[] = {
-	{ ARRAYSIZE(engine_agos), engine_agos },
-	{ ARRAYSIZE(engine_sky), engine_sky },
-	{ ARRAYSIZE(engine_sword1), engine_sword1 },
-	{ ARRAYSIZE(engine_sword2), engine_sword2 },
-	{ ARRAYSIZE(engine_cine), engine_cine },
-	{ ARRAYSIZE(engine_queen), engine_queen },
-	{ ARRAYSIZE(engine_lure), engine_lure },
-	{ ARRAYSIZE(engine_gob), engine_gob },
-	{ ARRAYSIZE(engine_kyra), engine_kyra },
-	{ ARRAYSIZE(engine_parallaction), engine_parallaction },
-	{ ARRAYSIZE(engine_saga), engine_saga },
-	{ ARRAYSIZE(engine_scumm), engine_scumm },
-	{ ARRAYSIZE(engine_agi), engine_agi },
-	{ ARRAYSIZE(engine_touche), engine_touche },
-	{ ARRAYSIZE(engine_cruise), engine_cruise }
-};
-
-static void SelectorSetList(Int16 sel) {
-	ListType *listP;
-	FormPtr frmP = FrmGetActiveForm();
-
-	Boolean toBeDrawn = (items != NULL);
-	if (items)
-		MemPtrFree(items);
-
-	listP = (ListType *)FrmGetObjectPtr(frmP, FrmGetObjectIndex(frmP, EngineSupportedList));
-	items = (Char **)MemPtrNew(supported[sel].size * sizeof(Char *));
-
-	for (int i = 0; i < supported[sel].size; i++)
-		items[i] = (Char *)supported[sel].listP[i];
-
-	LstSetListChoices (listP, items, supported[sel].size);
-	LstSetTopItem(listP, 0);
-	LstSetSelection(listP, -1);
-
-	if (toBeDrawn) {
-		WinScreenLock(winLockCopy);
-		LstDrawList(listP);
-		WinScreenUnlock();
-	}
-}
-
-static void SelectorFormInit() {
-	ListType *listP;
-	FormPtr frmP = FrmGetActiveForm();
-
-	listP = (ListType *)FrmGetObjectPtr(frmP, FrmGetObjectIndex(frmP, EngineListList));
-	itemsText = (Char **)MemPtrNew(ENGINE_COUNT * sizeof(Char *));
-
-	for (int i = 0; i < ENGINE_COUNT; i++)
-		itemsText[i] = (Char *)engines[i].nameP;
-
-	LstSetListChoices (listP, itemsText, ENGINE_COUNT);
-	LstSetSelection(listP, 0);
-
-	SelectorSetList(0);
-
-	FrmDrawForm(frmP);
-}
-
-static void SelectorFormFree(bool quit) {
-	items = NULL;
-
-	if (!quit) {
-		ListType *listP = (ListType *)GetObjectPtr(EngineListList);
-		Int16 sel = LstGetSelection(listP);
-
-		FrmReturnToMain();
-		StartScummVM(sel);
-
-	} else {
-		FrmReturnToMain();
-
-		if (bDirectMode) {
-			// force exit if nothing selected
-			EventType event;
-			event.eType = keyDownEvent;
-			event.data.keyDown.chr = vchrLaunch;
-			event.data.keyDown.modifiers = commandKeyMask;
-			EvtAddUniqueEventToQueue(&event, 0, true);
-		}
-	}
-}
-
-Boolean SelectorFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			SelectorFormInit();
-			handled = true;
-			break;
-
-		case frmCloseEvent:
-			SelectorFormFree(true);
-			handled = true;
-			break;
-
-		case lstSelectEvent:
-			if (eventP->data.lstSelect.listID == EngineSupportedList)
-				LstSetSelection(eventP->data.lstSelect.pList, -1);
-			else
-				SelectorSetList(eventP->data.lstSelect.selection);
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case EngineOkButton:
-					SelectorFormFree(false);
-					break;
-
-				case EngineCancelButton:
-					SelectorFormFree(true);
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp
deleted file mode 100644
index b4c1e222d0..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-#include <PalmOS.h>
-
-#include "palmdefs.h"
-#include "start.h"
-#include "forms.h"
-#include "skin.h"
-#include "globals.h"
-
-static Int16 SkinsFormCompare(SkinInfoType *a, SkinInfoType *b, SortRecordInfoPtr, SortRecordInfoPtr, MemHandle) {
-	return StrCompare(a->nameP, b->nameP);
-}
-
-static void SkinsFormInit(Boolean bDraw) {
-	MemHandle skins = NULL;
-	SkinInfoType *skinsInfo;
-	UInt16 numSkins = 0;
-
-	FormPtr frmP;
-	ListType *listP;
-	MemHandle items = NULL;
-	ControlType *cck1P;
-	DmSearchStateType stateInfo;
-	UInt16 cardNo;
-	LocalID dbID;
-
-	Err errInfo;
-	Char nameP[32];
-
-	itemsText = NULL;
-
-	// parse and save skins
-	Err err = DmGetNextDatabaseByTypeCreator(true, &stateInfo, 'skin', appFileCreator, false, &cardNo, &dbID);
-	while (!err && dbID) {
-		errInfo = DmDatabaseInfo (cardNo, dbID, nameP, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-		if (!errInfo)
-		{
-			if (!skins)
-				skins = MemHandleNew(sizeof(SkinInfoType));
-			else
-				MemHandleResize(skins, MemHandleSize(skins) + sizeof(SkinInfoType));
-
-			skinsInfo = (SkinInfoType *)MemHandleLock(skins);
-			StrCopy(skinsInfo[numSkins].nameP, nameP);
-			skinsInfo[numSkins].cardNo = cardNo;
-			skinsInfo[numSkins].dbID = dbID;
-			MemHandleUnlock(skins);
-			numSkins++;
-		}
-		err = DmGetNextDatabaseByTypeCreator(false, &stateInfo, 'skin', appFileCreator, false, &cardNo, &dbID);
-	}
-
-	Int16 selected = -1;
-
-	cck1P = (ControlType *)GetObjectPtr(SkinsSoundClickCheckbox);
-	CtlSetValue(cck1P, gPrefs->soundClick);
-
-	listP = (ListType *)GetObjectPtr(SkinsSkinList);
-	skinsInfo = (SkinInfoType *)MemHandleLock(skins);
-	SysQSort(skinsInfo, numSkins, sizeof(SkinInfoType), (CmpFuncPtr)SkinsFormCompare, 0);
-
-	// create itemsText (TODO: create a custom draw function)
-	for (UInt16 index=0; index < numSkins; index++)
-	{
-		if (!items)
-			items = MemHandleNew(sizeof(Char *));
-		else
-			MemHandleResize(items, MemHandleSize(items) + sizeof(Char *));
-
-		itemsText = (Char **)MemHandleLock(items);
-		itemsText[index] = skinsInfo[index].nameP;
-		MemHandleUnlock(items);
-
-		if (	gPrefs->skin.cardNo == skinsInfo[index].cardNo &&
-				gPrefs->skin.dbID == skinsInfo[index].dbID &&
-				StrCompare(gPrefs->skin.nameP, skinsInfo[index].nameP) == 0)
-			selected = index;
-	}
-	// save globals and set list
-	itemsText = (Char **)MemHandleLock(items);
-	itemsList = (void *)skinsInfo;
-	itemsType = ITEM_TYPE_SKIN;
-
-	LstSetListChoices (listP, itemsText, numSkins);
-	LstSetSelection(listP, selected);
-
-	// bDraw = true -> draw whole from
-	// bDraw = false -> redraw list
-	if (bDraw) {
-		frmP = FrmGetActiveForm();
-		FrmDrawForm(frmP);
-	} else {
-		WinScreenLock(winLockCopy);
-		LstDrawList(listP);
-		WinScreenUnlock();
-//		LstSetSelection(listP, 0);
-	}
-}
-
-static void SkinsFormExit(Boolean bSave) {
-	MemHandle skins;
-	MemHandle items;
-	SkinInfoType *skinsInfo;
-
-	ListType *listP;
-	Int16 selected;
-
-	listP = (ListType *)GetObjectPtr(SkinsSkinList);
-	selected = LstGetSelection(listP);
-
-	if (bSave && selected == -1)	{	// may never occured...
-		FrmCustomAlert(FrmWarnAlert, "You didn't select a skin.", 0, 0);
-		return;
-	}
-
-	skinsInfo = (SkinInfoType *)itemsList;
-	skins = MemPtrRecoverHandle(skinsInfo);
-	items = MemPtrRecoverHandle(itemsText);
-
-	itemsText = NULL;
-	itemsList = NULL;
-	itemsType = ITEM_TYPE_UNKNOWN;
-
-	if (bSave) {
-		ControlType *cck1P;
-
-		StrCopy(gPrefs->skin.nameP, skinsInfo[selected].nameP);
-		gPrefs->skin.cardNo = skinsInfo[selected].cardNo;
-		gPrefs->skin.dbID =  skinsInfo[selected].dbID;
-
-/*		DmOpenRef skinDB = SknOpenSkin();
-		UInt32 depth = SknGetDepth(skinDB);
-		SknCloseSkin(skinDB);
-
-		if (depth != 8 && depth != 16) depth = 8;
-
-		if (depth == 16 && !OPTIONS_TST(kOptMode16Bit)) {
-			FrmCustomAlert(FrmInfoAlert, "You can only use 8bit skin on your device.", 0, 0);
-			gPrefs->skin.cardNo	= cardNo;
-			gPrefs->skin.dbID	= dbID;
-		}
-*/
-		cck1P = (ControlType *)GetObjectPtr(SkinsSoundClickCheckbox);
-		gPrefs->soundClick = CtlGetValue(cck1P);
-	}
-
-	FrmReturnToMain();
-
-	MemHandleUnlock(items);
-	MemHandleUnlock(skins);
-	MemHandleFree(items);
-	MemHandleFree(skins);
-
-	if (bSave)
-		SknApplySkin();
-}
-
-static void SkinsFormBeam() {
-	SkinInfoType *skinsInfo;
-
-	ListType *listP;
-	Int16 selected;
-	Err err;
-
-	listP = (ListType *)GetObjectPtr(SkinsSkinList);
-	selected = LstGetSelection(listP);
-
-	if (selected == -1)	{	// may never occured...
-		FrmCustomAlert(FrmWarnAlert, "You didn't select a skin.", 0, 0);
-		return;
-	}
-
-	skinsInfo = (SkinInfoType *)itemsList;
-	err = SendDatabase(0, skinsInfo[selected].dbID, "skin.pdb", "\nScummVM Skin");
-
-//	if (err)
-//		FrmCustomAlert(FrmErrorAlert, "Unable to beam this skin.",0,0);
-}
-
-static void SkinsFormDelete() {
-	MemHandle skins;
-	MemHandle items;
-	SkinInfoType *skinsInfo;
-
-	ListType *listP;
-	Int16 selected;
-
-	listP = (ListType *)GetObjectPtr(SkinsSkinList);
-	selected = LstGetSelection(listP);
-
-	if (selected == -1)	{	// may never occured...
-		FrmCustomAlert(FrmInfoAlert, "You didn't select a skin.", 0, 0);
-		return;
-	}
-
-	skinsInfo = (SkinInfoType *)itemsList;
-	skins = MemPtrRecoverHandle(skinsInfo);
-	items = MemPtrRecoverHandle(itemsText);
-
-	if (	gPrefs->skin.cardNo == skinsInfo[selected].cardNo &&
-			gPrefs->skin.dbID == skinsInfo[selected].dbID &&
-			StrCompare(gPrefs->skin.nameP, skinsInfo[selected].nameP) == 0) {
-			FrmCustomAlert(FrmInfoAlert, "You cannot delete the active skin.",0,0);
-			return;
-
-	} else {
-		Err err = DmDeleteDatabase(0, skinsInfo[selected].dbID);
-		if (!err) {
-
-			itemsText = NULL;
-			itemsList = NULL;
-			itemsType = ITEM_TYPE_UNKNOWN;
-
-			MemHandleUnlock(items);
-			MemHandleUnlock(skins);
-			MemHandleFree(items);
-			MemHandleFree(skins);
-
-			SkinsFormInit(false);
-		} else {
-			FrmCustomAlert(FrmErrorAlert, "Skin deletion failed.",0,0);
-		}
-	}
-
-}
-Boolean SkinsFormHandleEvent(EventPtr eventP) {
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-
-		case frmOpenEvent:
-			SkinsFormInit(true);
-			handled = true;
-			break;
-
-		case frmCloseEvent:
-			SkinsFormExit(false);
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case SkinsOKButton:
-					SkinsFormExit(true);
-					break;
-
-				case SkinsCancelButton:
-					SkinsFormExit(false);
-					break;
-
-				case SkinsBeamButton:
-					SkinsFormBeam();
-					break;
-
-				case SkinsDeleteButton:
-					SkinsFormDelete();
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formUtil.cpp b/backends/platform/PalmOS/Src/launcher/forms/formUtil.cpp
deleted file mode 100644
index 6d1d55e6e2..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formUtil.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <PalmOS.h>
-#include <TxtGlue.h>
-
-#include "forms.h"
-
-Char **itemsText = NULL;
-void  *itemsList = NULL;
-Char   itemsType = ITEM_TYPE_UNKNOWN;
-
-void FrmReturnToMain(UInt16 updateCode) {
-	// if there is a form loaded, prevent crash on OS5
-	if (FrmGetFirstForm()) {
-		FrmUpdateForm(MainForm, updateCode);
-		FrmReturnToForm(MainForm);
-	}
-}
-
-void FldTrimText(FieldPtr fldP) {
-	MemHandle tmpH;
-	Char *tmpP;
-
-	tmpH = FldGetTextHandle(fldP);
-	FldSetTextHandle(fldP, NULL);
-	tmpP = (Char *)MemHandleLock(tmpH);
-	TxtGlueStripSpaces(tmpP, true, true);
-	MemHandleUnlock(tmpH);
-	FldSetTextHandle(fldP, tmpH);
-}
-
-/***********************************************************************
- *
- * FUNCTION:    GetObjectPtr
- *
- * DESCRIPTION: This routine returns a pointer to an object in the current
- *              form.
- *
- * PARAMETERS:  formId - id of the form to display
- *
- * RETURNED:    void *
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-void * GetObjectPtr(UInt16 objectID) {
-	FormPtr frmP;
-
-	frmP = FrmGetActiveForm();
-	return FrmGetObjectPtr(frmP, FrmGetObjectIndex(frmP, objectID));
-}
-
-void FrmList(EventPtr eventP, UInt16 objectID) {
-	ListType *listP;
-	UInt16 listItem;
-
-	listP = (ListType *)GetObjectPtr(objectID);
-	listItem = LstPopupList(listP);
-	CtlSetLabel(eventP->data.ctlSelect.pControl, LstGetSelectionText(listP, LstGetSelection(listP)));
-}
-
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formUtil.h b/backends/platform/PalmOS/Src/launcher/forms/formUtil.h
deleted file mode 100644
index e9b87bc49f..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formUtil.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __FORMUTIL_H__
-#define __FORMUTIL_H__
-
-#define frmRedrawUpdateMS		(frmRedrawUpdateCode + 1)
-#define frmRedrawUpdateMSImport	(frmRedrawUpdateCode + 2)
-
-#define NO_ENGINE	-1
-
-// form list draw
-#define	ITEM_TYPE_UNKNOWN	'U'
-#define ITEM_TYPE_CARD		'C'
-#define ITEM_TYPE_SKIN		'S'
-
-extern Char **itemsText;
-extern void  *itemsList;
-extern Char   itemsType;
-
-void FrmReturnToMain(UInt16 updateCode = frmRedrawUpdateMS);
-void * GetObjectPtr(UInt16 objectID);
-void FldTrimText(FieldPtr fldP);
-void FrmList(EventPtr eventP, UInt16 objectID);
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp b/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp
deleted file mode 100644
index 3f4ab1b28f..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <PalmOS.h>
-
-#include "start.h"
-#include "formTabs.h"
-#include "forms.h"
-
-#include "base/version.h"
-#include "globals.h"
-#include "init_palmos.h"
-
-/***********************************************************************
- *
- * FUNCTION:    MiscOptionsFormSave
- * FUNCTION:    MiscOptionsFormInit
- * FUNCTION:    MiscOptionsFormHandleEvent
- *
- * DESCRIPTION: Misc. Options form functions
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static TabType *myTabP;
-static UInt16 lastTab = 0;
-
-static UInt32 GetStackSize() {
-	MemPtr startPP, endPP;
-	SysGetStackInfo(&startPP, &endPP);
-
-	return ((Char *)endPP - (Char *)startPP) / 1024L;
-}
-
-static void VersionTabDraw() {
-	WinDrawChars(gScummVMVersion, StrLen(gScummVMVersion), 47, 12 + 30);
-	WinDrawChars(gScummVMBuildDate, StrLen(gScummVMBuildDate), 47, 24 + 30);
-}
-
-static void SystemTabDraw() {
-	Coord x;
-	UInt32 dm, sm, df, sf, stack;
-	Char num[10];
-
-	PalmGetMemory(&sm, &dm, &sf, 0);
-	stack = GetStackSize();
-	df = gVars->startupMemory;
-
-	WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground));
-	FntSetFont(stdFont);
-
-	StrIToA(num, dm);
-	x = 147 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 12 + 30);
-
-	StrIToA(num, sm);
-	x = 147 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 24 + 30);
-
-	StrIToA(num, stack);
-	x = 147 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 36 + 30);
-
-	StrIToA(num, df);
-	x = 107 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 12 + 30);
-
-	StrIToA(num, sf);
-	x = 107 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 24 + 30);
-
-	StrCopy(num,"-");
-	x = 107 - FntCharsWidth(num, StrLen(num)) + 5;
-	WinDrawChars(num, StrLen(num), x, 36 + 30);
-}
-
-static void InfoFormSave() {
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-}
-
-static void AboutTabDraw() {
-	MemHandle hTemp;
-	BitmapPtr bmpTemp;
-
-	hTemp = DmGetResource (bitmapRsc, 1200);
-	if (hTemp) {
-		bmpTemp = (BitmapType *)MemHandleLock(hTemp);
-		WinDrawBitmap(bmpTemp,3,44);
-		MemPtrUnlock(bmpTemp);
-		DmReleaseResource(hTemp);
-	}
-}
-
-static void InfoFormInit() {
-	TabType *tabP;
-	FormType *frmP = FrmGetActiveForm();
-
-	tabP = TabNewTabs(3);
-	TabAddContent(&frmP, tabP, "About", TabInfoAboutForm, AboutTabDraw);
-	TabAddContent(&frmP, tabP, "Version", TabInfoVersionForm, VersionTabDraw);
-	TabAddContent(&frmP, tabP, "Memory", TabInfoSystemForm, SystemTabDraw);
-
-	lastTab = 0;
-	FrmDrawForm(frmP);
-	TabSetActive(frmP, tabP, lastTab);
-
-	myTabP = tabP;
-}
-
-Boolean InfoFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			InfoFormInit();
-			handled = true;
-			break;
-
-		case frmCloseEvent:
-			InfoFormSave();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case (InfoForm + 1) :
-				case (InfoForm + 2) :
-				case (InfoForm + 3) :
-					lastTab = (eventP->data.ctlSelect.controlID - InfoForm - 1);
-					TabSetActive(frmP, myTabP, lastTab);
-					break;
-
-				case InfoOKButton:
-					InfoFormSave();
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
deleted file mode 100644
index ca2e18ee6d..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "StarterRsc.h"
-#include "start.h"
-#include "skin.h"
-#include "games.h"
-#include "globals.h"
-
-#include "base/version.h"
-
-#include "formEditGame.h"
-#include "formUtil.h"
-
-static UInt16 sknLastOn = skinButtonNone;
-
-static Err BeamMe() {
-	UInt16 cardNo;
-	LocalID dbID;
-	Err err;
-
-	err = SysCurAppDatabase(&cardNo, &dbID);
-	if (dbID)
-		err = SendDatabase(0, dbID, "ScummVM.prc", "\nPlay your favorite LucasArts games");
-	else
-		err = DmGetLastErr();
-
-	return err;
-}
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormInit
- *
- * DESCRIPTION: This routine initializes the MainForm form.
- *
- * PARAMETERS:  frm - pointer to the MainForm form.
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static void MainFormInit()
-{
-	SknApplySkin();
-}
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormDoCommand
- *
- * DESCRIPTION: This routine performs the menu command specified.
- *
- * PARAMETERS:  command  - menu item id
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-static Boolean MainFormDoCommand(UInt16 command)
-{
-	Boolean handled = false;
-
-	switch (command) {
-		case MainGamesMemoryCard:
-			FrmPopupForm(CardSlotForm);
-			handled = true;
-			break;
-
-		case MainGamesNew:
-			gFormEditMode = edtModeAdd;
-			FrmPopupForm(GameEditForm);
-			handled = true;
-			break;
-
-		case MainGamesEdit:
-			gFormEditMode = edtModeEdit;
-			FrmPopupForm(GameEditForm);
-			handled = true;
-			break;
-
-		case MainGamesDelete:
-			EditGameFormDelete(true);
-			handled = true;
-			break;
-
-		case MainOptionsBeam:
-			BeamMe();
-			//if (BeamMe())
-				//FrmCustomAlert(FrmErrorAlert,"Unable to beam ScummVM for PalmOS.",0,0);
-			handled = true;
-			break;
-
-		case MainOptionsAbout:
-			FrmPopupForm(InfoForm);
-			handled = true;
-			break;
-
-		case MainGamesMusicSound:
-			FrmPopupForm(MusicForm);
-			handled = true;
-			break;
-
-		case MainOptionsSkins:
-			FrmPopupForm(SkinsForm);
-			handled = true;
-			break;
-
-		case MainOptionsMisc:
-			FrmPopupForm(MiscForm);
-			handled = true;
-			break;
-		}
-
-	MenuEraseStatus(0);
-	return handled;
-}
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormHandleEvent
- *
- * DESCRIPTION: This routine is the event handler for the
- *              "MainForm" of this application.
- *
- * PARAMETERS:  eventP  - a pointer to an EventType structure
- *
- * RETURNED:    true if the event has handle and should not be passed
- *              to a higher level handler.
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-static Boolean PenDownRepeat() {
-	Coord x,y;
-	Boolean penDown, handled = false;
-	EvtGetPen(&x, &y, &penDown);
-
-	if (penDown && sknLastOn) {
-		RectangleType r;
-		DmOpenRef skinDBP;
-
-		skinDBP = SknOpenSkin();
-		SknGetObjectBounds(skinDBP, sknLastOn, &r);
-
-		if (RctPtInRectangle(x*2, y*2, &r)) {
-			if (SknGetState(skinDBP, sknLastOn) != sknStateSelected) {
-				SknSetState(skinDBP, sknLastOn, sknStateSelected);
-				SknShowObject(skinDBP, sknLastOn);
-			}
-
-			switch (sknLastOn) {
-				case skinSliderUpArrow:
-				case skinSliderDownArrow:
-					handled = SknProcessArrowAction(sknLastOn);
-					break;
-			}
-
-		} else {
-			if (SknGetState(skinDBP, sknLastOn) != sknStateNormal) {
-				SknSetState(skinDBP, sknLastOn, sknStateNormal);
-				SknShowObject(skinDBP, sknLastOn);
-			}
-		}
-
-		SknCloseSkin(skinDBP);
-	}
-
-	return handled;
-}
-
-
-Boolean MainFormHandleEvent(EventPtr eventP)
-{
-	Boolean handled = false;
-	FormPtr frmP;
-	Coord x,y;
-	DmOpenRef skinDBP;
-
-	switch (eventP->eType) {
-		case frmUpdateEvent:
-		{
-			RectangleType r;
-			UInt16 idx;
-			IndexedColorType bgColor = UIColorGetTableEntryIndex(UIFormFill);
-			frmP = FrmGetFormPtr(MainForm);
-
-			if (gPrefs->card.volRefNum != vfsInvalidVolRef)
-				idx = FrmGetObjectIndex (frmP, MainMSBitMap);
-			else
-				idx = FrmGetObjectIndex (frmP, MainMSNoneBitMap);
-
-			WinSetDrawMode(winPaint);
-			WinSetBackColor(bgColor);
-			FrmGetObjectBounds(frmP, idx, &r);
-			WinEraseRectangle(&r, 0);
-			FrmShowObject(frmP, idx);
-
-			if (eventP->data.frmUpdate.updateCode == frmRedrawUpdateMSImport) {
-				GamImportDatabase();
-				SknUpdateList();
-			}
-			handled = true;
-			break;
-		}
-		case menuEvent:
-			handled = MainFormDoCommand(eventP->data.menu.itemID);
-			break;
-
-		case frmOpenEvent:
-			MainFormInit();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case MainCardsButton:
-					//gPrefs->card.volRefNum = parseCards(true);
-					FrmPopupForm(CardSlotForm);
-					break;
-
-				case MainAboutButton:
-					FrmPopupForm(InfoForm);
-					break;
-
-//				case MainListTypeSelTrigger:
-//					FrmList(eventP, MainListTypeList);
-//					break;
-			}
-			handled = true;
-			break;
-
-		case penUpEvent:
-			x = eventP->screenX;
-			y = eventP->screenY;
-			lastIndex = dmMaxRecordIndex;	// enable select/unselect list item
-
-			if (sknLastOn != skinButtonNone) {
-				RectangleType r;
-				skinDBP = SknOpenSkin();
-				SknGetObjectBounds(skinDBP, sknLastOn, &r);
-				SknSetState(skinDBP, sknLastOn, sknStateNormal);
-				SknShowObject(skinDBP, sknLastOn);
-				SknCloseSkin(skinDBP);
-
-				if (RctPtInRectangle(x*2, y*2, &r)) {
-					switch (sknLastOn) {
-						case skinButtonGameAdd:
-							gFormEditMode = edtModeAdd;
-							FrmPopupForm(GameEditForm);
-							handled = true;
-							break;
-
-						case skinButtonGameAudio:
-							FrmPopupForm(MusicForm);
-							handled = true;
-							break;
-
-						case skinButtonGameEdit:
-						case skinButtonGameParams:
-							gFormEditMode = edtModeParams;
-							FrmPopupForm(GameEditForm);
-							handled = true;
-							break;
-
-						case skinButtonGameStart:
-							if (gPrefs->card.volRefNum == vfsInvalidVolRef)
-								FrmCustomAlert(FrmWarnAlert,"Please select/insert a memory card.", 0, 0);
-							else if (GamGetSelected() != dmMaxRecordIndex)
-								StartScummVM();
-							else
-								FrmPopupForm(EngineForm);
-							handled = true;
-							break;
-
-						case skinButtonGameDelete:
-							EditGameFormDelete(true);
-							break;
-					}
-				}
-				sknLastOn = skinButtonNone;
-			}
-			break;
-
-		case penDownEvent:
-		case penMoveEvent:
-			if (sknLastOn == skinButtonNone) {
-				x = eventP->screenX;
-				y = eventP->screenY;
-				skinDBP = SknOpenSkin();
-
-				switch (sknLastOn = SknCheckClick(skinDBP, x,y)) {
-					case skinButtonNone:
-						break;
-					case skinSliderUpArrow:
-					case skinSliderDownArrow:
-					case skinButtonGameAdd:
-					case skinButtonGameEdit:
-					case skinButtonGameParams:
-					case skinButtonGameStart:
-					case skinButtonGameDelete:
-					case skinButtonGameAudio:
-						SknSetState(skinDBP, sknLastOn, sknStateSelected);
-						SknShowObject(skinDBP, sknLastOn);
-						if (gPrefs->soundClick)
-							SndPlaySystemSound(sndClick);
-						handled = true;
-						break;
-					default:
-						FrmCustomAlert(FrmWarnAlert,"Unknown button !",0,0);
-				}
-				SknCloseSkin(skinDBP);
-				SknSelect(x, y);
-			}
-			break;
-
-		case keyDownEvent:
-			if (	(eventP->data.keyDown.chr >= 'a' && eventP->data.keyDown.chr <= 'z') ||
-					(eventP->data.keyDown.chr >= 'A' && eventP->data.keyDown.chr <= 'Z')) {
-				if (GamJumpTo(eventP->data.keyDown.chr)) {
-					SknUpdateList();
-					handled = true;
-				}
-			}
-			break;
-
-		default:
-			handled = PenDownRepeat();
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
deleted file mode 100644
index 58eaa5b5fc..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "start.h"
-#include "formTabs.h"
-#include "forms.h"
-#include "games.h"
-
-#include "globals.h"
-
-static TabType *myTabP;
-static UInt16 lastTab = 0;
-
-static GameInfoType *gameInfoP = NULL;
-
-// Music
-static Boolean MusicTabSave() {
-	ControlType *cck1P, *cck2P;
-	ListType *list1P, *list2P, *list3P;
-	FieldType *fld1P;
-	UInt16 tempo;
-	FormPtr frmP;
-
-	frmP = FrmGetActiveForm();
-
-	cck1P = (ControlType *)GetObjectPtr(TabMusicMusicCheckbox);
-	cck2P = (ControlType *)GetObjectPtr(TabMusicMultiMidiCheckbox);
-
-	list1P = (ListType *)GetObjectPtr(TabMusicDriverList);
-	list2P = (ListType *)GetObjectPtr(TabMusicRateList);
-	list3P = (ListType *)GetObjectPtr(TabMusicQualityList);
-
-	fld1P = (FieldType *)GetObjectPtr(TabMusicTempoField);
-
-	tempo = StrAToI(FldGetTextPtr(fld1P));
-	if (tempo < 50 || tempo > 200) {
-		TabSetActive(frmP, myTabP, 0);
-		FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabMusicTempoField));
-		FrmCustomAlert(FrmErrorAlert, "Invalid tempo value (50...200)", 0, 0);
-		return false;
-	}
-
-	gameInfoP->musicInfo.sound.music = CtlGetValue(cck1P);
-	gameInfoP->musicInfo.sound.multiMidi = CtlGetValue(cck2P);
-
-	gameInfoP->musicInfo.sound.drvMusic = LstGetSelection(list1P);
-	gameInfoP->musicInfo.sound.rate = LstGetSelection(list2P);
-	gameInfoP->fmQuality = LstGetSelection(list3P);
-	gameInfoP->musicInfo.sound.tempo = tempo;
-
-	return true;
-}
-
-static void MusicTabInit() {
-	ControlType *cck1P, *cck2P;
-	ListType *list1P, *list2P, *list3P;
-	FieldType *fld1P;
-	MemHandle tempoH;
-	Char *tempoP;
-
-	cck1P = (ControlType *)GetObjectPtr(TabMusicMusicCheckbox);
-	cck2P = (ControlType *)GetObjectPtr(TabMusicMultiMidiCheckbox);
-
-	list1P = (ListType *)GetObjectPtr(TabMusicDriverList);
-	list2P = (ListType *)GetObjectPtr(TabMusicRateList);
-	list3P = (ListType *)GetObjectPtr(TabMusicQualityList);
-
-	fld1P = (FieldType *)GetObjectPtr(TabMusicTempoField);
-
-	CtlSetValue(cck1P, gameInfoP->musicInfo.sound.music);
-	CtlSetValue(cck2P, gameInfoP->musicInfo.sound.multiMidi);
-
-	if (gameInfoP->musicInfo.sound.drvMusic > 5)
-		gameInfoP->musicInfo.sound.drvMusic = 0;
-
-
-	LstSetSelection(list1P, gameInfoP->musicInfo.sound.drvMusic);
-	LstSetTopItem(list1P, gameInfoP->musicInfo.sound.drvMusic);
-	CtlSetLabel((ControlType *)GetObjectPtr(TabMusicDriverPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-
-	LstSetSelection(list2P, gameInfoP->musicInfo.sound.rate);
-	LstSetTopItem(list2P, gameInfoP->musicInfo.sound.rate);
-	CtlSetLabel((ControlType *)GetObjectPtr(TabMusicRatePopTrigger), LstGetSelectionText(list2P, LstGetSelection(list2P)));
-
-	LstSetSelection(list3P, gameInfoP->fmQuality);
-	CtlSetLabel((ControlType *)GetObjectPtr(TabMusicQualityPopTrigger), LstGetSelectionText(list3P, LstGetSelection(list3P)));
-
-	tempoH = MemHandleNew(FldGetMaxChars(fld1P)+1);
-	tempoP = (Char *)MemHandleLock(tempoH);
-	StrIToA(tempoP, gameInfoP->musicInfo.sound.tempo);
-	MemHandleUnlock(tempoH);
-	FldSetTextHandle(fld1P, tempoH);
-}
-
-// Audio CD
-static Boolean AudioCDTabSave() {
-	ControlType *cck3P;
-	FieldType *fld2P, *fld3P;
-	ListType *list1P, *list2P;
-	UInt16 firstTrack;
-	FormPtr frmP;
-
-	frmP = FrmGetActiveForm();
-
-	cck3P = (ControlType *)GetObjectPtr(TabAudioCDMP3Checkbox);
-	fld2P = (FieldType *)GetObjectPtr(TabAudioCDLengthSecsField);
-	fld3P = (FieldType *)GetObjectPtr(TabAudioCDFirstTrackField);
-	list1P = (ListType *)GetObjectPtr(TabAudioCDDriverList);
-	list2P = (ListType *)GetObjectPtr(TabAudioCDFormatList);
-
-	firstTrack = StrAToI(FldGetTextPtr(fld3P));
-	if (firstTrack < 1 || firstTrack > 999) {
-		TabSetActive(frmP, myTabP, 2);
-		FrmSetFocus(frmP, FrmGetObjectIndex(frmP, TabAudioCDFirstTrackField));
-		FrmCustomAlert(FrmErrorAlert, "Invalid track value (1...999)", 0, 0);
-		return false;
-	}
-
-	gameInfoP->musicInfo.sound.CD = CtlGetValue(cck3P);
-
-	gameInfoP->musicInfo.sound.drvCD = LstGetSelection(list1P);
-	gameInfoP->musicInfo.sound.frtCD = LstGetSelection(list2P);
-
-	gameInfoP->musicInfo.sound.defaultTrackLength = StrAToI(FldGetTextPtr(fld2P));
-	gameInfoP->musicInfo.sound.firstTrack = firstTrack;
-
-	return true;
-}
-
-static void AudioCDTabInit() {
-	ControlType *cck3P;
-	FieldType *fld2P, *fld3P;
-	ListType *list1P, *list2P;
-	MemHandle lengthH, firstTrackH;
-	Char *lengthP, *firstTrackP;
-
-	cck3P = (ControlType *)GetObjectPtr(TabAudioCDMP3Checkbox);
-	fld2P = (FieldType *)GetObjectPtr(TabAudioCDLengthSecsField);
-	fld3P = (FieldType *)GetObjectPtr(TabAudioCDFirstTrackField);
-	list1P = (ListType *)GetObjectPtr(TabAudioCDDriverList);
-	list2P = (ListType *)GetObjectPtr(TabAudioCDFormatList);
-
-	LstSetSelection(list1P, gameInfoP->musicInfo.sound.drvCD);
-	CtlSetLabel((ControlType *)GetObjectPtr(TabAudioCDDriverPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-
-	LstSetSelection(list2P, gameInfoP->musicInfo.sound.frtCD);
-	CtlSetLabel((ControlType *)GetObjectPtr(TabAudioCDFormatPopTrigger), LstGetSelectionText(list2P, LstGetSelection(list2P)));
-
-	CtlSetValue(cck3P, gameInfoP->musicInfo.sound.CD);
-
-	lengthH = MemHandleNew(FldGetMaxChars(fld2P)+1);
-	lengthP = (Char *)MemHandleLock(lengthH);
-	StrIToA(lengthP, gameInfoP->musicInfo.sound.defaultTrackLength);
-	MemHandleUnlock(lengthH);
-	FldSetTextHandle(fld2P, lengthH);
-
-	firstTrackH = MemHandleNew(FldGetMaxChars(fld3P)+1);
-	firstTrackP = (Char *)MemHandleLock(firstTrackH);
-	StrIToA(firstTrackP, gameInfoP->musicInfo.sound.firstTrack);
-	MemHandleUnlock(firstTrackH);
-	FldSetTextHandle(fld3P, firstTrackH);
-}
-
-// Volume
-static void VolumeTabSave() {
-	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P;
-
-	slid1P = (SliderControlType *)GetObjectPtr(TabVolumePalmSliderControl);
-	slid2P = (SliderControlType *)GetObjectPtr(TabVolumeMusicSliderControl);
-	slid3P = (SliderControlType *)GetObjectPtr(TabVolumeSfxSliderControl);
-	slid4P = (SliderControlType *)GetObjectPtr(TabVolumeSpeechSliderControl);
-	slid5P = (SliderControlType *)GetObjectPtr(TabVolumeAudioCDSliderControl);
-
-	CtlGetSliderValues ((ControlType *)slid1P, 0, 0, 0, &gameInfoP->musicInfo.volume.palm);
-	CtlGetSliderValues ((ControlType *)slid2P, 0, 0, 0, &gameInfoP->musicInfo.volume.music);
-	CtlGetSliderValues ((ControlType *)slid3P, 0, 0, 0, &gameInfoP->musicInfo.volume.sfx);
-	CtlGetSliderValues ((ControlType *)slid4P, 0, 0, 0, &gameInfoP->musicInfo.volume.speech);
-	CtlGetSliderValues ((ControlType *)slid5P, 0, 0, 0, &gameInfoP->musicInfo.volume.audiocd);
-}
-
-static void VolumeTabInit() {
-	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P;
-	UInt16 value;
-
-	slid1P = (SliderControlType *)GetObjectPtr(TabVolumePalmSliderControl);
-	slid2P = (SliderControlType *)GetObjectPtr(TabVolumeMusicSliderControl);
-	slid3P = (SliderControlType *)GetObjectPtr(TabVolumeSfxSliderControl);
-	slid4P = (SliderControlType *)GetObjectPtr(TabVolumeSpeechSliderControl);
-	slid5P = (SliderControlType *)GetObjectPtr(TabVolumeAudioCDSliderControl);
-
-	value = gameInfoP->musicInfo.volume.palm;
-	CtlSetSliderValues ((ControlType *)slid1P, 0, 0, 0, &value);
-	value = gameInfoP->musicInfo.volume.music;
-	CtlSetSliderValues ((ControlType *)slid2P, 0, 0, 0, &value);
-	value = gameInfoP->musicInfo.volume.sfx;
-	CtlSetSliderValues ((ControlType *)slid3P, 0, 0, 0, &value);
-	value = gameInfoP->musicInfo.volume.speech;
-	CtlSetSliderValues ((ControlType *)slid4P, 0, 0, 0, &value);
-	value = gameInfoP->musicInfo.volume.audiocd;
-	CtlSetSliderValues ((ControlType *)slid5P, 0, 0, 0, &value);
-}
-
-static void MusicFormSave(UInt16 index) {
-	if (index != dmMaxRecordIndex) {
-		MemHandle recordH;
-		GameInfoType *ogameInfoP;
-
-		if (!MusicTabSave()) return;
-		if (!AudioCDTabSave()) return;
-		VolumeTabSave();
-
-		recordH = DmGetRecord(gameDB, index);
-		ogameInfoP = (GameInfoType *)MemHandleLock(recordH);
-		DmWrite(ogameInfoP, 0, gameInfoP, sizeof(GameInfoType));
-		MemHandleUnlock(recordH);
-		DmReleaseRecord (gameDB, index, 0);
-	}
-
-	MemPtrFree(gameInfoP);
-	gameInfoP = NULL;
-
-	TabDeleteTabs(myTabP);
-	FrmReturnToMain();
-}
-static void MusicFormInit(UInt16 index) {
-	TabType *tabP;
-	FormType *frmP = FrmGetActiveForm();
-
-	if (index != dmMaxRecordIndex) {
-		MemHandle recordH = NULL;
-		GameInfoType *ogameInfoP;
-
-		recordH = DmQueryRecord(gameDB, index);
-		ogameInfoP = (GameInfoType *)MemHandleLock(recordH);
-
-		if (!ogameInfoP) {
-			FrmCustomAlert(FrmErrorAlert, "An error occured.",0,0);
-			return;
-		}
-
-		gameInfoP = (GameInfoType *)MemPtrNew(sizeof(GameInfoType));
-		MemMove(gameInfoP, ogameInfoP, sizeof(GameInfoType));
-		MemHandleUnlock(recordH);
-
-	} else {
-		FrmCustomAlert(FrmWarnAlert, "Select an entry first.",0,0);
-		FrmReturnToMain();
-		return;
-	}
-
-	tabP = TabNewTabs(3);
-	TabAddContent(&frmP, tabP, "Sound", TabMusicForm);
-	TabAddContent(&frmP, tabP, "Volume", TabVolumeForm);
-	TabAddContent(&frmP, tabP, "Audio CD", TabAudioCDForm);
-
-	MusicTabInit();
-	AudioCDTabInit();
-	VolumeTabInit();
-
-	FrmDrawForm(frmP);
-	TabSetActive(frmP, tabP, lastTab);
-
-	myTabP = tabP;
-}
-
-Boolean MusicFormHandleEvent(EventPtr eventP) {
-	FormPtr frmP = FrmGetActiveForm();
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			MusicFormInit(GamGetSelected());
-			handled = true;
-			break;
-
-		case frmCloseEvent:
-			MusicFormSave(dmMaxRecordIndex);
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case (MusicForm + 1) :
-				case (MusicForm + 2) :
-				case (MusicForm + 3) :
-					lastTab = (eventP->data.ctlSelect.controlID - MusicForm - 1);
-					TabSetActive(frmP, myTabP, lastTab);
-					break;
-
-				case TabMusicDriverPopTrigger:
-					FrmList(eventP, TabMusicDriverList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabMusicDriverList));
-
-					if (!OPTIONS_TST(kOptDeviceZodiac) && !OPTIONS_TST(kOptSonyPa1LibAPI)) {
-						ListType *list1P = (ListType *)GetObjectPtr(TabMusicDriverList);
-
-						if (LstGetSelection(list1P) == 4) {
-							FrmCustomAlert(FrmInfoAlert, "There is no built-in MIDI support on your device.", 0, 0);
-							LstSetSelection(list1P, 0);
-							CtlSetLabel((ControlType *)GetObjectPtr(TabMusicDriverPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-						}
-					}
-					break;
-
-				case TabMusicQualityPopTrigger:
-					FrmList(eventP, TabMusicQualityList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabMusicQualityList));
-					break;
-
-				case TabMusicRatePopTrigger:
-					FrmList(eventP, TabMusicRateList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabMusicRateList));
-
-					if (!OPTIONS_TST(kOptPalmSoundAPI)) {
-						ListType *list1P = (ListType *)GetObjectPtr(TabMusicRateList);
-
-						if (LstGetSelection(list1P) != 0) {
-							FrmCustomAlert(FrmInfoAlert, "You cannot use this rate on your device.", 0, 0);
-							LstSetSelection(list1P, 0);
-							CtlSetLabel((ControlType *)GetObjectPtr(TabMusicRatePopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-						}
-					}
-					break;
-
-				case TabAudioCDFormatPopTrigger:
-					FrmList(eventP, TabAudioCDFormatList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabAudioCDFormatList));
-
-					if (LstGetSelection((ListPtr)GetObjectPtr(TabAudioCDDriverList)) == 1) {
-						ListType *list1P = (ListType *)GetObjectPtr(TabAudioCDFormatList);
-						LstSetSelection(list1P, 0);
-						CtlSetLabel((ControlType *)GetObjectPtr(TabAudioCDFormatPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-					}
-					break;
-
-				case TabAudioCDDriverPopTrigger:
-					FrmList(eventP, TabAudioCDDriverList);
-					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabAudioCDDriverList));
-
-					if (LstGetSelection((ListPtr)GetObjectPtr(TabAudioCDDriverList)) == 1) {
-						ListType *list1P = (ListType *)GetObjectPtr(TabAudioCDFormatList);
-						LstSetSelection(list1P, 0);
-						CtlSetLabel((ControlType *)GetObjectPtr(TabAudioCDFormatPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-					}
-					break;
-
-				case MusicOKButton:
-					MusicFormSave(GamGetSelected());
-					break;
-
-				case MusicCancelButton:
-					MusicFormSave(dmMaxRecordIndex);
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/forms.h b/backends/platform/PalmOS/Src/launcher/forms/forms.h
deleted file mode 100644
index ca0089d8c1..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/forms.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __FORMS_H__
-#define __FORMS_H__
-
-#include "StarterRsc.h"
-#include "formUtil.h"
-
-#include "formEditGame.h"
-#include "formCards.h"
-
-
-#define HANDLER(x)	Boolean  x##FormHandleEvent(EventPtr eventP);
-
-HANDLER(Main)
-HANDLER(EditGame)
-HANDLER(SystemInfo)
-HANDLER(Misc)
-HANDLER(CardSlot)
-HANDLER(Skins)
-HANDLER(Music)
-HANDLER(Info)
-HANDLER(Selector)
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp b/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp
deleted file mode 100644
index d3f18e39d7..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-#include <PalmOS.h>
-#include <CtlGlue.h>
-#include <FrmGlue.h>
-#include <LstGlue.h>
-
-#include "globals.h"
-#include "formTabs.h"
-
-TabType *TabNewTabs(UInt16 cnt) {
-	TabType *newP = new TabType;
-
-	newP->count = 0;
-	newP->width = 0;
-	newP->tabs = new TabDataType[cnt];
-
-	return newP;
-}
-
-void TabMoveUpObject(FormType *frmP, UInt16 objID, Coord amount) {
-	Coord x, y;
-	FrmGetObjectPosition(frmP, FrmGetObjectIndex(frmP, objID), &x, &y);
-	FrmSetObjectPosition(frmP, FrmGetObjectIndex(frmP, objID), x, y - amount);
-}
-
-void TabDeleteTabs(TabType *tabP) {
-	UInt16 cnt, num;
-	num = MemPtrSize(tabP->tabs) / sizeof(TabDataType);
-
-	for (cnt = 0; cnt < num; cnt++)
-		FrmDeleteForm(tabP->tabs[cnt].srcP);
-
-	delete tabP->tabs;
-	delete tabP;
-}
-
-Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc) {
-	FormType *srcP;
-	UInt16 cnt;
-	void *objP, **dstP;
-	UInt16 objNum;
-	Coord x, y, w, h;
-	UInt16 id;
-	RectangleType r;
-
-	dstP = (void **)frmP;
-	srcP = FrmInitForm(rscID);
-
-	objNum = FrmGetNumberOfObjects(srcP);
-
-	// save tab data
-
-	// it's required to keep to source forms active
-	// while the tab form is not close for list data ptr (items text)
-	// TODO : fix this !
-	tabP->tabs[tabP->count].srcP	= srcP;
-	tabP->tabs[tabP->count].first	= FrmGetObjectId(srcP, 0);
-	tabP->tabs[tabP->count].last	= FrmGetObjectId(srcP, objNum - 1);
-	tabP->tabs[tabP->count].drawFunc= drawFunc;
-	tabP->count++;
-	tabP->active = tabP->count;
-
-	// create tab
-	FntSetFont(stdFont);
-	x = 4 + tabP->width;
-	y = 16;
-	w = FntCharsWidth(nameP, StrLen(nameP)) + 6;
-	h = 12;
-	ControlType *addP = CtlNewControl(dstP, (FrmGetFormId(*frmP) + tabP->count), buttonCtl, nameP, x, y, w, h, stdFont, 0, true);
-	CtlGlueSetFrameStyle(addP, noButtonFrame);
-	tabP->width += w + 3;
-
-	// create tab content
-	for (cnt = 0; cnt < objNum; cnt++) {
-		objP = FrmGetObjectPtr(srcP, cnt);
-		id = FrmGetObjectId(srcP, cnt);
-		FrmGetObjectBounds(srcP, cnt, &r);
-		x = r.topLeft.x - 2;
-		y = r.topLeft.y + 30;
-		w = r.extent.x;
-		h = r.extent.y;
-
-		FrmSetObjectPosition(srcP, cnt, x, y);
-
-		switch (FrmGetObjectType(srcP, cnt)) {
-			case frmListObj: {
-				// HOWTO : to auto link the list to a popup trigger the listID must be popupID + 1 if popup id
-				// desn't exist the triggerID will be 0 and the list will be shown, but take care to not define
-				// ListID - 1 object if you want to show the list.
-				ListType *newP;
-				Char **itemsP = LstGlueGetItemsText((ListType *)objP);
-				FontID font = LstGlueGetFont((ListType *)objP);
-				UInt16 visible = LstGetVisibleItems((ListType *)objP);
-				UInt16 items = LstGetNumberOfItems((ListType *)objP);
-				UInt16 trigger = id - 1;
-				trigger = (FrmGetObjectIndex((FormType *)*dstP, trigger) != frmInvalidObjectId) ? trigger : 0;
-
-				LstNewList(dstP, id, x, y, w, h, font, visible, trigger);
-				newP = (ListType *)FrmGetObjectPtr((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-				LstSetListChoices(newP, itemsP, items);
-				FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-				break;
-			}
-			case frmFieldObj: {
-				FieldAttrType attr;
-				FontID font = FldGetFont((FieldType *)objP);
-				UInt16 maxChars = FldGetMaxChars((FieldType *)objP);
-				FldGetAttributes((FieldType *)objP, &attr);
-				FldNewField(dstP, id, x, y, w, h, font, maxChars, attr.editable, attr.underlined, attr.singleLine, attr.dynamicSize, (JustificationType)attr.justification, attr.autoShift, attr.hasScrollBar, attr.numeric);
-				FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-				break;
-			}
-			case frmControlObj: {
-				const Char *textP = CtlGetLabel((ControlType *)objP);
-				ControlStyleType style = CtlGlueGetControlStyle((ControlType *)objP);
-				FontID font = CtlGlueGetFont((ControlType *)objP);
-				ControlType *newP = CtlNewControl(dstP, id, style, textP, x, y, w, h, font, 0, true);
-				FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-				switch (style) {
-					case sliderCtl:
-					{
-							UInt16 min, max, page, val;
-							CtlGetSliderValues((ControlType *)objP, &min, &max, &page, &val);
-							CtlSetSliderValues(newP, &min, &max, &page, &val);
-							break;
-					}
-				}
-				break;
-			}
-			case frmLabelObj: {
-				const Char *textP = FrmGetLabel(srcP, id);
-				FontID font = FrmGlueGetLabelFont(srcP, id);
-				FrmNewLabel((FormType **)dstP, id, textP, x, y, font);
-				FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-				break;
-			}
-
-			case frmBitmapObj: {
-/*				UInt16 family = id + 1;
-				FrmNewBitmap((FormType **)dstP, id, id, x, y);
-				//FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
-*/				break;
-			}
-		}
-	}
-
-	frmP = (FormType **)dstP;	// save new form ptr
-	return errNone;
-}
-
-void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) {
-	UInt16 cnt, idx;
-	RectangleType r;
-	TabDataPtr dataP;
-
-	if (tabP->active == num)
-		return;
-
-	dataP = &tabP->tabs[tabP->active];
-
-	// hide active tab objects
-	if (tabP->active != tabP->count) {
-		for (cnt = dataP->first; cnt <= dataP->last; cnt++) {
-			if ((idx = FrmGetObjectIndex(frmP, cnt)) != frmInvalidObjectId)
-				FrmHideObject(frmP, idx);
-		}
-	}
-
-	// save active tab
-	tabP->active = num;
-	dataP = &tabP->tabs[num];
-
-	// draw tab limit
-	WinSetForeColor(UIColorGetTableEntryIndex(UIFormFill));
-	WinDrawLine(1, 14, 154,14);
-	WinDrawLine(1, 15, 154,15);
-	RctSetRectangle(&r, 1, 30, 154, 100);
-	WinDrawRectangle(&r, 0);
-	WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame));
-	WinDrawLine(1, 28, 154,28);
-
-	// set tabs size
-	for (cnt = 0; cnt < tabP->count; cnt++) {
-		idx = FrmGetObjectIndex (frmP, (FrmGetFormId(frmP) + cnt + 1));
-
-		if (idx != frmInvalidObjectId) {
-			FrmGetObjectBounds(frmP, idx, &r);
-			r.topLeft.y	= (num == cnt) ? 17 : 17;
-			r.extent.y	= (num == cnt) ? 12 : 11;
-			FrmSetObjectBounds(frmP, idx, &r);
-
-			if (num == cnt) {
-				RGBColorType yellow = {0,255,192,0};
-
-				UInt8 line = /*(UIColorGetTableEntryIndex(UIFormFill) == UIColorGetTableEntryIndex(UIFieldTextHighlightBackground)) ?
-							WinRGBToIndex(&yellow) :*/
-							UIColorGetTableEntryIndex(UIFieldTextHighlightBackground);
-
-				r.topLeft.y	-= 1;
-				WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame));
-				WinDrawRectangleFrame(simpleFrame, &r);
-				WinSetForeColor(line);
-				WinDrawLine(r.topLeft.x, r.topLeft.y, r.topLeft.x + r.extent.x - 1, r.topLeft.y);
-				FrmShowObject(frmP, idx);
-
-			} else {
-				UInt8 frame = UIColorGetTableEntryIndex(UIObjectFrame);
-				RGBColorType light;
-				WinIndexToRGB(frame, &light);
-				light.r = (255 - light.r) > 72 ? light.r + 72 : 255;
-				light.g = (255 - light.g) > 72 ? light.g + 72 : 255;
-				light.b = (255 - light.b) > 72 ? light.b + 72 : 255;
-
-				WinSetForeColor(WinRGBToIndex(&light));
-				WinDrawRectangleFrame(simpleFrame, &r);
-				WinSetForeColor(frame);
-				WinDrawLine(r.topLeft.x - 1, r.topLeft.y + r.extent.y, r.topLeft.x + r.extent.x, r.topLeft.y + r.extent.y);
-			}
-
-			// round corner
-			WinSetForeColor(UIColorGetTableEntryIndex(UIFormFill));
-			if (OPTIONS_TST(kOptModeHiDensity)) {
-				WinSetCoordinateSystem(kCoordinatesNative);
-				WinDrawPixel((r.topLeft.x - 1) * 2, (r.topLeft.y - 1) * 2);
-				WinDrawPixel((r.topLeft.x + r.extent.x) * 2 + 1, (r.topLeft.y - 1) * 2);
-				WinSetCoordinateSystem(kCoordinatesStandard);
-
-			} else {
-				// TODO
-			}
-		}
-	}
-
-	// show objects
-	for (cnt = dataP->first; cnt <= dataP->last; cnt++) {
-		if ((idx = FrmGetObjectIndex(frmP, cnt)) != frmInvalidObjectId)
-			FrmShowObject(frmP, idx);
-	}
-
-	// post draw function
-	if (dataP->drawFunc)
-		(dataP->drawFunc)();
-}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h b/backends/platform/PalmOS/Src/launcher/forms/formtabs.h
deleted file mode 100644
index f14c2ff4e4..0000000000
--- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __FORMTABS_H__
-#define __FORMTABS_H__
-
-typedef void (TabProc)();
-
-typedef struct {
-	FormPtr srcP;
-	UInt16 first;
-	UInt16 last;
-	TabProc *drawFunc;
-} TabDataType, *TabDataPtr;
-
-typedef struct {
-	UInt16 count, active;
-	Coord width;
-	TabDataPtr tabs;
-} TabType, *TabPtr;
-
-TabType	*TabNewTabs		(UInt16 cnt);
-void	 TabDeleteTabs	(TabType *tabP);
-Err		 TabAddContent	(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
-void	 TabSetActive	(FormType *frmP, TabType *tabP, UInt16 num);
-void	TabMoveUpObject	(FormType *frmP, UInt16 objID, Coord amount);
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp
deleted file mode 100644
index c3f7ef3e4a..0000000000
--- a/backends/platform/PalmOS/Src/launcher/games.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <VFSMgr.h>
-#include <ctype.h>
-
-#include "globals.h"
-#include "palmdefs.h"
-#include "start.h"
-#include "games.h"
-#include "skin.h"
-
-#include "StarterRsc.h"
-
-DmOpenRef gameDB = NULL;
-
-static Err GamUpdateList() {
-	if (gameDB) {
-		UInt16 numRecs = DmNumRecords(gameDB);
-
-		if (numRecs > 0) {
-			MemHandle tmpH;
-			UInt32 version, size;
-			UInt32 *versionP;
-
-			// get record size and version
-			tmpH = DmQueryRecord(gameDB, 0);
-			size = MemHandleSize(tmpH);
-			versionP = (UInt32 *)MemHandleLock(tmpH);
-			version = *versionP;
-			MemHandleUnlock(tmpH);
-
-			// check record
-			if (version != curItemVersion || size != sizeof(GameInfoType)) {
-				UInt16 index;
-				GameInfoType gitCur;
-				void *tmpP;
-				FormPtr ofmP, frmP;
-
-				// show dialog
-				ofmP = FrmGetActiveForm();
-				frmP = FrmInitForm(ConvertForm);
-				FrmSetActiveForm(frmP);
-				FrmDrawForm(frmP);
-				SysTaskDelay(1 * SysTicksPerSecond());
-
-				MemSet(&gitCur, sizeof(GameInfoType), 0);
-
-				if (version == itemVersion_357 ||
-					version == itemVersion_356 ||
-					version == itemVersion_355 ||
-					version == itemVersion_354 ||
-					version == itemVersion_353 ||
-					version == itemVersion_352 ||
-					version == itemVersion_351 ||
-					version == itemVersion_350 ||
-					version == itemVersion_340 ||
-					version == itemVersion_330 ||
-					version == itemVersion_320 ||
-					version == itemVersion_310 ||
-					version == itemVersion_300 ||
-					version == itemVersion_270 ||
-					version == itemVersion_260 ||
-					version == itemVersion_250) {
-					for (index = 0; index < numRecs; index++) {
-						// get old data
-						tmpH = DmQueryRecord(gameDB, index);
-						tmpP = MemHandleLock(tmpH);
-						MemMove(&gitCur, tmpP, MemHandleSize(tmpH));
-						MemHandleUnlock(tmpH);
-
-						// new format
-						gitCur.version = curItemVersion;
-
-						if (version < itemVersion_300) {
-							gitCur.musicInfo.volume.palm = 50;
-							gitCur.musicInfo.volume.music = 192;
-							gitCur.musicInfo.volume.sfx = 192;
-							gitCur.musicInfo.volume.speech = 192;
-							gitCur.musicInfo.volume.audiocd = 50;
-
-							gitCur.musicInfo.sound.tempo = 100;
-							gitCur.musicInfo.sound.defaultTrackLength = 10;
-							gitCur.musicInfo.sound.firstTrack = 1;
-						}
-
-						if (version < itemVersion_310)
-							gitCur.engine = 0;
-
-						if (version < itemVersion_320)
-							gitCur.renderMode = 0;
-
-						if (version <= itemVersion_330) {
-							gitCur.fmQuality = 0;
-							gitCur.gfxMode = (gitCur.gfxMode == 3 ? 1 : 0); // v3.4 only 2 modes
-
-									if (gitCur.engine == 0) gitCur.engine = 8;
-							else	if (gitCur.engine == 1) gitCur.engine = 7;
-							else	if (gitCur.engine == 2) gitCur.engine = 3;
-							else	if (gitCur.engine == 3) gitCur.engine = 1;
-							else	if (gitCur.engine == 4) gitCur.engine = 0;
-							else	if (gitCur.engine == 5) gitCur.engine = 6;
-							else	if (gitCur.engine == 6) gitCur.engine = 4;
-							else	if (gitCur.engine == 7) gitCur.engine = 5;
-							else	if (gitCur.engine == 8) gitCur.engine = 2;
-
-									if (gitCur.renderMode == 1) gitCur.renderMode = 4;
-							else	if (gitCur.renderMode == 2) gitCur.renderMode = 5;
-							else	if (gitCur.renderMode == 3) gitCur.renderMode = 2;
-							else	if (gitCur.renderMode == 4) gitCur.renderMode = 3;
-							else	if (gitCur.renderMode == 5) gitCur.renderMode = 1;
-
-									if (gitCur.platform == 2) gitCur.platform = 6;
-							else	if (gitCur.platform == 5) gitCur.platform = 8;
-							else	if (gitCur.platform == 6) gitCur.platform = 2;
-
-									if (gitCur.language ==  1) gitCur.language = 4;
-							else	if (gitCur.language ==  2) gitCur.language = 6;
-							else	if (gitCur.language ==  3) gitCur.language = 5;
-							else	if (gitCur.language ==  4) gitCur.language = 8;
-							else	if (gitCur.language ==  5) gitCur.language = 11;
-							else	if (gitCur.language ==  6) gitCur.language = 13;
-							else	if (gitCur.language ==  7) gitCur.language = 9;
-							else	if (gitCur.language ==  8) gitCur.language = 1;
-							else	if (gitCur.language ==  9) gitCur.language = 10;
-							else	if (gitCur.language == 10) gitCur.language = 7;
-							else	if (gitCur.language == 11) gitCur.language = 12;
-							else	if (gitCur.language == 12) gitCur.language = 2;
-							else	if (gitCur.language == 13) gitCur.language = 3;
-
-									if (gitCur.musicInfo.sound.drvMusic == 1) gitCur.musicInfo.sound.drvMusic = 4;
-							else	if (gitCur.musicInfo.sound.drvMusic == 2) gitCur.musicInfo.sound.drvMusic = 5;
-							else	if (gitCur.musicInfo.sound.drvMusic == 4) gitCur.musicInfo.sound.drvMusic = 2;
-							else	if (gitCur.musicInfo.sound.drvMusic == 5) gitCur.musicInfo.sound.drvMusic = 1;
-						}
-
-						if (version <= itemVersion_340) {
-							gitCur.platform++;
-
-							if (gitCur.language == 3)
-								gitCur.language = 0;
-							else if (gitCur.language >= 11)
-								gitCur.language++;
-						}
-
-						if (version <= itemVersion_350)
-							if (gitCur.platform >= 9)
-								gitCur.platform++;
-
-						if (version <= itemVersion_351) {
-							if (gitCur.engine >= ENGINE_LURE)	// newly added engine
-								gitCur.engine++;
-
-							if (gitCur.engine == ENGINE_SCUMM)	// reorder
-								gitCur.engine = ENGINE_AGOS;
-							else if (gitCur.engine == ENGINE_AGOS)
-								gitCur.engine = ENGINE_SCUMM;
-						}
-
-						if (version <= itemVersion_352) {
-							if (gitCur.engine >= ENGINE_CINE)	// newly added engine
-								gitCur.engine++;
-
-							gitCur.platform++;
-						}
-
-						if (version <= itemVersion_353)
-							gitCur.musicInfo.sound.drvMusic++;
-
-						if (version <= itemVersion_354)
-							if (gitCur.engine >= ENGINE_AGI)	// newly added engine
-								gitCur.engine++;
-
-						if (version <= itemVersion_355) {
-								gitCur.engine++;				// renamed Simon -> AGOS
-								if (gitCur.engine == ENGINE_COUNT)
-									gitCur.engine = ENGINE_AGOS;
-						}
-
-						if (version <= itemVersion_356) {
-							if (gitCur.platform >= 3)
-								gitCur.platform++;
-						}
-
-						if (version <= itemVersion_357)
-							if (gitCur.engine >= ENGINE_PARALLACTION)	// newly added engine
-								gitCur.engine++;
-
-						if (gitCur.musicInfo.volume.palm > 100)
-							gitCur.musicInfo.volume.palm = 50;
-
-						// simply resize the old record
-						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
-						tmpP = MemHandleLock(tmpH);
-						DmWrite(tmpP, 0, &gitCur, sizeof(GameInfoType));
-						MemPtrUnlock(tmpP);
-					}
-
-				} else if (version == itemVersion_200) {
-					// need conversion from V2 -> V3.5.2
-					GameInfoTypeV2 git0;
-
-					for (index = 0; index < numRecs; index++) {
-
-						// get old data
-						tmpH = DmQueryRecord(gameDB, index);
-						tmpP = MemHandleLock(tmpH);
-						MemMove(&git0, tmpP, sizeof(GameInfoTypeV2));
-						MemHandleUnlock(tmpH);
-
-						// convert to new format
-						gitCur.version = curItemVersion;
-						gitCur.icnID = 0xFFFF;
-						gitCur.selected = git0.selected;
-						StrCopy(gitCur.nameP, git0.nameP);
-						StrCopy(gitCur.pathP, git0.pathP);
-						StrCopy(gitCur.gameP, git0.gameP);
-						gitCur.gfxMode = (git0.gfxMode == 3 ? 1 : 0); // v3.4 only 2 modes
-
-						gitCur.autoLoad = git0.autoLoad;
-						gitCur.bootParam = git0.bootParam;
-						gitCur.setPlatform = git0.setPlatform;
-						gitCur.subtitles = git0.subtitles;
-						gitCur.talkSpeed = git0.talkSpeed;
-
-						gitCur.loadSlot = git0.loadSlot;
-						gitCur.bootValue = git0.bootValue;
-						gitCur.talkValue = git0.talkValue;
-						gitCur.platform = git0.platform;
-						gitCur.language = git0.language;
-
-						gitCur.musicInfo.volume.palm = 50;
-						gitCur.musicInfo.volume.music = 192;
-						gitCur.musicInfo.volume.sfx = 192;
-						gitCur.musicInfo.volume.speech = 192;
-						gitCur.musicInfo.volume.audiocd = 50;
-
-						gitCur.musicInfo.sound.tempo = 100;
-						gitCur.musicInfo.sound.defaultTrackLength = 10;
-						gitCur.musicInfo.sound.firstTrack = 1;
-
-						// to V3.4
-								if (gitCur.platform == 2) gitCur.platform = 6;
-						else	if (gitCur.platform == 5) gitCur.platform = 8;
-						else	if (gitCur.platform == 6) gitCur.platform = 2;
-
-								if (gitCur.language ==  1) gitCur.language = 4;
-						else	if (gitCur.language ==  2) gitCur.language = 6;
-						else	if (gitCur.language ==  3) gitCur.language = 5;
-						else	if (gitCur.language ==  4) gitCur.language = 8;
-						else	if (gitCur.language ==  5) gitCur.language = 11;
-						else	if (gitCur.language ==  6) gitCur.language = 13;
-						else	if (gitCur.language ==  7) gitCur.language = 9;
-						else	if (gitCur.language ==  8) gitCur.language = 1;
-						else	if (gitCur.language ==  9) gitCur.language = 10;
-						else	if (gitCur.language == 10) gitCur.language = 7;
-						else	if (gitCur.language == 11) gitCur.language = 12;
-						else	if (gitCur.language == 12) gitCur.language = 2;
-						else	if (gitCur.language == 13) gitCur.language = 3;
-
-								if (gitCur.musicInfo.sound.drvMusic == 1) gitCur.musicInfo.sound.drvMusic = 4;
-						else	if (gitCur.musicInfo.sound.drvMusic == 2) gitCur.musicInfo.sound.drvMusic = 5;
-						else	if (gitCur.musicInfo.sound.drvMusic == 4) gitCur.musicInfo.sound.drvMusic = 2;
-						else	if (gitCur.musicInfo.sound.drvMusic == 5) gitCur.musicInfo.sound.drvMusic = 1;
-
-						// to V3.5
-						gitCur.platform++;
-
-						if (gitCur.language == 3)
-							gitCur.language = 0;
-						else if (gitCur.language >= 11)
-							gitCur.language++;
-
-						// to V3.5.1
-						if (gitCur.platform >= 9)
-							gitCur.platform++;
-
-						//to V3.5.3
-						gitCur.musicInfo.sound.drvMusic++;
-
-						// -----
-						gitCur.engine = ENGINE_SCUMM;
-
-						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
-						tmpP = MemHandleLock(tmpH);
-						DmWrite(tmpP, 0, &gitCur, sizeof(GameInfoType));
-						MemPtrUnlock(tmpP);
-					}
-				} else {
-					// need conversion from V0 -> V3.5.2
-					GameInfoTypeV0 git0;
-
-					for (index = 0; index < numRecs; index++) {
-
-						// get old data
-						tmpH = DmQueryRecord(gameDB, index);
-						tmpP = MemHandleLock(tmpH);
-						MemMove(&git0, tmpP, sizeof(GameInfoTypeV0));
-						MemHandleUnlock(tmpH);
-
-						// convert to new format
-						gitCur.version = curItemVersion;
-						gitCur.icnID = 0xFFFF;
-						gitCur.selected = git0.selected;
-						StrCopy(gitCur.nameP, git0.nameP);
-						StrCopy(gitCur.pathP, git0.pathP);
-						StrCopy(gitCur.gameP, git0.gameP);
-						gitCur.gfxMode = (git0.gfxMode == 3 ? 1 : 0); // v3.4 only 2 modes
-
-						gitCur.autoLoad = git0.autoLoad;
-						gitCur.bootParam = git0.bootParam;
-						gitCur.setPlatform = git0.amiga;	// amiga become platform amiga/atari-st/machintosh
-						gitCur.platform = 1;
-						gitCur.subtitles = git0.subtitles;
-						gitCur.talkSpeed = git0.talkSpeed;
-
-						gitCur.loadSlot = git0.loadSlot;
-						gitCur.bootValue = git0.bootValue;
-						gitCur.talkValue = git0.talkValue;
-						gitCur.platform = 2;	// default to amiga
-						gitCur.language = git0.language;
-
-						gitCur.musicInfo.volume.palm = 50;
-						gitCur.musicInfo.volume.music = 192;
-						gitCur.musicInfo.volume.sfx = 192;
-						gitCur.musicInfo.volume.speech = 192;
-						gitCur.musicInfo.volume.audiocd = 50;
-
-						gitCur.musicInfo.sound.tempo = 100;
-						gitCur.musicInfo.sound.defaultTrackLength = 10;
-						gitCur.musicInfo.sound.firstTrack = 1;
-
-						gitCur.engine = ENGINE_SCUMM;
-
-						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
-						tmpP = MemHandleLock(tmpH);
-						DmWrite(tmpP, 0, &gitCur, sizeof(GameInfoType));
-						MemPtrUnlock(tmpP);
-					}
-				}
-
-				FrmEraseForm(frmP);
-				FrmDeleteForm(frmP);
-				if (ofmP)
-					FrmSetActiveForm(ofmP);
-			}
-		}
-	}
-
-	return errNone;
-}
-
-Err GamOpenDatabase() {
-	Err err = errNone;
-
-	gameDB = DmOpenDatabaseByTypeCreator( 'DATA', appFileCreator, dmModeReadWrite);
-
-	if (!gameDB) {
-		err = DmCreateDatabase(0, "ScummVM-Data", appFileCreator, 'DATA', false);
-		if (!err) {
-			gameDB = DmOpenDatabaseByTypeCreator( 'DATA', appFileCreator, dmModeReadWrite);
-
-			if (!gameDB)
-				err = DmGetLastErr();
-		}
-	}
-
-	if (err)
-		FrmCustomAlert(FrmErrorAlert,"Cannot open/create games list DB !",0,0);
-	else
-		err = GamUpdateList();
-
-	return err;
-}
-
-void GamImportDatabase() {
-	if (gPrefs->card.volRefNum != vfsInvalidVolRef && gPrefs->card.moveDB) {
-		FileRef file;
-		Err e;
-
-		e = VFSFileOpen(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata.pdb", vfsModeRead, &file);
-		if (!e) {
-			UInt16 oCardNo, nCardNo;
-			LocalID oDbID, nDbID;
-
-			VFSFileClose(file);
-			if (gPrefs->card.confirmMoveDB)
-				if (FrmCustomAlert(FrmConfirmAlert, "Do you want to import games database from memory card ?", 0, 0) == FrmConfirmNo) {
-					// prevent to replace the file on memory card
-					gPrefs->card.moveDB = false;
-					return;
-				}
-
-			// get current db info and rename it
-			DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
-			GamCloseDatabase(true);
-			e = DmDeleteDatabase(oCardNo, oDbID);
-
-			if (!e)
-				if (e = VFSImportDatabaseFromFile(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata.pdb", &nCardNo, &nDbID))
-					FrmCustomAlert(FrmErrorAlert, "Failed to import games database from memory card.", 0, 0);
-
-			GamOpenDatabase();
-		}
-	}
-}
-
-void GamCloseDatabase(Boolean ignoreCardParams) {
-	if (gameDB) {
-		LocalID dbID;
-		UInt16 cardNo;
-
-		DmOpenDatabaseInfo(gameDB, &dbID, 0, 0, &cardNo, 0);
-		DmCloseDatabase(gameDB);
-
-		if (!ignoreCardParams) {
-			if (gPrefs->card.moveDB && gPrefs->card.volRefNum != vfsInvalidVolRef) {
-				VFSFileRename(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata.pdb", "listdata-old.pdb");
-				Err e = VFSExportDatabaseToFile(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata.pdb", cardNo, dbID);
-				if (!e) {
-					VFSFileDelete(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata-old.pdb");
-					if (gPrefs->card.deleteDB)
-						DmDeleteDatabase(cardNo, dbID);
-				} else {
-					VFSFileRename(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata-old.pdb", "listdata.pdb");
-				}
-			}
-		}
-	}
-	gameDB = NULL;
-}
-
-static Int16 GamCompare(GameInfoType *a, GameInfoType *b, SortRecordInfoPtr, SortRecordInfoPtr, MemHandle) {
-	return StrCaselessCompare(a->nameP, b->nameP);
-}
-
-Err GamSortList() {
-	return DmQuickSort (gameDB, (DmComparF *)GamCompare, 0);
-}
-
-void GamUnselect() {
-	GameInfoType *game;
-
-	MemHandle recordH;
-	UInt16 index;
-
-	index = GamGetSelected();
-
-	if (index != dmMaxRecordIndex) {
-		Boolean newValue;
-
-		recordH = DmGetRecord(gameDB, index);
-		game = (GameInfoType *)MemHandleLock(recordH);
-
-		newValue = false;
-		DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean));
-
-		MemHandleUnlock(recordH);
-		DmReleaseRecord (gameDB, index, 0);
-	}
-}
-
-UInt16 GamGetSelected() {
-	MemHandle record;
-	GameInfoType *game;
-	Boolean selected;
-	UInt16 index = DmNumRecords(gameDB)-1;
-
-	while (index != (UInt16)-1) {
-		record = DmQueryRecord(gameDB, index);
-		game = (GameInfoType *)MemHandleLock(record);
-		selected = game->selected;
-		MemHandleUnlock(record);
-
-		if (selected)
-			return index;
-
-		index--;
-	}
-
-	return dmMaxRecordIndex;
-}
-
-Boolean GamJumpTo(Char letter) {
-	MemHandle record;
-	GameInfoType *game;
-	Boolean found = false;
-	UInt16 index = 0;
-	UInt16 maxIndex = DmNumRecords(gameDB);
-	UInt16 active = GamGetSelected();
-
-	while (index < maxIndex) {
-		record = DmGetRecord(gameDB, index);
-		game = (GameInfoType *)MemHandleLock(record);
-
-		if (tolower(game->nameP[0]) == tolower(letter)) {
-			found = true;
-
-			if (index != active) {
-				RectangleType rArea;
-				UInt16 maxView;
-				Boolean newValue = true;
-
-				SknGetListBounds(&rArea, NULL);
-				maxView = rArea.extent.y / sknInfoListItemSize;
-
-				GamUnselect();
-				DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean));
-
-				if (index < gPrefs->listPosition || index >= (gPrefs->listPosition + maxView))
-					gPrefs->listPosition = index;
-			}
-		}
-
-		MemHandleUnlock(record);
-		DmReleaseRecord (gameDB, index, 0);
-
-		index++;
-
-		if (found)
-			return found;
-	}
-
-	return found;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/games.h b/backends/platform/PalmOS/Src/launcher/games.h
deleted file mode 100644
index 7c381a40f4..0000000000
--- a/backends/platform/PalmOS/Src/launcher/games.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __GAMES_H__
-#define	__GAMES_H__
-
-#define curItemVersion sysMakeROMVersion(3,5,8,0,0)	// Parallaction engine
-
-
-#define itemVersion_357 sysMakeROMVersion(3,5,7,0,0)	// Added : Apple IIgs
-#define itemVersion_356 sysMakeROMVersion(3,5,6,0,0)	// Changed : Simon -> AGOS
-#define itemVersion_355 sysMakeROMVersion(3,5,5,0,0)	// Added : AGI engine
-#define itemVersion_354 sysMakeROMVersion(3,5,4,0,0)	// Added : Default/Auto music driver
-#define itemVersion_353 sysMakeROMVersion(3,5,3,0,0)	// Added : CinE engine and 3DO platform
-#define itemVersion_352 sysMakeROMVersion(3,5,2,0,0)	// Added : Lure engine
-#define itemVersion_351 sysMakeROMVersion(3,5,1,0,0)	// Added : Sega CD platform
-#define itemVersion_350 sysMakeROMVersion(3,5,0,0,0)
-#define itemVersion_340 sysMakeROMVersion(3,4,0,0,0)
-#define itemVersion_330 sysMakeROMVersion(3,3,0,0,0)
-#define itemVersion_320 sysMakeROMVersion(3,2,0,0,0)
-#define itemVersion_310 sysMakeROMVersion(3,1,0,0,0)
-#define itemVersion_300 sysMakeROMVersion(3,0,0,0,0)
-#define itemVersion_270 sysMakeROMVersion(2,7,0,0,0)
-#define itemVersion_260 sysMakeROMVersion(2,6,0,0,0)
-#define itemVersion_250 sysMakeROMVersion(2,5,0,0,0)
-#define itemVersion_200 sysMakeROMVersion(2,0,0,0,0)
-
-// old config structs
-typedef struct {
-	UInt32	version;
-	UInt16	icnID;			// icon to display on the list
-	Boolean	selected;
-
-	Char	nameP[50];		// game name to display in list
-	Char	pathP[150];		// path to the game files
-	Char	gameP[10];		// scumm name of the game
-	UInt16	gfxMode;
-
-	Boolean autoLoad;
-	UInt16 loadSlot;
-	Boolean bootParam;
-	UInt16 bootValue;
-	Boolean amiga;
-	Boolean subtitles;
-	Boolean talkSpeed;
-	UInt16 talkValue;
-	UInt8 language;
-
-} GameInfoTypeV0;
-
-typedef struct {
-	UInt32	version;
-	UInt16	icnID;			// icon to display on the list
-	Boolean	selected;
-
-	Char	nameP[50];		// game name to display in list
-	Char	pathP[150];		// path to the game files
-	Char	gameP[10];		// scumm name of the game
-	UInt16	gfxMode;
-
-	Boolean autoLoad;
-	Boolean bootParam;
-	Boolean setPlatform;
-	Boolean subtitles;
-	Boolean talkSpeed;
-
-	UInt16 loadSlot;
-	UInt16 bootValue;
-	UInt16 talkValue;
-	UInt8 platform;
-	UInt8 language;
-
-} GameInfoTypeV2;
-
-
-// Current config
-typedef struct {
-	struct {
-		UInt16 palm;
-		UInt16 music;
-		UInt16 sfx;		// TODO : remove
-		UInt16 speech;
-		UInt16 audiocd;
-	} volume;
-
-	struct {
-		// midi
-		Boolean multiMidi;
-		Boolean music;		// TODO : rename this, it is enable audio option
-		UInt8 drvMusic;
-		UInt8 tempo;
-		// sound FX
-		Boolean sfx;		// TODO : remove this
-		UInt8 rate;
-		// CD audio
-		Boolean CD;
-		UInt8 drvCD, frtCD;
-		UInt16 defaultTrackLength;
-		UInt16 firstTrack;
-	} sound;
-} MusicInfoType;
-
-typedef struct {
-	UInt32	version;
-	UInt16	icnID;			// icon to display on the list
-	Boolean	selected;
-
-	Char	nameP[50];		// game name to display in list
-	Char	pathP[150];		// path to the game files
-	Char	gameP[15];		// scumm name of the game
-	UInt16	gfxMode;
-
-	Boolean autoLoad;
-	Boolean bootParam;
-	Boolean setPlatform;
-	Boolean subtitles;
-	Boolean talkSpeed;
-
-	UInt16 loadSlot;
-	UInt16 bootValue;
-	UInt16 talkValue;
-	UInt8 platform;
-	UInt8 language;			// |-	v2.5
-
-	Boolean filter;			//		v2.6
-	Boolean fullscreen;		// |
-	Boolean aspectRatio;	// |-	v2.7
-
-	MusicInfoType musicInfo;//		v3.0
-
-	UInt8 engine;			// |-	v3.1
-	UInt8 renderMode;		// |-	v3.2
-//	Boolean use16Bit;		// |-	v3.3	// removed
-	UInt8 fmQuality;		// |-	v3.4	// replace use16Bit
-} GameInfoType;
-
-enum {
-	ENGINE_AGOS = 0,
-	ENGINE_SKY,
-	ENGINE_SWORD1,
-	ENGINE_SWORD2,
-	ENGINE_CINE,
-	ENGINE_QUEEN,
-	ENGINE_LURE,
-	ENGINE_GOB,
-	ENGINE_KYRA,
-	ENGINE_PARALLACTION,
-	ENGINE_SAGA,
-	ENGINE_SCUMM,
-	ENGINE_AGI,
-	ENGINE_TOUCHE,
-	ENGINE_CRUISE,
-	ENGINE_DRASCULA,
-	ENGINE_COUNT
-};
-
-static const struct {
-	const char *fileP;
-	const char *nameP;
-} engines[] = {
-	{ "agos",			"AGOS Engine" },
-	{ "sky",			"Beneath a Steel Sky" },
-	{ "sword1",			"Broken Sword I" },
-	{ "sword2",			"Broken Sword II" },
-	{ "cine",			"Delphine Cinematique v1.0" },
-	{ "queen",			"Flight of the Amazon Queen" },
-	{ "lure",			"Lure of the Tempress" },
-	{ "gob",			"Gobliiins, Bargon Attack and more" },
-	{ "kyra",			"Kyrandia" },
-	{ "parallaction",	"Parallaction" },
-	{ "saga",			"SAGA Engine" },
-	{ "scumm",			"Scumm Games" },
-	{ "agi",			"Sierra AGI" },
-	{ "touche",			"Touche: The Adventures of the Fifth Musketeer" },
-	{ "cruise",			"Beta -> Cruise for a Corpse" },
-	{ "drascula",		"Beta -> Drascula" },
-};
-
-// protos
-Err		GamOpenDatabase		();
-void	GamImportDatabase	();
-void	GamCloseDatabase	(Boolean ignoreCardParams);
-Err		GamSortList			();
-UInt16	GamGetSelected		();
-void	GamUnselect			();
-Boolean GamJumpTo			(Char letter);
-
-extern DmOpenRef gameDB;
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp
deleted file mode 100644
index cb2d52b20e..0000000000
--- a/backends/platform/PalmOS/Src/launcher/launch.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <PmPalmOSNVFS.h>
-#include "StarterRsc.h"
-
-#include "games.h"
-#include "start.h"
-#include "rumble.h"
-#include "globals.h"
-#include "features.h"
-#include "formUtil.h"
-#include "formCards.h"
-#include "palmdefs.h"
-
-#include "init_palmos.h"
-#include "init_stuffs.h"
-
-#include "modules.h"
-#include "args.h"
-
-
-#define BUILD_ERROR(m)	\
-	{	StrCopy(msg, m);	\
-		StrCat(msg, "\n\nPlease check that all required files are installed on your card, and you have enough free storage memory.");	\
-		goto onError; }
-
-#define BUILD_FILE(h,m)	\
-	StrCopy(filename, "/Palm/Programs/ScummVM/Mods/");	\
-	StrCat(filename, h);	\
-	StrCat(filename, m);
-
-#define FIND_FILE() \
-	if (*volRefNum == vfsInvalidVolRef) \
-		*volRefNum = ModFind(filename);
-
-
-#define CHECK_FILE(m) \
-	e = VFSFileOpen(*volRefNum, filename, vfsModeRead, &file);	\
-	if (e)	\
-		BUILD_ERROR(m)	\
-	else	\
-		VFSFileClose(file);
-
-#define IMPRT_FILE(m) \
-	e = VFSImportDatabaseFromFile(*volRefNum, filename, &cardNo, &dbID);	\
-	if (e)	\
-		BUILD_ERROR(m)
-
-#define DELET_FILE(f) \
-	del_dbID = DmFindDatabase(0, f);	\
-	if (del_dbID)	\
-		DmDeleteDatabase(0, del_dbID);
-
-void ModDelete() {
-	LocalID del_dbID;
-
-	DELET_FILE("Glbs::Common");
-	DELET_FILE("Glbs::Engine");
-	DELET_FILE("ScummVM-Engine");
-}
-
-UInt16 ModFind(const Char *f) {
-	Err e;
-	UInt16 volRefNum;
-	FileRef r;
-	UInt32 volIterator = vfsIteratorStart|vfsIncludePrivateVolumes;
-	while (volIterator != vfsIteratorStop) {
-		e = VFSVolumeEnumerate(&volRefNum, &volIterator);
-
-		if (!e)	e = VFSFileOpen(volRefNum, f, vfsModeRead, &r);
-		if (!e) e = VFSFileClose(r);
-		if (!e) break;
-	}
-
-	return volRefNum;
-}
-
-static void ModSetStack(UInt32 newSize, UInt16 cardNo, LocalID dbID) {
-	DmOpenRef dbRef = DmOpenDatabase(cardNo, dbID, dmModeReadWrite);
-
-	if (dbRef) {
-		MemHandle pref = DmGetResource('pref',0);
-		UInt32 size = 0;
-
-		if (pref) {
-			SysAppPrefsType *data = (SysAppPrefsType *)MemHandleLock(pref);
-			size = data->stackSize;
-
-			if (newSize) {
-				SysAppPrefsType newData;
-				MemMove(&newData, data, sizeof(SysAppPrefsType));
-				newData.stackSize = newSize;
-				DmWrite(data, 0, &newData, sizeof(SysAppPrefsType));
-			}
-
-			MemPtrUnlock(data);
-			DmReleaseResource(pref);
-		}
-
-		DmCloseDatabase(dbRef);
-	}
-}
-
-static Err ModImport(UInt16 *volRefNum, UInt8 engine, Boolean *armP) {
-#ifndef _DEBUG_ENGINE
-	char filename[256];
-	UInt16 cardNo;
-	LocalID dbID;
-	UInt32 result;
-	FileRef file;
-#endif
-	char msg[256];
-	FormPtr ofmP, frmP;
-	Err e = errNone;
-
-	ofmP = FrmGetActiveForm();
-	frmP = FrmInitForm(ImportForm);
-	FrmSetActiveForm(frmP);
-	FrmDrawForm(frmP);
-
-	// In debug mode, the engine files are directly uploaded to the simulator
-#ifndef _DEBUG_ENGINE
-	// engine file ?
-	BUILD_FILE(engines[engine].fileP, ".engine");
-	FIND_FILE ();
-	CHECK_FILE("ScummVM engine file was not found !");
-	IMPRT_FILE("Cannot import engine file !");
-
-	// need more files ?
-	dbID = DmFindDatabase(0, "ScummVM-Engine");	// be sure to have the correct dbID
-	e = SysAppLaunch(cardNo, dbID, 0, sysAppLaunchCustomEngineGetInfo, 0, &result);
-	*armP = ((result & GET_MODEARM) == GET_MODEARM);
-
-/*	ARM ONLY FOR NOW, NOT REQUIRED
-	// common file ?
-	if (!e && (result & GET_DATACOMMON)) {
-		BUILD_FILE("common", ".data");
-		CHECK_FILE("Common data file was not found !");
-		IMPRT_FILE("Cannot import common data file !");
-	}
-	// data file ?
-	if (!e && (result & GET_DATAENGINE)) {
-		BUILD_FILE(engines[engine].fileP, ".data");
-		CHECK_FILE("Engine data file was not found !");
-		IMPRT_FILE("Cannot import engine data file !");
-	}
-*/
-#endif
-	// if error, cleanup
-	if (e) ModDelete();
-
-onError:
-	FrmEraseForm(frmP);
-	FrmDeleteForm(frmP);
-	if (e) {
-		if (ofmP) FrmSetActiveForm(ofmP);
-		FrmCustomAlert(FrmErrorAlert, msg, 0, 0);
-	}
-
-	return e;
-}
-
-#undef DELET_FILE
-#undef CHECK_FILE
-#undef BUILD_FILE
-
-Boolean StartScummVM(Int16 engine) {
-	Char **argvP;
-	UInt8 lightspeed, argc	= 0;
-	UInt32 stackSize;
-	Boolean toLauncher, direct, isARM;
-	Char num[6];
-
-	argvP = ArgsInit();
-	direct = false;
-
-	// start command line (exec name)
-	ArgsAdd(&argvP[argc], "-", NULL, &argc);
-	// standard path
-	ArgsAdd(&argvP[argc], "--themepath=", "/PALM/Programs/ScummVM/Themes", &argc);
-
-	UInt16 index = GamGetSelected();
-	// no game selected
-	if (index == dmMaxRecordIndex) {
-		if (engine == NO_ENGINE) {
-			// free args
-			ArgsFree(argvP);
-			return false;
-		}
-
-		// default values
-		if (bDirectMode)
-			gPrefs->card.volRefNum = parseCards();	// always use the first removable card available (?)
-
-		gVars->filter		= true;
-		gVars->palmVolume	= 50;
-		gVars->fmQuality	= FM_QUALITY_INI;
-		direct = true;
-
-	// somthing selected
-	} else {
-		Char pathP[256];
-		MemHandle recordH;
-		GameInfoType *gameInfoP;
-
-		recordH = DmQueryRecord(gameDB,index);
-		gameInfoP = (GameInfoType *)MemHandleLock(recordH);
-		engine = gameInfoP->engine;
-
-		// build path
-		StrCopy(pathP,"/Palm/Programs/ScummVM/Games/");
-		if (gameInfoP->pathP[0] == '/')
-			StrCopy(pathP, gameInfoP->pathP);
-		else if (!(gameInfoP->pathP[0] == '.' && StrLen(gameInfoP->pathP) == 1))
-			StrCat(pathP, gameInfoP->pathP);
-
-		// path
-		ArgsAdd(&argvP[argc], "-p", pathP, &argc);
-
-		// language
-		if (gameInfoP->language > 0) {
-			const Char *lang = "zh\0cz\0gb\0en\0fr\0de\0hb\0it\0jp\0kr\0pl\0pt\0ru\0es\0se\0";
-			ArgsAdd(&argvP[argc], "-q", (lang + (gameInfoP->language - 1) * 3), &argc);
-		}
-
-		// fullscreen ?
-		if (gameInfoP->fullscreen)
-			ArgsAdd(&argvP[argc], "-f", NULL, &argc);
-
-		// aspect-ratio ?
-		ArgsAdd(&argvP[argc], (gameInfoP->aspectRatio ? "--aspect-ratio" : "--no-aspect-ratio"), NULL, &argc);
-
-		// gfx mode
-		gVars->filter = gameInfoP->filter;
-
-		switch (gameInfoP->renderMode) {
-			case 1:
-				ArgsAdd(&argvP[argc], "--render-mode=", "amiga", &argc);
-				break;
-			case 2:
-				ArgsAdd(&argvP[argc], "--render-mode=", "cga", &argc);
-				break;
-			case 3:
-				ArgsAdd(&argvP[argc], "--render-mode=", "ega", &argc);
-				break;
-			case 4:
-				ArgsAdd(&argvP[argc], "--render-mode=", "hercAmber", &argc);
-				break;
-			case 5:
-				ArgsAdd(&argvP[argc], "--render-mode=", "hercGreen", &argc);
-				break;
-		}
-
-		switch (gameInfoP->gfxMode)	{
-			case 1:
-				ArgsAdd(&argvP[argc], "-g", "wide", &argc);
-				break;
-			default:
-				ArgsAdd(&argvP[argc], "-g", "1x", &argc);
-				break;
-		}
-
-		// load state
-		if (gameInfoP->autoLoad) {
-			StrIToA(num, gameInfoP->loadSlot);
-			ArgsAdd(&argvP[argc], "-x", num, &argc);
-		}
-		// boot script parameter
-		if (gameInfoP->bootParam) {
-			StrIToA(num, gameInfoP->bootValue);
-			ArgsAdd(&argvP[argc], "-b", num, &argc);
-		}
-		// not a PC version
-		if (gameInfoP->setPlatform) {
-			static const char *platform[] = {
-				"3do",
-				"acorn",
-				"amiga",
-				"2gs",
-				"atari",
-				"c64",
-				"pc",
-				"fmtowns",
-				"linux",
-				"mac",
-				"nes",
-				"segacd",
-				"windows"
-			};
-			ArgsAdd(&argvP[argc], "--platform=", platform[gameInfoP->platform], &argc);
-		}
-
-		// subtitles
-		if (gameInfoP->subtitles)
-			ArgsAdd(&argvP[argc],  "-n", NULL, &argc);
-
-		// multi midi ?
-		if (gameInfoP->musicInfo.sound.multiMidi)
-			ArgsAdd(&argvP[argc], "--multi-midi", NULL, &argc);
-
-		if (engine == ENGINE_SCUMM) {
-			// music tempo
-			StrIToA(num, gameInfoP->musicInfo.sound.tempo);
-			ArgsAdd(&argvP[argc], "--tempo=", num, &argc);
-		}
-
-		// talk speed
-		if (gameInfoP->talkSpeed) {
-			StrIToA(num, gameInfoP->talkValue);
-			ArgsAdd(&argvP[argc], "--talkspeed=", num, &argc);
-		}
-
-		// music driver
-		if (gameInfoP->musicInfo.sound.music) {
-			static char *drv[] = {
-				"auto",
-				"null",
-				"adlib",
-				"towns",
-				"pcjr",
-				"native",
-				"pcspk"
-			};
-
-			if (StrCompare(drv[gameInfoP->musicInfo.sound.drvMusic], "native") == 0) {
-				if (OPTIONS_TST(kOptDeviceZodiac))
-					ArgsAdd(&argvP[argc], "-e", "zodiac", &argc);	// Tapwave Zodiac
-				else if (OPTIONS_TST(kOptSonyPa1LibAPI))
-					ArgsAdd(&argvP[argc], "-e", "ypa1", &argc);		// Pa1Lib devices
-				else
-					ArgsAdd(&argvP[argc], "-e", "auto", &argc);		// no driver, switch to auto
-			} else {
-				ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc);
-			}
-
-			// output rate
-			UInt32 rates[] = {4000, 8000, 11025, 22050, 44100};
-			StrIToA(num, rates[gameInfoP->musicInfo.sound.rate]);
-			ArgsAdd(&argvP[argc], "--output-rate=", num, &argc);
-
-			// FM quality
-			gVars->fmQuality = gameInfoP->fmQuality;
-
-		} else {
-			ArgsAdd(&argvP[argc], "-e", "null", &argc);
-		}
-
-		// volume control
-		StrIToA(num, gameInfoP->musicInfo.volume.sfx);
-		ArgsAdd(&argvP[argc], "-s", num, &argc);
-		StrIToA(num, gameInfoP->musicInfo.volume.music);
-		ArgsAdd(&argvP[argc], "-m", num, &argc);
-		StrIToA(num, gameInfoP->musicInfo.volume.speech);
-		ArgsAdd(&argvP[argc], "-r", num, &argc);
-
-		// game name
-		ArgsAdd(&argvP[argc], gameInfoP->gameP, NULL, &argc);
-
-		gVars->palmVolume = gameInfoP->musicInfo.sound.music ? gameInfoP->musicInfo.volume.palm : 0;
-
-		MemHandleUnlock(recordH);
-	} // end no game / game selected
-
-	// common command line options
-
-	// debug level
-	if (gPrefs->debug) {
-		StrIToA(num, gPrefs->debugLevel);
-		ArgsAdd(&argvP[argc], "-d", num, &argc);
-	}
-
-	if (engine == ENGINE_QUEEN || engine == ENGINE_SKY) {
-		// alternative intro ?
-		if (gPrefs->altIntro)
-			ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc);
-	}
-
-	if (engine == ENGINE_SCUMM) {
-		// demo mode ?
-		if (gPrefs->demoMode)
-			ArgsAdd(&argvP[argc], "--demo-mode", NULL, &argc);
-	}
-
-	// copy protection ?
-	if (gPrefs->copyProtection)
-		ArgsAdd(&argvP[argc], "--copy-protection", NULL, &argc);
-
-	// exceed max args ?
-	if (argc > MAX_ARG)
-		FrmCustomAlert(FrmErrorAlert, "Too many parameters.",0,0);
-
-	// set some common options
-	stackSize = (gPrefs->setStack ? STACK_LARGER : STACK_DEFAULT);
-	lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255);
-	toLauncher= (gPrefs->exitLauncher);
-
-	// gVars values
-	// (gVars->HRrefNum defined in checkHRmode on Clie)
-#ifndef _DEBUG_ENGINE
-	gVars->VFS.volRefNum	= (gPrefs->card.autoDetect ? vfsInvalidVolRef : gPrefs->card.volRefNum);
-#else
-	gVars->VFS.volRefNum	= gPrefs->card.volRefNum;
-#endif
-	gVars->vibrator			= gPrefs->vibrator;
-	gVars->stdPalette		= gPrefs->stdPalette;
-	gVars->VFS.cacheSize	= (gPrefs->card.useCache ? gPrefs->card.cacheSize : 0);
-	gVars->indicator.showLED= gPrefs->card.showLED;
-	gVars->stylusClick		= gPrefs->stylusClick;
-	gVars->autoSave			= (gPrefs->autoSave ? gPrefs->autoSavePeriod : -1);
-	gVars->advancedMode		= gPrefs->advancedMode;
-	gVars->arrowKeys		= gPrefs->arrowKeys;
-
-	// user params
-	HWR_RSTALL();
-
-	if (gPrefs->goLCD)
-		HWR_SET(INIT_GOLCD);
-	else
-		OPTIONS_RST(kOptGoLcdAPI);
-
-	if (!gPrefs->autoOff)
-		HWR_SET(INIT_AUTOOFF);
-
-	if (gVars->vibrator)
-		HWR_SET(INIT_VIBRATOR);
-/* ????
-	if (	musicDriver == 1 ||
-			musicDriver == 3 ||
-			musicDriver == 4 ||
-			musicDriver == sysInvalidRefNum) {
-		HWR_SET(INIT_PA1LIB);
-	}
-*/
-	if (ModImport(&gVars->VFS.volRefNum, engine, &isARM) != errNone) {
-		if (bDirectMode) {
-			// and force exit if nothing selected
-			EventType event;
-			event.eType = keyDownEvent;
-			event.data.keyDown.chr = vchrLaunch;
-			event.data.keyDown.modifiers = commandKeyMask;
-			EvtAddUniqueEventToQueue(&event, 0, true);
-		}
-		ArgsFree(argvP);
-		return false;
-	}
-
-	// reset mode if screen rotation occured (DIA only)
-	if (!direct && OPTIONS_TST(kOptCollapsible)) {
-		UInt8 mode = PalmScreenSize(0,0, &(gVars->screenFullWidth), &(gVars->screenFullHeight));
-		OPTIONS_RST(kOptModeLandscape);
-		OPTIONS_SET((mode == PALM_LANDSCAPE) ? kOptModeLandscape : kOptNone);
-	}
-
-	// free and save globals pref memory
-	GamCloseDatabase(false);
-	FrmCloseAllForms();
-	SavePrefs();
-
-	{
-		UInt16 cardNo;
-		UInt32 dbID;
-
-		LaunchParamType *cmdPBP = (LaunchParamType *)MemPtrNew(sizeof(LaunchParamType));
-
-		MemPtrSetOwner(cmdPBP, 0);
-		MemPtrSetOwner(gVars, 0);
-		ArgsSetOwner(argvP, 0);
-
-		cardNo = 0;
-		dbID = DmFindDatabase(0, "ScummVM-Engine");
-
-		if (isARM)
-			FtrSet(appFileCreator, ftrStack , (stackSize * 4));
-		else
-			ModSetStack(stackSize, cardNo, dbID);
-
-		cmdPBP->args.argc = argc;
-		cmdPBP->args.argv = argvP;
-		cmdPBP->gVars = gVars;
-		cmdPBP->lightspeed = lightspeed;
-		cmdPBP->exitLauncher = toLauncher;
-
-		SysUIAppSwitch(cardNo, dbID, sysAppLaunchCmdNormalLaunch, cmdPBP);
-		bLaunched = true;
-	}
-
-	return false;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp
deleted file mode 100644
index 4c3f722aa1..0000000000
--- a/backends/platform/PalmOS/Src/launcher/skin.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <PalmOSGlue.h>
-#include <SonyClie.h>
-
-#include "start.h"
-#include "games.h"
-#include "globals.h"
-#include "skin.h"
-#include "StarterRsc.h"
-
-UInt16 lastIndex = dmMaxRecordIndex;	// last select index in the list to prevent flash
-static WinHandle winLockH = NULL;
-
-MemPtr SknScreenLock(WinLockInitType initMode) {
-	Err e;
-	RectangleType r;
-
-	WinGetBounds(WinGetDisplayWindow(), &r);
-	winLockH = WinCreateOffscreenWindow(r.extent.x, r.extent.y, nativeFormat, &e);
-	WinSetDrawWindow(winLockH);
-
-	if (initMode == winLockCopy)
-		WinCopyRectangle(WinGetDisplayWindow(), winLockH, &r, 0, 0, winPaint);
-
-	return BmpGetBits(WinGetBitmap(winLockH));
-}
-
-void SknScreenUnlock() {
-	RectangleType r;
-
-	WinGetBounds(winLockH, &r);
-	WinCopyRectangle(winLockH, WinGetDisplayWindow(), &r, 0, 0, winPaint);
-	WinSetDrawWindow(WinGetDisplayWindow());
-	WinDeleteWindow(winLockH, false);
-	winLockH = NULL;
-}
-
-static void SknGetListColors(DmOpenRef skinDBP, UInt8 *text, UInt8 *selected, UInt8 *background) {
-	UInt16 colIndex;
-	MemHandle colH;
-	UInt8 *colTemp;
-
-	// default
-	*text = UIColorGetTableEntryIndex (UIMenuForeground);
-	*selected = UIColorGetTableEntryIndex (UIMenuSelectedForeground);
-	*background = UIColorGetTableEntryIndex (UIMenuSelectedFill);
-
-	if (skinDBP) {
-		colIndex = DmFindResource (skinDBP, sknColorsRsc, skinColors, NULL);
-
-		if (colIndex != (UInt16)-1) {
-			colH = DmGetResourceIndex(skinDBP, colIndex);
-
-			if (colH) {
-				colTemp = (UInt8 *)MemHandleLock(colH);
-
-				*text = colTemp[0];
-				*selected = colTemp[1];
-				*background = colTemp[2];
-
-				MemPtrUnlock(colTemp);
-				DmReleaseResource(colH);
-			}
-		}
-	}
-}
-
-static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType *srcRect, Coord destX, Coord destY) {
-	MemHandle hTemp;
-	BitmapPtr bmpTemp;
-	UInt16 index;
-
-	Coord cx, cy, cw, ch, bw, bh;
-	RectangleType copy, old;
-
-	if (skinDBP) {
-		// find the bitmap
-		index = DmFindResource (skinDBP, bitmapRsc, bitmapID, NULL);
-
-		if (index != (UInt16)-1) {
-			hTemp = DmGetResourceIndex(skinDBP,index);
-
-			if (hTemp) {
-				bmpTemp = (BitmapType *)MemHandleLock(hTemp);
-				BmpGlueGetDimensions(bmpTemp, &bw, &bh, 0);
-
-				if (!srcRect) {
-					cx = 0;
-					cy = 0;
-					cw = bw;
-					ch = bh;
-				} else {
-					cx = srcRect->topLeft.x;
-					cy = srcRect->topLeft.y;
-					cw = srcRect->extent.x;
-					ch = srcRect->extent.y;
-				}
-
-				if (ch) {
-					WinGetClip(&old);
-					if (OPTIONS_TST(kOptModeHiDensity)) {
-						Err e;
-						BitmapTypeV3 *bmp2P;
-
-						// create an uncompressed version of the bitmap
-						WinHandle win = WinCreateOffscreenWindow(bw, bh, screenFormat, &e);
-						WinHandle old = WinGetDrawWindow();
-						WinSetDrawWindow(win);
-						WinDrawBitmap(bmpTemp, 0, 0);
-						WinSetDrawWindow(old);
-
-						bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
-
-						copy.topLeft.x = destX / 2;
-						copy.topLeft.y = destY / 2;
-						copy.extent.x = cw / 2;
-						copy.extent.y = ch / 2;
-
-						WinSetClip(&copy);
-						WinDrawBitmap((BitmapPtr)bmp2P, (destX - cx) / 2, (destY - cy) / 2);
-						BmpDelete((BitmapPtr)bmp2P);
-						WinDeleteWindow(win, false);
-
-					} else {
-						copy.topLeft.x = destX;
-						copy.topLeft.y = destY;
-						copy.extent.x = cw;
-						copy.extent.y = ch;
-
-						HRWinSetClip(gVars->HRrefNum, &copy);
-						HRWinDrawBitmap(gVars->HRrefNum, bmpTemp, destX - cx, destY - cy);
-					}
-					WinSetClip(&old);
-				}
-
-				MemPtrUnlock(bmpTemp);
-				DmReleaseResource(hTemp);
-			}
-		}
-	}
-}
-
-void SknApplySkin() {
-	DmOpenRef skinDBP;
-	RectangleType r;
-	FormPtr frmP = FrmGetActiveForm();
-
-	// draw skin
-	FrmDrawForm(frmP);
-	SknScreenLock(winLockCopy);
-
-	skinDBP = SknOpenSkin();
-
-	if (gPrefs->card.volRefNum != vfsInvalidVolRef)
-		FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSBitMap));
-	else
-		FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSNoneBitMap));
-
-	WinSetForeColor(255);
-	WinSetDrawMode(winPaint);
-	WinDrawLine (0, 14, 159, 14);
-	WinDrawLine (0, 13, 159, 13);
-
-	SknGetObjectBounds(skinDBP, skinBackgroundImageTop, &r);
-	SknCopyBits(skinDBP, skinBackgroundImageTop, 0, r.topLeft.x, r.topLeft.y);
-	SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &r);
-	SknCopyBits(skinDBP, skinBackgroundImageBottom, 0, r.topLeft.x, r.topLeft.y);
-
-	for (UInt16 resID = 1100; resID <= 7000; resID += 100) {
-		SknSetState(skinDBP, resID, sknStateNormal);
-		SknShowObject(skinDBP, resID);
-	}
-
-	SknCloseSkin(skinDBP);
-	SknScreenUnlock();
-	SknUpdateList();
-}
-
-void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP) {
-
-	UInt16 bmpIndex, strIndex;
-	MemHandle hBmp, hStr;
-	BitmapType *bmpTemp;
-	UInt8 *strTemp;
-
-	RctSetRectangle(rP, 0, 0, 0, 0);
-
-	if (skinDBP) {
-		bmpIndex = DmFindResource (skinDBP, bitmapRsc, resID, NULL);
-
-		if (bmpIndex != (UInt16)-1) {						// if bmp exists
-			strIndex = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-
-			if (strIndex != (UInt16)-1) {					// if params exist
-				hBmp = DmGetResourceIndex(skinDBP,bmpIndex);
-
-				if (hBmp) {
-					hStr = DmGetResourceIndex(skinDBP,strIndex);
-
-					if (hStr) {
-					//	buttons : state|x|y|w/h slider|draw mode|x1/y1 keep|x2/y2 keep slider
-					//	list (160mode) : state|x|y|w|h|
-						bmpTemp = (BitmapType *)MemHandleLock(hBmp);
-						strTemp = (UInt8 *)MemHandleLock(hStr);
-
-						BmpGlueGetDimensions(bmpTemp, &(rP->extent.x), &(rP->extent.y), 0);
-						rP->topLeft.x = strTemp[sknInfoPosX] * 2;
-						rP->topLeft.y = strTemp[sknInfoPosY] * 2;
-
-						MemPtrUnlock(strTemp);
-						DmReleaseResource(hStr);
-					}
-
-					MemPtrUnlock(bmpTemp);
-					DmReleaseResource(hBmp);
-				}
-			}
-		}
-	}
-}
-
-DmOpenRef SknOpenSkin() {
-	return DmOpenDatabase(gPrefs->skin.cardNo, gPrefs->skin.dbID, dmModeReadOnly);
-}
-
-void SknCloseSkin(DmOpenRef skinDBP) {
-	if (skinDBP)
-		DmCloseDatabase(skinDBP);
-}
-
-UInt8 SknSetState(DmOpenRef skinDBP, DmResID resID, UInt8 newState) {
-
-	UInt16 index;
-	MemHandle hStr;
-	UInt8 *strTemp;
-	UInt8 oldState = 0;
-
-	if (skinDBP) {
-		index = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-
-		if (index != (UInt16)-1) {
-			hStr = DmGetResourceIndex(skinDBP, index);
-
-			if (hStr) {
-				strTemp = (UInt8 *)MemHandleLock(hStr);
-				oldState = strTemp[sknInfoState];
-
-				if (oldState != newState) {
-					DmWrite(strTemp, 0, &newState, 1);
-				}
-
-				MemPtrUnlock(strTemp);
-				DmReleaseResource(hStr);
-			}
-		}
-	}
-
-	return oldState;
-}
-
-UInt8 SknGetDepth(DmOpenRef skinDBP) {
-	UInt16 index;
-	MemHandle hStr;
-	UInt8 *strTemp;
-	UInt8 depth = 8;
-
-	if (skinDBP) {
-		index = DmFindResource (skinDBP, sknDepthRsc, skinDepth, NULL);
-
-		if (index != (UInt16)-1) {
-			hStr = DmGetResourceIndex(skinDBP, index);
-
-			if (hStr) {
-				strTemp = (UInt8 *)MemHandleLock(hStr);
-				depth = *strTemp;
-				MemPtrUnlock(strTemp);
-				DmReleaseResource(hStr);
-			}
-		}
-	}
-
-	return depth;
-}
-
-UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID) {
-	UInt16 index;
-	MemHandle hStr;
-	UInt8 *strTemp;
-	UInt8 oldState = sknStateDisabled;
-
-	if (skinDBP) {
-		index = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-
-		if (index != (UInt16)-1) {
-			hStr = DmGetResourceIndex(skinDBP, index);
-
-			if (hStr) {
-				strTemp = (UInt8 *)MemHandleLock(hStr);
-				oldState = strTemp[sknInfoState];
-				MemPtrUnlock(strTemp);
-				DmReleaseResource(hStr);
-			}
-		}
-	}
-
-	return oldState;
-}
-
-void SknShowObject(DmOpenRef skinDBP, DmResID resID) {
-	RectangleType r;
-	UInt8 state = SknGetState(skinDBP, resID);
-	SknGetObjectBounds(skinDBP, resID, &r);
-	SknCopyBits(skinDBP, resID + state, NULL, r.topLeft.x, r.topLeft.y);
-}
-
-void SknGetListBounds(RectangleType *rAreaP, RectangleType *rArea2xP) {
-	DmOpenRef skinDBP;
-	UInt16 strIndex;
-	MemHandle hStr;
-	UInt8 *strTemp;
-	UInt16 x,y,w,h;
-
-	skinDBP = DmOpenDatabase(gPrefs->skin.cardNo, gPrefs->skin.dbID, dmModeReadOnly);
-	if (skinDBP) {
-		strIndex = DmFindResource (skinDBP, sknPosRsc, skinList, NULL);
-
-		if (strIndex != 0xFFFF) {					// if params exist
-			hStr = DmGetResourceIndex(skinDBP,strIndex);
-			if (hStr) {
-				strTemp = (UInt8 *)MemHandleLock(hStr);
-
-				x = strTemp[sknInfoPosX];
-				y = strTemp[sknInfoPosY];
-				w = strTemp[sknInfoListWidth];
-				h = strTemp[sknInfoListSize] * sknInfoListItemSize;
-
-				if (rAreaP)
-					RctSetRectangle(rAreaP ,x, y, w, h);
-				if (rArea2xP)
-					RctSetRectangle(rArea2xP, x+x, y+y, w+w, h+h);
-
-				MemHandleUnlock(hStr);
-				DmReleaseResource(hStr);
-			}
-		}
-
-		DmCloseDatabase(skinDBP);
-	}
-}
-
-static void SknRedrawTools(DmOpenRef skinDBP) {
-	if (GamGetSelected() == dmMaxRecordIndex) {
-		if (SknGetState(skinDBP, skinButtonGameDelete) == sknStateNormal) {
-			SknSetState(skinDBP, skinButtonGameDelete,sknStateDisabled);
-			SknShowObject(skinDBP, skinButtonGameDelete);
-		}
-		if (SknGetState(skinDBP, skinButtonGameEdit) == sknStateNormal) {
-			SknSetState(skinDBP, skinButtonGameEdit,sknStateDisabled);
-			SknShowObject(skinDBP, skinButtonGameEdit);
-		}
-		if (SknGetState(skinDBP, skinButtonGameAudio) == sknStateNormal) {
-			SknSetState(skinDBP, skinButtonGameAudio,sknStateDisabled);
-			SknShowObject(skinDBP, skinButtonGameAudio);
-		}
-
-	} else {
-		if (SknGetState(skinDBP, skinButtonGameDelete) == sknStateDisabled) {
-			SknSetState(skinDBP, skinButtonGameDelete,sknStateNormal);
-			SknShowObject(skinDBP, skinButtonGameDelete);
-		}
-		if (SknGetState(skinDBP, skinButtonGameEdit) == sknStateDisabled) {
-			SknSetState(skinDBP, skinButtonGameEdit,sknStateNormal);
-			SknShowObject(skinDBP, skinButtonGameEdit);
-		}
-		if (SknGetState(skinDBP, skinButtonGameAudio) == sknStateDisabled) {
-			SknSetState(skinDBP, skinButtonGameAudio,sknStateNormal);
-			SknShowObject(skinDBP, skinButtonGameAudio);
-		}
-	}
-}
-
-static void SknRedrawSlider(DmOpenRef skinDBP, UInt16 index, UInt16 maxIndex, UInt16 perPage) {
-	if (maxIndex <= perPage) {
-		if (SknGetState(skinDBP,skinSliderUpArrow) != sknStateDisabled) {
-			SknSetState(skinDBP,skinSliderUpArrow,sknStateDisabled);
-			SknShowObject(skinDBP,skinSliderUpArrow);
-		}
-		if (SknGetState(skinDBP,skinSliderDownArrow) != sknStateDisabled) {
-			SknSetState(skinDBP,skinSliderDownArrow,sknStateDisabled);
-			SknShowObject(skinDBP,skinSliderDownArrow);
-		}
-
-	} else {
-		if (SknGetState(skinDBP,skinSliderUpArrow) == sknStateDisabled) {
-			SknSetState(skinDBP,skinSliderUpArrow,sknStateNormal);
-			SknShowObject(skinDBP,skinSliderUpArrow);
-		}
-		if (SknGetState(skinDBP,skinSliderDownArrow) == sknStateDisabled) {
-			SknSetState(skinDBP,skinSliderDownArrow,sknStateNormal);
-			SknShowObject(skinDBP,skinSliderDownArrow);
-		}
-	}
-}
-
-void SknUpdateList() {
-	MemHandle record;
-	Int32 index, maxIndex, maxView;
-	GameInfoType *game;
-	RectangleType rArea, rField, rCopy, rArea2x;
-	DmOpenRef skinDBP;
-
-	UInt8 txtColor, norColor, selColor, bkgColor;
-	UInt16 x,y;
-
-	SknScreenLock(winLockCopy);
-
-	SknGetListBounds(&rArea, &rArea2x);
-	skinDBP = SknOpenSkin();
-	// set default bg
-	WinSetForeColor(UIColorGetTableEntryIndex (UIFormFill));
-	WinDrawRectangle(&rArea,0);
-	// copy top bg
-	SknGetObjectBounds(skinDBP, skinBackgroundImageTop, &rField);
-	RctGetIntersection(&rArea2x, &rField, &rCopy);
-	x = rCopy.topLeft.x;
-	y = rCopy.topLeft.y;
-	rCopy.topLeft.x	-= rField.topLeft.x;
-	rCopy.topLeft.y	-= rField.topLeft.y;
-	SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y);
-	// copy bottom bg
-	SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &rField);
-	RctGetIntersection(&rArea2x, &rField, &rCopy);
-	x = rCopy.topLeft.x;
-	y = rCopy.topLeft.y;
-	rCopy.topLeft.x	-= rField.topLeft.x;
-	rCopy.topLeft.y	-= rField.topLeft.y;
-	SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y);
-
-	FntSetFont(stdFont);
-
-	index = gPrefs->listPosition;
-	maxIndex = DmNumRecords(gameDB);
-	maxView = rArea.extent.y / sknInfoListItemSize;
-
-	if (index > 0 && (index + maxView) > maxIndex)
-		index -= (index + maxView) - maxIndex;
-
-	if (index < 0)
-		index = 0;
-
-	gPrefs->listPosition = index;
-
-	SknRedrawSlider(skinDBP, index, maxIndex, maxView);
-	SknRedrawTools(skinDBP);
-	SknGetListColors(skinDBP, &norColor, &selColor, &bkgColor);
-
-	SknCloseSkin(skinDBP);
-
-	while (index < (gPrefs->listPosition + maxView) && index < maxIndex) {
-		record = DmQueryRecord(gameDB, index);
-		game = (GameInfoType *)MemHandleLock(record);
-
-		// text box
-		RctSetRectangle(&rField, rArea.topLeft.x, (rArea.topLeft.y + sknInfoListItemSize * (index - gPrefs->listPosition)), rArea.extent.x, sknInfoListItemSize);
-		WinSetClip(&rField);
-
-		if (game->selected) {
-			WinSetDrawMode(winPaint);
-			WinSetForeColor(bkgColor);
-			WinDrawRectangle(&rField,0);
-			txtColor = selColor;
-		}
-		else
-			txtColor = norColor;
-
-		// clipping
-		rField.topLeft.x += 2;
-		rField.extent.x -= 4;
-		WinSetClip(&rField);
-		// draw text mask
-		WinSetTextColor(255);
-		WinSetDrawMode(winMask);
-		WinPaintChars(game->nameP, StrLen(game->nameP), rField.topLeft.x, rField.topLeft.y);
-		// draw text
-		if (txtColor) {
-			WinSetTextColor(txtColor);
-			WinSetDrawMode(winOverlay);
-			WinPaintChars(game->nameP, StrLen(game->nameP), rField.topLeft.x, rField.topLeft.y);
-		}
-
-		MemHandleUnlock(record);
-		index++;
-	}
-
-	RctSetRectangle(&rArea,0,0,160,160);
-	WinSetClip(&rArea);
-	SknScreenUnlock();
-}
-
-UInt16 SknCheckClick(DmOpenRef skinDBP, Coord mx, Coord my) {
-	UInt16 resID;
-	RectangleType r;
-
-	mx *= 2;
-	my *= 2;
-
-	if (skinDBP) {
-		for (resID = 1100; resID <= 7000; resID += 100) {
-			if (SknGetState(skinDBP, resID) != sknStateDisabled) {
-				SknGetObjectBounds(skinDBP, resID, &r);
-				if (RctPtInRectangle(mx, my, &r)) {
-					return resID;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-void SknSelect(Coord x, Coord y) {
-	RectangleType rArea;
-	SknGetListBounds(&rArea,0);
-
-	if (RctPtInRectangle(x, y, &rArea)) {
-		UInt16 index;
-		MemHandle record;
-		GameInfoType *game;
-		UInt16 oldIndex;
-
-		index = (y - rArea.topLeft.y) / sknInfoListItemSize + gPrefs->listPosition;
-
-		if (index == lastIndex)
-			return;
-
-		if (index < DmNumRecords(gameDB)) {
-			Boolean newValue;
-
-			oldIndex = GamGetSelected();
-
-			if (oldIndex != index && oldIndex != dmMaxRecordIndex)
-				GamUnselect();
-
-			record = DmGetRecord(gameDB, index);
-			game = (GameInfoType *)MemHandleLock(record);
-
-			newValue = !game->selected;
-			DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean));
-
-			MemHandleUnlock(record);
-			DmReleaseRecord (gameDB, index, 0);
-
-			lastIndex = index;
-			SknUpdateList();
-		}
-	}
-}
-
-Boolean SknProcessArrowAction(UInt16 button) {
-	Boolean handled = false;
-
-	switch (button) {
-		case skinSliderUpArrow:
-			if (gPrefs->listPosition > 0) {
-				gPrefs->listPosition--;
-				SknUpdateList();
-			}
-			handled = true;
-			break;
-
-		case skinSliderDownArrow:
-			RectangleType rArea;
-			UInt16 maxView;
-
-			SknGetListBounds(&rArea, 0);
-			maxView = rArea.extent.y / sknInfoListItemSize;
-
-			if (gPrefs->listPosition < DmNumRecords(gameDB)-maxView) {
-				gPrefs->listPosition++;
-				SknUpdateList();
-			}
-			handled = true;
-			break;
-	}
-
-	return handled;
-}
diff --git a/backends/platform/PalmOS/Src/launcher/skin.h b/backends/platform/PalmOS/Src/launcher/skin.h
deleted file mode 100644
index e8a81e7e2d..0000000000
--- a/backends/platform/PalmOS/Src/launcher/skin.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __SKIN_H__
-#define __SKIN_H__
-
-// skin
-#define	sknInfoState		0
-#define	sknInfoPosX			1
-#define	sknInfoPosY			2
-
-#define	sknInfoMaxWOrH		3
-#define	sknInfoDrawMode		4
-#define	sknInfoKeepXOrY1	5
-#define	sknInfoKeepXOrY2	7
-
-#define sknInfoListWidth	sknInfoMaxWOrH
-#define sknInfoListHeight	sknInfoDrawMode
-#define sknInfoListSize		sknInfoListHeight
-#define sknInfoListItemSize	12
-
-#define	sknPosRsc			'sPos'
-#define	sknColorsRsc		'sCol'
-#define	sknDepthRsc			'sDep'
-
-#define sknStateNormal		0
-#define sknStateSelected	10
-#define sknStateDisabled	20
-
-#define sknSelectedState(bmp)	(bmp + sknStateSelected)
-#define sknDisabledState(bmp)	(bmp + sknStateDisabled)
-
-// skin elements
-#define skinList					500
-#define	skinColors					600
-#define skinDepth					700
-
-#define skinButtonNone				0
-
-#define skinSliderUpArrow			2000
-#define skinSliderDownArrow			2100
-
-#define skinButtonGameParams		3000
-#define skinButtonGameAdd			3100
-#define skinButtonGameEdit			3200
-#define skinButtonGameAudio			3300
-#define skinButtonGameDelete		4000
-#define skinButtonGameStart			7000
-
-#define	skinBackgroundImageTop			1000
-#define	skinBackgroundImageBottom		1010
-///
-
-
-#define skinToolsBackground			1100
-
-#define	skinListUpArrowNormal		1500
-#define	skinListUpArrowOver			1510
-#define	skinListUpArrowDisabled		1540
-
-#define skinListDownArrowNormal		1800
-#define	skinListDownArrowOver		1810
-#define	skinListDownArrowDisabled	1840
-
-#define skinButtonGameInfoNormal	2000
-#define skinButtonGameInfoOver		2010
-#define skinButtonGameInfoDisabled	2040
-
-#define skinButtonGameParamNormal	3000
-#define skinButtonGameParamOver		3010
-
-#define skinButtonGameDeleteNormal		4000
-#define skinButtonGameDeleteOver		4010
-#define skinButtonGameDeleteDisabled	4040
-
-#define skinButtonVibratorNormal		5000
-#define skinButtonVibratorOver			5010
-#define skinButtonVibratorSelected		5020
-#define skinButtonVibratorSelectedOver	5030
-#define skinButtonVibratorDisabled		5040
-
-
-#define skinButtonSleepNormal		6000
-#define skinButtonSleepOver			6010
-#define skinButtonSleepSelected		6020
-#define skinButtonSleepSelectedOver	9030
-
-#define skinButtonPlayNormal		7000
-#define skinButtonPlayOver			7010
-#define skinButtonPlayDisabled		7040
-
-// protos
-void SknApplySkin();
-void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP);
-DmOpenRef SknOpenSkin();
-void SknCloseSkin(DmOpenRef skinDBP);
-UInt8 SknSetState(DmOpenRef skinDBP, DmResID resID, UInt8 newState);
-void SknShowObject(DmOpenRef skinDBP, DmResID resID);
-UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID);
-void SknUpdateList();
-void SknGetListBounds(RectangleType *rAreaP, RectangleType *rArea2xP);
-UInt16 SknCheckClick(DmOpenRef skinDBP, Coord mx, Coord my);
-void SknSelect(Coord x, Coord y);
-Boolean SknProcessArrowAction(UInt16 button);
-UInt8 SknGetDepth(DmOpenRef skinDBP);
-
-extern UInt16 lastIndex;
-
-#endif
diff --git a/backends/platform/PalmOS/Src/launcher/start.cpp b/backends/platform/PalmOS/Src/launcher/start.cpp
deleted file mode 100644
index b5e8f24884..0000000000
--- a/backends/platform/PalmOS/Src/launcher/start.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include <SonyClie.h>
-
-#include "palmdefs.h"
-#include "start.h"
-#include "games.h"
-#include "globals.h"
-#include "modules.h"
-#include "skin.h"
-
-#include "forms.h"
-
-/***********************************************************************
- *
- *	Global variables
- *
- ***********************************************************************/
-GlobalsPreferencePtr gPrefs;
-GlobalsDataPtr gVars;
-
-Boolean bDirectMode = false;
-Boolean bLaunched	= false;
-
-/***********************************************************************
- *
- *	Internal Constants
- *
- ***********************************************************************/
-
-// Define the minimum OS version we support (3.5 for now).
-#define kOurMinVersion	sysMakeROMVersion(3,5,0,sysROMStageRelease,0)
-#define kPalmOS10Version	sysMakeROMVersion(1,0,0,sysROMStageRelease,0)
-
-/***********************************************************************
- *
- *	Internal Functions
- *
- ***********************************************************************/
-
-// Callback for ExgDBWrite to send data with Exchange Manager
-static Err WriteDBData(const void* dataP, UInt32* sizeP, void* userDataP) {
-	Err err;
-	*sizeP = ExgSend((ExgSocketPtr)userDataP, (void*)dataP, *sizeP, &err);
-	return err;
-}
-
-Err SendDatabase (UInt16 cardNo, LocalID dbID, Char *nameP, Char *descriptionP) {
-	ExgSocketType exgSocket;
-	Err err;
-
-	// Create exgSocket structure
-	MemSet(&exgSocket, sizeof(exgSocket), 0);
-	exgSocket.description = descriptionP;
-	exgSocket.name = nameP;
-
-	// Start an exchange put operation
-	err = ExgPut(&exgSocket);
-	if (!err) {
-		err = ExgDBWrite(WriteDBData, &exgSocket, NULL, dbID, cardNo);
-		err = ExgDisconnect(&exgSocket, err);
-	}
-
-	return err;
-}
-
-
-/***********************************************************************
- *
- * FUNCTION:    RomVersionCompatible
- *
- * DESCRIPTION: This routine checks that a ROM version is meet your
- *              minimum requirement.
- *
- * PARAMETERS:  requiredVersion - minimum rom version required
- *                                (see sysFtrNumROMVersion in SystemMgr.h
- *                                for format)
- *              launchFlags     - flags that indicate if the application
- *                                UI is initialized.
- *
- * RETURNED:    error code or zero if rom is compatible
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static Err RomVersionCompatible(UInt32 requiredVersion, UInt16 launchFlags) {
-	UInt32 romVersion;
-
-	// See if we're on in minimum required version of the ROM or later.
-	FtrGet(sysFtrCreator, sysFtrNumROMVersion, &romVersion);
-	if (romVersion < requiredVersion) {
-		if ((launchFlags & (sysAppLaunchFlagNewGlobals | sysAppLaunchFlagUIApp)) ==
-			(sysAppLaunchFlagNewGlobals | sysAppLaunchFlagUIApp)) {
-
-			FrmAlert (RomIncompatibleAlert);
-
-			// Palm OS 1.0 will continuously relaunch this app unless we switch to
-			// another safe one.
-			if (romVersion <= kPalmOS10Version)
-				AppLaunchWithCommand(sysFileCDefaultApp, sysAppLaunchCmdNormalLaunch, NULL);
-
-		}
-		return sysErrRomIncompatible;
-	}
-
-	return errNone;
-}
-
-///////////////////////////////////////////////////////////////////////
-
-
-void SavePrefs() {
-	if (gPrefs) {
-		PrefSetAppPreferences(appFileCreator, appPrefID, appPrefVersionNum, gPrefs, sizeof (GlobalsPreferenceType), true);
-		MemPtrFree(gPrefs);
-		gPrefs = NULL;
-	}
-}
-
-/***********************************************************************
- *
- * FUNCTION:    AppHandleEvent
- *
- * DESCRIPTION: This routine loads form resources and set the event
- *              handler for the form loaded.
- *
- * PARAMETERS:  event  - a pointer to an EventType structure
- *
- * RETURNED:    true if the event has handle and should not be passed
- *              to a higher level handler.
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static Boolean AppHandleEvent(EventPtr eventP) {
-	UInt16 formId;
-	FormPtr frmP;
-
-	if (eventP->eType == frmLoadEvent) {
-		// Load the form resource.
-		formId = eventP->data.frmLoad.formID;
-		frmP = FrmInitForm(formId);
-		FrmSetActiveForm(frmP);
-
-		// Set the event handler for the form.  The handler of the currently
-		// active form is called by FrmHandleEvent each time is receives an
-		// event.
-		switch (formId) {
-			case MainForm:
-				FrmSetEventHandler(frmP, MainFormHandleEvent);
-				break;
-
-			case SkinsForm:
-				FrmSetEventHandler(frmP, SkinsFormHandleEvent);
-				break;
-
-			case GameEditForm:
-				FrmSetEventHandler(frmP, EditGameFormHandleEvent);
-				break;
-
-			case MiscForm:
-				FrmSetEventHandler(frmP, MiscFormHandleEvent);
-				break;
-
-			case CardSlotForm:
-				FrmSetEventHandler(frmP, CardSlotFormHandleEvent);
-				break;
-
-			case MusicForm:
-				FrmSetEventHandler(frmP, MusicFormHandleEvent);
-				break;
-
-			case InfoForm:
-				FrmSetEventHandler(frmP, InfoFormHandleEvent);
-				break;
-
-			case EngineForm:
-				FrmSetEventHandler(frmP, SelectorFormHandleEvent);
-				break;
-
-			default:
-//				ErrFatalDisplay("Invalid Form Load Event");
-				break;
-		}
-		return true;
-		}
-
-	return false;
-}
-
-/***********************************************************************
- *
- * FUNCTION:    AppEventLoop
- *
- * DESCRIPTION: This routine is the event loop for the application.
- *
- * PARAMETERS:  nothing
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static void AppEventLoop(void) {
-	UInt16 error;
-	EventType event;
-
-	do {
-		EvtGetEvent(&event, evtNoWait);
-
-		if (! SysHandleEvent(&event))
-			if (! MenuHandleEvent(0, &event, &error))
-				if (! AppHandleEvent(&event))
-					FrmDispatchEvent(&event);
-
-	} while (event.eType != appStopEvent);
-}
-
-/***********************************************************************
- *
- * FUNCTION:    ScummVMPalmMain
- *
- * DESCRIPTION: This is the main entry point for the application.
- *
- * PARAMETERS:  cmd - word value specifying the launch code.
- *              cmdPB - pointer to a structure that is associated with the launch code.
- *              launchFlags -  word value providing extra information about the launch.
- *
- * RETURNED:    Result of launch
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static void AppLaunchCmdNotify(UInt16 LaunchFlags, SysNotifyParamType * pData) {
-	switch (pData->notifyType) {
-		case sysNotifyVolumeMountedEvent:
-			pData->handled = true;	// don't switch
-
-			if (gPrefs) {	// gPrefs exists ? so we are in the palm selector
-				CardSlotFormUpdate(); // redraw card list if needed
-
-				if (gPrefs->card.volRefNum == vfsInvalidVolRef) {
-					VFSAnyMountParamType *notifyDetailsP = (VFSAnyMountParamType *)pData->notifyDetailsP;
-					gPrefs->card.volRefNum = notifyDetailsP->volRefNum;
-
-					if (FrmGetFormPtr(MainForm) == FrmGetActiveForm())
-						if (gPrefs->card.volRefNum != vfsInvalidVolRef) {
-							CardSlotCreateDirs();
-							FrmUpdateForm(MainForm, frmRedrawUpdateMSImport);
-						}
-				}
-			}
-			break;
-
-		case sysNotifyVolumeUnmountedEvent:
-			if (gPrefs) {
-				CardSlotFormUpdate();
-
-				if (gPrefs->card.volRefNum == (UInt16)pData->notifyDetailsP) {
-					gPrefs->card.volRefNum = vfsInvalidVolRef;
-
-					if (FrmGetFormPtr(MainForm) == FrmGetActiveForm())
-						FrmUpdateForm(MainForm, frmRedrawUpdateMS);
-				}
-			}
-			break;
-
-		case sysNotifyDisplayResizedEvent:
-			if (gVars)
-				if (FrmGetFormPtr(MainForm) == FrmGetActiveForm())
-					SknApplySkin();
-			break;
-
-		case sonySysNotifyMsaEnforceOpenEvent:
-			// what am i supposed to do here ???
-			break;
-	}
-}
-
-static UInt32 ScummVMPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) {
-	Err error;
-
-	error = RomVersionCompatible (kOurMinVersion, launchFlags);
-	if (error) return (error);
-
-	switch (cmd) {
-		case sysAppLaunchCmdNotify:
-			AppLaunchCmdNotify(launchFlags, (SysNotifyParamType *) cmdPBP);
-			break;
-
-		case sysAppLaunchCustomEngineDelete:
-#ifndef _DEBUG_ENGINE
-			ModDelete();
-#endif
-			break;
-
-		case sysAppLaunchCmdNormalLaunch:
-			error = AppStart();
-			if (error)
-				goto end;
-
-			if (!bDirectMode) {
-				FrmGotoForm(MainForm);
-			}else {
-				GamUnselect();
-				FrmGotoForm(EngineForm);
-			}
-
-			AppEventLoop();
-end:
-			AppStop();
-			break;
-
-		default:
-			break;
-
-	}
-	return error;
-}
-
-/***********************************************************************
- *
- * FUNCTION:    PilotMain
- *
- * DESCRIPTION: This is the main entry point for the application.
- *
- * PARAMETERS:  cmd - word value specifying the launch code.
- *              cmdPB - pointer to a structure that is associated with the launch code.
- *              launchFlags -  word value providing extra information about the launch.
- * RETURNED:    Result of launch
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-UInt32 PilotMain( UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) {
-	return ScummVMPalmMain(cmd, cmdPBP, launchFlags);
-}
diff --git a/backends/platform/PalmOS/Src/launcher/start.h b/backends/platform/PalmOS/Src/launcher/start.h
deleted file mode 100644
index 3ed52b465b..0000000000
--- a/backends/platform/PalmOS/Src/launcher/start.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __START_H__
-#define __START_H__
-
-typedef struct {
-	Char nameP[32];
-	UInt16 cardNo;
-	LocalID dbID;
-} SkinInfoType, *SkinInfoPtr;
-
-typedef	struct {
-
-	//skin params
-	SkinInfoType skin;	//	card where is located the skin
-	Boolean soundClick;
-
-	Boolean vibrator;
-	Boolean autoOff;
-	Boolean setStack;
-	Boolean exitLauncher;
-	Boolean goLCD;
-	Boolean stylusClick;
-	Boolean arrowKeys;
-
-	UInt16 listPosition;
-	UInt16 autoSavePeriod;
-
-	struct {
-		UInt16 volRefNum;
-		UInt32 cacheSize;
-		Boolean useCache;
-		Boolean showLED;
-		Boolean autoDetect;
-		Boolean moveDB;
-		Boolean deleteDB;
-		Boolean confirmMoveDB;
-	} card;
-
-	Boolean debug;
-	UInt16 debugLevel;
-	Boolean stdPalette;
-	Boolean demoMode;
-	Boolean copyProtection;
-	Boolean oldarm;// TODO : free slot...
-	Boolean altIntro;
-	Boolean autoSave;
-	Boolean advancedMode;
-
-	struct {
-		Boolean enable;
-		UInt8 mode;
-	} lightspeed;
-
-} GlobalsPreferenceType, *GlobalsPreferencePtr;
-
-extern GlobalsPreferencePtr gPrefs;
-
-extern Boolean bDirectMode;
-extern Boolean bLaunched;
-
-#define appPrefID				0x00
-#define appVersionNum			0x01
-#define appPrefVersionNum		0x02
-
-#define STACK_DEFAULT			8192
-#define STACK_LARGER			16384
-#define STACK_GET				0
-
-Err AppStart(void);
-void AppStop(void);
-Boolean StartScummVM(Int16 engine = -1);
-void SavePrefs();
-Err SendDatabase (UInt16 cardNo, LocalID dbID, Char *nameP, Char *descriptionP);
-#endif
diff --git a/backends/platform/PalmOS/Src/modules.cpp b/backends/platform/PalmOS/Src/modules.cpp
deleted file mode 100644
index b16e2cf7d5..0000000000
--- a/backends/platform/PalmOS/Src/modules.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <PalmOS.h>
-
-#include "palmdefs.h"
-#include "args.h"
-#include "globals.h"
-#include "modules.h"
-#include "features.h"
-
-#include "rumble.h"
-#include "init_mathlib.h"
-#include "init_pa1lib.h"
-#include "init_palmos.h"
-#include "init_stuffs.h"
-#include "init_sony.h"
-#include "init_golcd.h"
-
-#ifndef DISABLE_LIGHTSPEED
-#include "lightspeed_public.h"
-#endif
-
-GlobalsDataPtr gVars;
-
-#include "endianutils.h"
-#include <PNOLoader.h>
-
-#ifdef COMPILE_ZODIAC
-#	include <tapwave.h>
-#	include <TwRuntime.h>
-#endif
-
-void run(int argc, char *argv[]) {
-	// init args
-	ArgsExportInit(argv, argc, true);
-
-	// init system
-	PalmHRInit(16);
-	PalmInit(HWR_GET());
-	void *__ptr = StuffsForceVG();
-
-	gVars->screenPitch = StuffsGetPitch(gVars->screenFullWidth);
-
-	// export global struct to ARM
-	VARS_EXPORT();
-	DO_VARS(_4B, 32, 0);
-	DO_VARS(_2B, 16, (gVars->_4B * sizeof(UInt32)));
-	FtrSet(appFileCreator, ftrVars , (UInt32)gVars);
-
-	// run the module
-#ifdef COMPILE_ZODIAC
-	NativeFuncType *entry;
-	TwLoadModule(0, 0, 0, 1, twLoadFlagTNA|twLoadFlagQuickRun, &entry);
-#else
-	PnoDescriptor pno;
-	PnoLoadFromResources(&pno, 'ARMC', 1, appFileCreator, 1);
-	PnoCall(&pno, 0);
-	PnoUnload(&pno);
-#endif
-
-	// reset globals
-	DO_VARS(_4B, 32, 0);
-	DO_VARS(_2B, 16, (gVars->_4B * sizeof(UInt32)));
-
-	// release
-	StuffsReleaseVG(__ptr);
-	PalmRelease(HWR_GET());
-	PalmHRRelease();
-
-	// free args
-	ArgsExportRelease(true);
-	ArgsFree(argv);
-
-	// release global struct
-	FtrUnregister(appFileCreator, ftrVars);
-	FtrUnregister(appFileCreator, ftrStack);
-	MemPtrFree(gVars);
-
-	// reset the palette if needed
-	WinPalette(winPaletteSetToDefault, 0, 256, NULL);
-}
-
-static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
-{
-	UInt32 result = 0;
-
-	switch (cmd) {
-		case sysAppLaunchCustomEngineGetInfo: {
-#ifdef PALMOS_NATIVE
-			result = GET_MODEARM;
-#else
-#	if	defined(ENABLE_SCUMM) || \
-		defined(ENABLE_AGOS) || \
-		defined(ENABLE_SWORD1)
-			result = GET_DATACOMMON|GET_DATAENGINE|GET_MODE68K;
-#	else
-			result = GET_DATACOMMON|GET_MODE68K;
-#	endif
-#endif
-			break;
-		}
-
-		case sysAppLaunchCmdNormalLaunch: {
-			if (cmdPBP) {
-				Char **argvP;
-				UInt16 cardNo;
-				LocalID dbID;
-
-				LaunchParamType *lp = (LaunchParamType *)cmdPBP;
-
-				gVars = lp->gVars;
-				argvP = lp->args.argv;
-
-				// get the free memory on the dynamic heap
-				PalmGetMemory(0,0,0, &(gVars->startupMemory));
-
-#ifndef DISABLE_LIGHTSPEED
-				switch (lp->lightspeed) {
-					case 0:
-						LS_SetCPUSpeedHigh();
-						break;
-					case 1:
-						LS_SetCPUSpeedNormal();
-						break;
-					case 2:
-						LS_SetCPUSpeedLow();
-						break;
-				}
-#endif
-	//			MemPtrSetOwner(gVars, ownerID);
-	//			ArgsSetOwner(argvP, ownerID);	// will be freed by main(...)
-	//			MemPtrFree(lp);					// will be freed by the system on exit
-
-				run(lp->args.argc, argvP);
-
-				cardNo = 0;
-				dbID = DmFindDatabase(0, "ScummVM");
-				if (dbID) {
-					if (lp->exitLauncher)
-						SysUIAppSwitch(cardNo, dbID, sysAppLaunchCustomEngineDelete,0);
-					else
-						SysUIAppSwitch(cardNo, dbID, sysAppLaunchCmdNormalLaunch,0);
-				}
-			}
-			break;
-		}
-
-		default:
-			break;
-
-		}
-
-	return result;
-}
-
-UInt32 PilotMain( UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) {
-	return ModulesPalmMain(cmd, cmdPBP, launchFlags);
-}
diff --git a/backends/platform/PalmOS/Src/modules.h b/backends/platform/PalmOS/Src/modules.h
deleted file mode 100644
index d172ad11c2..0000000000
--- a/backends/platform/PalmOS/Src/modules.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef MODULES_H
-#define MODULES_H
-
-#include "globals.h"
-
-#define sysAppLaunchCode_SVMRunEngine	(sysAppLaunchCmdCustomBase + 0)
-
-void ModDelete();
-
-typedef struct {
-	UInt8 lightspeed;
-	Boolean exitLauncher;
-
-	struct {
-		UInt8 argc;
-		Char **argv;
-	} args;
-
-	GlobalsDataPtr gVars;
-} LaunchParamType;
-
-#endif
diff --git a/backends/platform/PalmOS/Src/native/oscalls.cpp b/backends/platform/PalmOS/Src/native/oscalls.cpp
deleted file mode 100644
index 9bfd01393f..0000000000
--- a/backends/platform/PalmOS/Src/native/oscalls.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PenInputMgr.h>
-#include "pace.h"
-
-GlobalsType global;
-
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_StatShow(void) {
-	PACE_PIN_EXEC_NP(pinStatShow, Err)
-}
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_StatHide(void) {
-	PACE_PIN_EXEC_NP(pinStatHide, Err)
-}
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_PINSetInputAreaState(UInt16 state) {
-	PACE_PARAMS_INIT()
-	PACE_PARAMS_ADD16(state)
-	PACE_PARAMS_END()
-	PACE_PIN_EXEC(pinPINSetInputAreaState, Err)
-}
-
-PACE_CLASS_WRAPPER(UInt16)
-	__68k_PINGetInputAreaState(void) {
-	PACE_PIN_EXEC_NP(pinPINGetInputAreaState, UInt16)
-}
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_PINSetInputTriggerState(UInt16 state) {
-	PACE_PARAMS_INIT()
-	PACE_PARAMS_ADD16(state)
-	PACE_PARAMS_END()
-	PACE_PIN_EXEC(pinPINSetInputTriggerState, Err)
-}
-
-PACE_CLASS_WRAPPER(UInt16)
-	__68k_PINGetInputTriggerState(void) {
-	PACE_PIN_EXEC_NP(pinPINGetInputTriggerState, UInt16)
-}
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_SysSetOrientation(UInt16 orientation) {
-	PACE_PARAMS_INIT()
-	PACE_PARAMS_ADD16(orientation)
-	PACE_PARAMS_END()
-	PACE_PIN_EXEC(pinSysSetOrientation, Err)
-}
-
-PACE_CLASS_WRAPPER(UInt16)
-	__68k_SysGetOrientation(void) {
-	PACE_PIN_EXEC_NP(pinSysGetOrientation, UInt16)
-}
-
-PACE_CLASS_WRAPPER(Err)
-	__68k_SysSetOrientationTriggerState(UInt16 triggerState) {
-	PACE_PARAMS_INIT()
-	PACE_PARAMS_ADD16(triggerState)
-	PACE_PARAMS_END()
-	PACE_PIN_EXEC(pinSysSetOrientationTriggerState, Err)
-}
-
-PACE_CLASS_WRAPPER(UInt16)
-	__68k_SysGetOrientationTriggerState(void) {
-	PACE_PIN_EXEC_NP(pinSysGetOrientationTriggerState, UInt16)
-}
diff --git a/backends/platform/PalmOS/Src/native/oscalls.h b/backends/platform/PalmOS/Src/native/oscalls.h
deleted file mode 100644
index 071b409130..0000000000
--- a/backends/platform/PalmOS/Src/native/oscalls.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef _OSCALLS_H_
-#define _OSCALLS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef PALMOS_ARM
-#	define __68K(a)	__68k_##a
-#else
-#	define __68K(a)	a
-#endif
-
-Err __68k_StatShow();
-Err __68k_StatHide();
-
-Err __68k_PINSetInputAreaState(UInt16 state);
-UInt16 __68k_PINGetInputAreaState(void);
-
-Err __68k_PINSetInputTriggerState(UInt16 state);
-UInt16 __68k_PINGetInputTriggerState(void);
-
-Err __68k_SysSetOrientation(UInt16 orientation);
-UInt16 __68k_SysGetOrientation(void);
-
-Err __68k_SysSetOrientationTriggerState(UInt16 triggerState);
-UInt16 __68k_SysGetOrientationTriggerState(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/backends/platform/PalmOS/Src/native/pace.h b/backends/platform/PalmOS/Src/native/pace.h
deleted file mode 100644
index 37b903b2c3..0000000000
--- a/backends/platform/PalmOS/Src/native/pace.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef PACE_H
-#define PACE_H
-
-#include <PceNativeCall.h>
-//#include "endianutils.h"
-
-// local definition of the emulation state structure
-typedef struct {
-	UInt32 instr;
-	UInt32 regData[8];
-	UInt32 regAddress[8];
-	UInt32 regPC;
-} EmulStateType;
-
-typedef struct {
-	EmulStateType *emulStateP;
-	Call68KFuncType *call68KFuncP;
-} GlobalsType;
-
-extern GlobalsType global;
-
-// TODO : check this, already defined in ARMlet_Runtime
-//extern EmulStateType	*g_emulStateP;
-//extern Call68KFuncType	*g_call68KFuncP;
-#define g_emulStateP	global.emulStateP
-#define g_call68KFuncP	global.call68KFuncP
-
-
-#ifdef __cplusplus
-#	define PACE_CLASS_WRAPPER(rv)		extern "C" rv
-#else
-#	define PACE_CLASS_WRAPPER(rv)		rv
-#endif
-#define PACE_CALLBACK_PTR			g_call68KFuncP
-#define PACE_EMULSTATE				g_emulStateP
-
-#define ALIGN_4BYTE(addr) (((UInt32)(addr) + 3) & 0xFFFFFFFC)
-
-/****** TAKEN FROM PACEInteface.cpp (ARMlet_Runtime) ******/
-// local definition of the emulation state structure
-
-#define PACE_PARAMS_INIT()						\
-	UInt8 params[] = {
-
-#define PACE_PARAMS_ADD8(param)					\
-	(UInt8)(param),								\
-	0,
-
-#define PACE_PARAMS_ADD16(param)				\
-	(UInt8)((UInt16)(param) >> 8),				\
-	(UInt8)(param),
-
-#define PACE_PARAMS_ADD32(param)				\
-	(UInt8)((UInt32)(param) >> 24),				\
-	(UInt8)((UInt32)(param) >> 16),				\
-	(UInt8)((UInt32)(param) >> 8),				\
-	(UInt8)(param),
-
-#define PACE_PARAMS_END()						\
-	};
-
-// PIN
-#define PACE_PIN_EXEC_NP(pinTrap, returnType)	\
-	PACE_EMULSTATE->regData[2] = pinTrap;		\
-	return ((returnType)((PACE_CALLBACK_PTR)(	\
-		static_cast<void *>(PACE_EMULSTATE),	\
-		PceNativeTrapNo(sysTrapPinsDispatch),	\
-		NULL, 0)));
-
-#define PACE_PIN_EXEC(pinTrap, returnType)		\
-	PACE_EMULSTATE->regData[2] = pinTrap;		\
-	return ((returnType)((PACE_CALLBACK_PTR)(	\
-		static_cast<void *>(PACE_EMULSTATE),	\
-		PceNativeTrapNo(sysTrapPinsDispatch),	\
-		&params,								\
-		sizeof(params))));
-
-#endif
diff --git a/backends/platform/PalmOS/Src/native/pnoARM.c b/backends/platform/PalmOS/Src/native/pnoARM.c
deleted file mode 100644
index 48c4fee972..0000000000
--- a/backends/platform/PalmOS/Src/native/pnoARM.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifdef COMPILE_OS5
-
-#include <PalmOS.h>
-#include <stdlib.h>
-#include "pace.h"
-
-// Linker still looks for ARMlet_Main as entry point, but the
-// "ARMlet" name is now officially discouraged.  Compare an
-// contrast to "PilotMain" for 68K applications.
-#define PNO_Main ARMlet_Main
-
-/* Prepare static initializers */
-extern long __sinit__[];
-extern void __ARMlet_Startup__();
-
-/* simple function pointer	*/
-typedef void (*StaticInitializer)(void);
-
-unsigned long PNO_Main(const void *emulStateP, void *userData68KP, Call68KFuncType *call68KFuncP) {
-	global.emulStateP = (EmulStateType *)emulStateP;
-	global.call68KFuncP = call68KFuncP;
-
-	// handle static initializers
-	if (__sinit__) {
-		long base = (long)__ARMlet_Startup__;
-		long s, *p;
-
-		for (p = __sinit__; p && (s = *p) != 0; p++)
-			((StaticInitializer)(s + base))();
-	}
-
-	return PilotMain(sysAppLaunchCmdNormalLaunch, userData68KP, 0);
-}
-
-#endif
diff --git a/backends/platform/PalmOS/Src/native/pnoStartup.c b/backends/platform/PalmOS/Src/native/pnoStartup.c
deleted file mode 100644
index b76cac3024..0000000000
--- a/backends/platform/PalmOS/Src/native/pnoStartup.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifdef COMPILE_OS5
-#	include "(Source)/ARMlet_Startup.c"
-#endif
diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp
deleted file mode 100644
index 7323bb6d69..0000000000
--- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "PalmVersion.h"
-#include <MSL_PalmOS.h>
-
-#include "globals.h"
-#include "args.h"
-#include "palmdefs.h"
-
-#include "rumble.h"
-
-
-//#include <AdnDebugMgr.h>
-//#define DEBUG_ARM
-
-#include "base/main.h"
-#ifdef COMPILE_ZODIAC
-#	include "be_zodiac.h"
-#endif
-#include "be_os5ex.h"
-
-GlobalsDataType g_vars;
-GlobalsDataPtr gVars = &g_vars;
-UInt32 g_stackSize;
-
-extern "C" void __destroy_global_chain(void);
-extern void DrawStatus(Boolean show);
-
-static void palm_main(int argc, char **argvP)  {
-#ifdef COMPILE_OS5
-	if (gVars->advancedMode)
-		g_system = new OSystem_PalmOS5Ex();
-	else
-		g_system = new OSystem_PalmOS5();
-#elif defined(COMPILE_ZODIAC)
-	g_system = new OSystem_PalmZodiac();
-#else
-	#error "No target defined."
-#endif
-
-	assert(g_system);
-
-	scummvm_main(argc, argvP);
-
-	g_system->quit();	// TODO: Consider removing / replacing this!
-}
-
-static void Go() {
-	void *tmp;
-	char **argvP;
-	int argc;
-
-#ifdef DEBUG_ARM
-// Tell the debugger we want to enable full debugging
-	UInt32 flags = AdnDebugEnableGet();
-	flags |= kAdnEnableMasterSwitch | kAdnEnableFullDebugging;
-	AdnDebugEnableSet(flags);
-// Tell the debugger where our code lives in memory:
-	AdnDebugNativeRegister(sysFileTApplication, appFileCreator, 'ARMC', 1);
-#endif
-
-	// get global struct
-	FtrGet(appFileCreator, ftrVars, (UInt32 *)&tmp);
-	MemMove(gVars, tmp, sizeof(GlobalsDataType));
-
-	// init STDIO
-	stdio_set_cache(0);
-	stdio_init(gVars->VFS.volRefNum, "/PALM/Programs/ScummVM/scumm.log");
-	if (gVars->indicator.showLED)
-		stdio_set_led(DrawStatus);
-	stdio_set_cache(gVars->VFS.cacheSize);
-
-	// get args
-	FtrGet(appFileCreator, ftrArgsData, (UInt32 *)&argvP);
-	FtrGet(appFileCreator, ftrArgsCount, (UInt32 *)&argc);
-
-	// init system
-	WinSetDrawWindow(WinGetDisplayWindow());
-	if (HWR_INIT(INIT_VIBRATOR))	gVars->vibrator =	RumbleInit();
-
-	// run ...
-	DO_EXIT ( palm_main(argc, argvP); )
-
-	// release
-	if (HWR_INIT(INIT_VIBRATOR))	RumbleRelease();
-	stdio_release();
-
-#ifdef DEBUG_ARM
-	AdnDebugNativeUnregister();
-#endif
-}
-
-/* Stack size */
-
-Int8 *g_newStack, *g_newStackPos;
-void *g_oldStack;
-
-static asm void *StkSwap(void *newStack ,void *dummy) {
-	mov  r1, r13
-	mov  r13, r0
-	mov	 r0, r1
-	bx	 lr
-}
-
-extern UInt32 PilotMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) {
-	if (cmd == sysAppLaunchCmdNormalLaunch) {
-		FtrGet(appFileCreator, ftrStack, &g_stackSize);
-		if (!g_stackSize)
-			g_stackSize = 32 * 1024;
-
-		g_newStack = (Int8 *)malloc(g_stackSize + 8);
-		g_newStackPos = (g_newStack + g_stackSize);
-		g_newStackPos -= ((UInt32)g_newStackPos & 7);
-
-		g_oldStack = StkSwap(g_newStackPos, 0);
-
-		Go();
-
-		StkSwap(g_oldStack, 0);
-		free(g_newStack);
-	}
-
-	// Destroy all constructed global objects
-	__destroy_global_chain();
-
-	return 0;
-}
diff --git a/backends/platform/PalmOS/Src/native/zodiacStartup.cpp b/backends/platform/PalmOS/Src/native/zodiacStartup.cpp
deleted file mode 100644
index 7f6264c1ac..0000000000
--- a/backends/platform/PalmOS/Src/native/zodiacStartup.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifdef COMPILE_ZODIAC
-
-#include <TapWave.h>
-
-#ifndef __PALMOS_ARMLET__
-#error "__PALMOS_ARMLET__ is not defined!!!"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This variable holds the Tapwave Native Application interface
- * dispatch table. General ARM API calls will go through this table.
- */
-struct TwGlue*   twGlue;
-const void*      twEmulState;
-Call68KFuncType* twCall68KFunc;
-
-#ifdef __MWERKS__
-
-#if __PALMOS_ARMLET__ < 0x120
-#error "You must use CodeWarrior for Palm OS 9.3 or later!!!"
-#endif
-
-
-UInt32 __ARMlet_Startup__(const void*, void*, Call68KFuncType*);
-
-/*
- * These symbols aren't real, but are linker-generated symbols that
- * mark the start and end of the various data sections.
- */
-extern long __DataStart__[];
-extern long __sinit__[];
-extern long __RODataStart__[];
-extern long __BSSStart__[];
-extern long __BSSEnd__[];
-extern long __CodeRelocStart__[];
-extern long __CodeRelocEnd__[];
-extern long __DataRelocStart__[];
-extern long __DataRelocEnd__[];
-
-/*	simple function pointer	*/
-typedef void (*StaticInitializer)(void);
-
-/*
- * This function performs relocation for Tapwave Native Application.
- */
-static void relocate(void)
-{
-    // this symbol points to the very beginning of current application
-    long base = (long) __ARMlet_Startup__;
-    long *cur, *end;
-
-	// handle static initializers
-	if (__sinit__) {
-		long s, *p;
-
-		for (p = __sinit__; p && (s = *p) != 0; p++)
-			((StaticInitializer)(s + base))();
-	}
-
-    // handle code-to-data relocation
-    cur = __CodeRelocStart__;
-    end = __CodeRelocEnd__;
-    for (; cur < end; cur++) {
-        *(long*)(base + *cur) += base;
-    }
-
-    // handle data-to-data relocation
-    cur = __DataRelocStart__;
-    end = __DataRelocEnd__;
-    for (; cur < end; cur++) {
-        *(long*)(base + *cur) += base;
-    }
-}
-
-/*
- * This is the real entrypoint for Tapwave Native Application. It
- * depends on various CodeWarrior 9.2 compiler/linker/runtime features.
- */
-static SYSTEM_CALLBACK UInt32
-Startup(const void *emulStateP, void *userData68KP, Call68KFuncType *call68KFuncP)
-{
-    if (emulStateP) {
-        twEmulState = emulStateP;
-        twCall68KFunc = call68KFuncP;
-        // COMMENT: normal pace native object launch
-        return PilotMain(sysAppLaunchCmdNormalLaunch, userData68KP, 0);
-    } else {
-        // Setup TNA interface dispatch table
-        twGlue = (struct TwGlue*) userData68KP;
-
-        // OPTIONAL: relocate data segment
-        relocate();
-
-        // OPTIONAL: initialize the floating-point library
- //       _fp_init();
-
-        return 0;
-    }
-}
-
-#pragma PIC off
-asm UInt32
-__ARMlet_Startup__(const void *emulStateP, void *userData68KP, Call68KFuncType *call68KFuncP)
-{
-    b        Startup             //   0 forwarding call
-    nop                          //   4
-    nop                          //   8
-    nop                          //  12
-    nop                          //  16
-    nop                          //  20
-    nop                          //  24
-    dcd      'TWNA'              //  28 Tapwave Native Application
-    dcd      1                   //  32 version 1
-    dcd      'cdwr'              //  36 make this section the same as the __ARMlet_Startup__
-    dcd      __DataStart__       //  40 used by CodeWarrior 9.2
-    dcd      __RODataStart__     //  44
-    dcd      __BSSStart__        //  48
-    dcd      __BSSEnd__          //  52
-    dcd      __CodeRelocStart__  //  56
-    dcd      __CodeRelocEnd__    //  60
-    dcd      __DataRelocStart__  //  64
-    dcd      __DataRelocEnd__    //  68
-}
-#pragma PIC reset
-
-#endif // __MWERKS__
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif
diff --git a/backends/platform/PalmOS/Src/os5_event.cpp b/backends/platform/PalmOS/Src/os5_event.cpp
deleted file mode 100644
index 534c2eb4f9..0000000000
--- a/backends/platform/PalmOS/Src/os5_event.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-
-void OSystem_PalmOS5::get_coordinates(EventPtr ev, Coord &x, Coord &y) {
-	Boolean dummy;
-	EvtGetPenNative(WinGetDisplayWindow(), &ev->screenX, &ev->screenY, &dummy);
-
-	x = (ev->screenX - _screenOffset.x);
-	y = (ev->screenY - _screenOffset.y);
-
-	if (_stretched) {
-		x = (x * _screenWidth) / _screenDest.w;
-		y = (y * _screenHeight) / _screenDest.h;
-	}
-}
-
-bool OSystem_PalmOS5::check_event(Common::Event &event, EventPtr ev) {
-	if (ev->eType == keyUpEvent) {
-		switch (ev->data.keyUp.chr) {
-		case vchrHard3:
-		case vchrHard4:
-			// will be handled by hard keys
-			return true;
-		}
-
-	} else if (ev->eType == keyDownEvent) {
-		switch (ev->data.keyDown.chr) {
-
-		// hot swap gfx
-//	case 0x1B04:
-		case vchrHard1:
-			if (OPTIONS_TST(kOptCollapsible))
-				hotswap_gfx_mode(_mode == GFX_WIDE ? GFX_NORMAL: GFX_WIDE);
-			return false; // not a key
-
-//	case 0x1B05:
-		case vchrHard2:
-			setFeatureState(kFeatureAspectRatioCorrection, 0);
-			return false; // not a key
-
-		case vchrHard3:
-			_keyExtraPressed |= _keyExtra.bitActionA;
-			event.type = Common::EVENT_LBUTTONDOWN;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-
-		case vchrHard4:
-			_keyExtraPressed |= _keyExtra.bitActionB;
-			event.type = Common::EVENT_RBUTTONDOWN;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-		}
-	}
-
-	return false;
-}
diff --git a/backends/platform/PalmOS/Src/os5_gfx.cpp b/backends/platform/PalmOS/Src/os5_gfx.cpp
deleted file mode 100644
index 6a7b21e100..0000000000
--- a/backends/platform/PalmOS/Src/os5_gfx.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-#include "graphics/surface.h"
-#include "common/config-manager.h"
-#include <PenInputMgr.h>
-#include <palmOneResources.h>
-
-#include "oscalls.h"
-
-void OSystem_PalmOS5::int_initSize(uint w, uint h) {
-}
-
-WinHandle OSystem_PalmOS5::alloc_screen(Coord w, Coord h) {
-	Err e;
-	WinHandle winH;
-	UInt16 old = WinSetCoordinateSystem(kCoordinatesNative);
-	winH = WinCreateOffscreenWindow(w, h, nativeFormat, &e);
-	WinSetCoordinateSystem(old);
-
-	return winH;
-}
-
-void OSystem_PalmOS5::load_gfx_mode() {
-	Err e;
-
-	if (_gfxLoaded)
-		return;
-	_gfxLoaded = true;
-
-	// get command line config
-//	_fullscreen = ConfMan.getBool("fullscreen");	// TODO : (NORMAL mode)
-	_ratio.adjustAspect = ConfMan.getBool("aspect_ratio") ? kRatioHeight : kRatioNone;
-
-	// precalc ratio (WIDE mode)
-	_ratio.width = (gVars->screenFullHeight * _screenWidth / _screenHeight);
-	_ratio.height = (gVars->screenFullWidth * _screenHeight / _screenWidth);
-
-	_offScreenP	= (byte *)malloc(_screenWidth * _screenHeight);
-
-	MemSet(_offScreenP, _screenWidth * _screenHeight, 0);
-	MemSet(_nativePal, sizeof(_nativePal), 0);
-	MemSet(_currentPalette, sizeof(_currentPalette), 0);
-
-	UInt32 depth = 16;
-	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
-	clear_screen();
-
-	if (OPTIONS_TST(kOptModeRotatable)) {
-		_sysOldOrientation = __68K(SysGetOrientation());
-		_sysOldTriggerState = __68K(PINGetInputTriggerState());
-		__68K(SysSetOrientation(sysOrientationLandscape));
-		__68K(SysSetOrientationTriggerState(sysOrientationTriggerDisabled));
-		__68K(PINSetInputTriggerState(pinInputTriggerDisabled));
-	}
-
-	gVars->indicator.on = Graphics::RGBToColor<Graphics::ColorMasks<565> >(0,255,0);
-	gVars->indicator.off = Graphics::RGBToColor<Graphics::ColorMasks<565> >(0,0,0);
-
-	_overlayH =  alloc_screen(_screenWidth, _screenHeight);
-	_overlayP = (OverlayColor *)(BmpGetBits(WinGetBitmap(_overlayH)));
-
-	_screenH = WinGetDisplayWindow();
-	_screenP = (byte *)(BmpGetBits(WinGetBitmap(_screenH)));
-
-	_isSwitchable = OPTIONS_TST(kOptModeLandscape) && OPTIONS_TST(kOptCollapsible);
-	if (!_isSwitchable)
-		_mode = GFX_NORMAL;
-
-	hotswap_gfx_mode(_mode);
-}
-
-void OSystem_PalmOS5::hotswap_gfx_mode(int mode) {
-	Err e;
-
-	if (_mode != GFX_NORMAL && !_isSwitchable)
-		return;
-
-	if (_workScreenH)
-		WinDeleteWindow(_workScreenH, false);
-	_workScreenH = NULL;
-
-	_screenDest.w = _screenWidth;
-	_screenDest.h = _screenHeight;
-
-	// prevent bad DIA redraw (Stat part)
-	if (mode == GFX_NORMAL) {
-		_redawOSD = true;
-		_stretched = (_screenWidth > gVars->screenWidth);
-
-		if (OPTIONS_TST(kOptCollapsible)) {
-			//AiaSetInputAreaState(aiaInputAreaShow); // For T3 ??
-			__68K(StatShow());
-			__68K(PINSetInputAreaState(pinInputAreaOpen));
-		}
-
-		if (_stretched) {
-			calc_rect(false);
-		} else {
-			// offsets
-			_screenOffset.x = (gVars->screenWidth - _screenWidth) / 2;
-			_screenOffset.y = (gVars->screenHeight - _screenHeight) / 2;
-		}
-
-	} else {
-		_redawOSD = false;
-		_stretched = true;
-
-		if (OPTIONS_TST(kOptCollapsible)) {
-			// T3 DIA library is 68k base, there is no possible native call
-			//AiaSetInputAreaState(aiaInputAreaFullScreen);
-			__68K(PINSetInputAreaState(pinInputAreaClosed));
-			__68K(StatHide());
-		}
-
-		calc_rect(true);
-	}
-
-	if (_stretched) {
-		OPTIONS_SET(kOptDisableOnScrDisp);
-		if (_screenHeight == 200 && _screenDest.h == 300) {
-			_render = &OSystem_PalmOS5::render_landscape15x;
-		} else {
-			_render = &OSystem_PalmOS5::render_landscapeAny;
-			calc_scale();
-		}
-	} else {
-		OPTIONS_RST(kOptDisableOnScrDisp);
-		_render = &OSystem_PalmOS5::render_1x;
-	}
-
-	_workScreenH = alloc_screen(_screenDest.w, _screenDest.h);
-	_workScreenP = (uint16 *)(BmpGetBits(WinGetBitmap(_workScreenH)));
-	MemSet(_workScreenP, _screenDest.w * _screenDest.h * 2, 0);
-
-	_mode = mode;
-	clear_screen();
-}
-
-void OSystem_PalmOS5::unload_gfx_mode() {
-	if (!_gfxLoaded)
-		return;
-	_gfxLoaded = false;
-
-	// mouse data freed in quit()
-	free(_offScreenP);
-
-	if (_workScreenH)
-		WinDeleteWindow(_workScreenH, false);
-	if (_overlayH)
-		WinDeleteWindow(_overlayH, false);
-
-	_workScreenH = NULL;
-	_overlayH = NULL;
-
-	UInt32 depth = 8;
-	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
-	clear_screen();
-
-	if (OPTIONS_TST(kOptModeRotatable)) {
-		__68K(PINSetInputTriggerState(_sysOldTriggerState));
-		__68K(SysSetOrientation(_sysOldOrientation));
-	}
-
-	WinSetCoordinateSystem(_sysOldCoord);
-}
-
-void OSystem_PalmOS5::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
-	// Clip the coordinates
-	if (x < 0) {
-		w += x;
-		buf -= x;
-		x = 0;
-	}
-
-	if (y < 0) {
-		h += y;
-		buf -= y * pitch;
-		y = 0;
-	}
-
-	if (w > _screenWidth - x)
-		w = _screenWidth - x;
-
-	if (h > _screenHeight - y)
-		h = _screenHeight - y;
-
-	if (w <= 0 || h <= 0)
-		return;
-
-	byte *dst = _offScreenP + y * _screenWidth + x;
-
-	if (w == pitch && w == _screenWidth) {
-		MemMove(dst, buf, w * h);
-	} else {
-		do {
-			MemMove(dst, buf, w);
-			dst += _screenWidth;
-			buf += pitch;
-		} while (--h);
-	}
-}
-
-Graphics::Surface *OSystem_PalmOS5::lockScreen() {
-	_framebuffer.pixels = _offScreenP;
-	_framebuffer.w = _screenWidth;
-	_framebuffer.h = _screenHeight;
-	_framebuffer.pitch = _screenWidth;
-	_framebuffer.bytesPerPixel = 1;
-
-	return &_framebuffer;
-}
-
-void OSystem_PalmOS5::unlockScreen() {
-	// The screen is always completely update anyway, so we don't have to force a full update here.
-}
-
-void OSystem_PalmOS5::int_updateScreen() {
-	RectangleType r;
-	PointType p;
-
-	draw_mouse();
-	((this)->*(_render))(r, p);
-
-	_sysOldCoord = WinSetCoordinateSystem(kCoordinatesNative);
-	WinCopyRectangle(_workScreenH, _screenH, &r, p.x, p.y, winPaint);
-	WinSetCoordinateSystem(_sysOldCoord);
-	undraw_mouse();
-}
-
-void OSystem_PalmOS5::clear_screen() {
-	RGBColorType rgb = { 0,0,0,0 };
-	WinSetDrawWindow(WinGetDisplayWindow());
-	WinSetBackColorRGB(&rgb, 0);
-	WinEraseWindow();
-}
-
-void OSystem_PalmOS5::extras_palette(uint8 index, uint8 r, uint8 g, uint8 b) {
-	_nativePal[index] = gfxMakeDisplayRGB(r, g, b);
-}
-
-void OSystem_PalmOS5::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {
-	if (_mode != GFX_NORMAL)
-		return;
-//	MemHandle hTemp = DmGetResource(bitmapRsc, id);
-	MemHandle hTemp = DmGetResource('abmp', id + 100);
-
-	if (hTemp) {
-		RGBColorType oldRGB;
-		static const RGBColorType pal[4] = {
-			{0,0,255,0},
-			{0,255,255,0},
-			{0,255,0,0},
-			{0,0,0,0}
-		};
-
-		BitmapType *bmTemp;
-		bmTemp	= (BitmapType *)MemHandleLock(hTemp);
-
-		Coord w, h;
-		BmpGetDimensions(bmTemp, &w, &h, 0);
-
-		PointType dst = { _screenOffset.x + x, _screenOffset.y + y };
-		RectangleType c, r = { dst.x, dst.y, w, h };
-
-		UInt16 old = WinSetCoordinateSystem(kCoordinatesNative);
-		WinSetDrawWindow(_screenH);
-		WinGetClip(&c);
-		WinResetClip();
-
-		if (show) {
-			WinSetForeColorRGB(&pal[3], &oldRGB);
-			WinSetBackColorRGB(&pal[color], &oldRGB);
-			WinDrawBitmap(bmTemp, dst.x, dst.y);
-		} else {
-			WinSetBackColorRGB(&pal[3], &oldRGB);
-			WinFillRectangle(&r, 0);
-		}
-
-		WinSetClip(&c);
-		WinSetCoordinateSystem(old);
-
-		MemPtrUnlock(bmTemp);
-		DmReleaseResource(hTemp);
-	}
-}
diff --git a/backends/platform/PalmOS/Src/os5_mouse.cpp b/backends/platform/PalmOS/Src/os5_mouse.cpp
deleted file mode 100644
index c019e1607d..0000000000
--- a/backends/platform/PalmOS/Src/os5_mouse.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-
-void OSystem_PalmOS5::setCursorPalette(const byte *colors, uint start, uint num) {
-	for (uint i = 0; i < num; i++) {
-		_mousePal[i + start] = gfxMakeDisplayRGB(colors[0], colors[1], colors[2]);
-		colors += 4;
-	}
-
-	_cursorPaletteDisabled = false;
-}
-
-void OSystem_PalmOS5::disableCursorPalette(bool disable) {
-	_cursorPaletteDisabled = disable;
-}
-
-// TODO: this code is almost the same as Zodiac version.
-void OSystem_PalmOS5::draw_mouse() {
-	if (!_mouseDataP || _mouseDrawn || !_mouseVisible)
-		return;
-
-	byte *src = _mouseDataP;
-
-	int x = _mouseCurState.x - _mouseHotspotX;
-	int y = _mouseCurState.y - _mouseHotspotY;
-	int w = _mouseCurState.w;
-	int h = _mouseCurState.h;
-
-	// clip the mouse rect
-	if (y < 0) {
-		src -= y * w;
-		h += y;
-		y = 0;
-	}
-	if (x < 0) {
-		src -= x;
-		w += x;
-		x = 0;
-	}
-
-	if (h > _screenHeight - y)
-		h = _screenHeight - y;
-	if (w > _screenWidth - x)
-		w = _screenWidth - x;
-
-	if (w <= 0 || h <= 0)
-		return;
-
-	// store the bounding box so that undraw mouse can restore the area the
-	// mouse currently covers to its original content
-	_mouseOldState.x = x;
-	_mouseOldState.y = y;
-	_mouseOldState.w = w;
-	_mouseOldState.h = h;
-
-	byte color;
-	int ww;
-
-	if (_overlayVisible) {
-		uint16 *bak = (uint16 *)_mouseBackupP;
-		uint16 *pal = _cursorPaletteDisabled ? _nativePal : _mousePal;
-		uint16 *dst = _overlayP + y * _screenWidth + x;
-
-		do {
-			ww = w;
-			do {
-				*bak++ = *dst;
-				color = *src++;
-
-				// transparent, don't draw
-				if (color != _mouseKeyColor)
-					*dst = pal[color];
-				dst++;
-			} while (--ww);
-
-			src += _mouseCurState.w - w;
-			dst += _screenWidth - w;
-		} while (--h);
-
-	} else {
-		byte *bak = _mouseBackupP;
-		byte *dst =_offScreenP + y * _screenWidth + x;
-
-		do {
-			ww = w;
-			do {
-				*bak++ = *dst;
-				color = *src++;
-
-				// transparent, don't draw
-				if (color != _mouseKeyColor)
-					*dst = color;
-				dst++;
-			} while (--ww);
-
-			src += _mouseCurState.w - w;
-			dst += _screenWidth - w;
-		} while (--h);
-	}
-
-	_mouseDrawn = true;
-}
-
-void OSystem_PalmOS5::undraw_mouse() {
-	if (!_mouseDrawn)
-		return;
-
-	int h = _mouseOldState.h;
-
-	// no need to do clipping here, since draw_mouse() did that already
-	if (_overlayVisible) {
-		uint16 *dst = _overlayP + _mouseOldState.y * _screenWidth + _mouseOldState.x;
-		uint16 *bak = (uint16 *)_mouseBackupP;
-
-		do {
-			MemMove(dst, bak, _mouseOldState.w * 2);
-			dst += _screenWidth;
-			bak += _mouseOldState.w;
-		} while (--h);
-
-	} else {
-		byte *dst = _offScreenP + _mouseOldState.y * _screenWidth + _mouseOldState.x;
-		byte *bak = _mouseBackupP;
-
-		do {
-			MemMove(dst, bak, _mouseOldState.w);
-			dst += _screenWidth;
-			bak +=  _mouseOldState.w;
-		} while (--h);
-	}
-
-	_mouseDrawn = false;
-}
diff --git a/backends/platform/PalmOS/Src/os5_overlay.cpp b/backends/platform/PalmOS/Src/os5_overlay.cpp
deleted file mode 100644
index 7e16a6b7b9..0000000000
--- a/backends/platform/PalmOS/Src/os5_overlay.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-#include "common/endian.h"
-
-void OSystem_PalmOS5::showOverlay() {
-	// hide fight indicator
-	draw_osd(kDrawFight, _screenDest.w - 34, _screenDest.h + 2, false);
-
-	undraw_mouse();
-	_overlayVisible = true;
-	clearOverlay();
-}
-
-void OSystem_PalmOS5::hideOverlay() {
-	undraw_mouse();
-	_overlayVisible = false;
-	_redawOSD = true;
-}
-
-void OSystem_PalmOS5::clearOverlay() {
-	if (!_overlayVisible)
-		return;
-
-	byte *src = _offScreenP;
-	uint16 *dst =  _overlayP;
-	int cnt = _screenWidth * _screenHeight;
-	do {
-		*dst++ = _nativePal[*src++];
-	} while (--cnt);
-}
-
-void OSystem_PalmOS5::grabOverlay(OverlayColor *buf, int pitch) {
-	OverlayColor *src = _overlayP;
-	int h = _screenHeight;
-	do {
-		memcpy(buf, src, _screenWidth * 2);
-		src += _screenWidth;
-		buf += pitch;
-	} while (--h);
-}
-
-void OSystem_PalmOS5::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
-	if (w == 0 || h == 0)
-		return;
-
-	OverlayColor *dst = _overlayP + x + y * _screenWidth;
-	do {
-		memcpy(dst, buf, w * 2);
-		dst += _screenWidth;
-		buf += pitch;
-	} while (--h);
-}
diff --git a/backends/platform/PalmOS/Src/os5_renderer.cpp b/backends/platform/PalmOS/Src/os5_renderer.cpp
deleted file mode 100644
index fea3ec28d7..0000000000
--- a/backends/platform/PalmOS/Src/os5_renderer.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-
-void OSystem_PalmOS5::render_1x(RectangleType &r, PointType &p) {
-	Coord o = 0;
-
-	if (_overlayVisible) {
-		uint16 *src = _overlayP;
-		uint16 *dst =  _workScreenP;
-		MemMove(dst, src, _screenWidth * _screenHeight * 2);
-
-	} else {
-		byte *src = _offScreenP;
-		uint16 *dst =  _workScreenP;
-		int cnt = _screenWidth * _screenHeight;
-		o = _current_shake_pos;
-
-		do {
-			*dst++ = _nativePal[*src++];
-		} while (--cnt);
-	}
-
-	p.x = _screenOffset.x;
-	p.y = _screenOffset.y + o;
-	RctSetRectangle(&r, 0, 0, _screenWidth, _screenHeight - o);
-}
-
-void OSystem_PalmOS5::render_landscapeAny(RectangleType &r, PointType &p) {
-	Coord x, y, o = 0;
-	uint16 *dst =  _workScreenP;
-
-	if (_overlayVisible) {
-		for (y = 0; y < _screenDest.h; y++) {
-			uint16 *src = _overlayP + *(_scaleTableY + y);
-			for (x = 0; x < _screenDest.w; x++) {
-				*dst++ = *(src + *(_scaleTableX + x));
-			}
-		}
-
-	} else {
-		o = _current_shake_pos;
-
-		for (y = 0; y < _screenDest.h; y++) {
-			byte *src = _offScreenP + *(_scaleTableY + y);
-			for (x = 0; x < _screenDest.w; x++) {
-				*dst++ = *(_nativePal + *(src + *(_scaleTableX + x)));
-			}
-		}
-	}
-
-	p.x = _screenOffset.x;
-	p.y = _screenOffset.y + o;
-	RctSetRectangle(&r, 0, 0,  _screenDest.w,  _screenDest.h - o);
-}
-
-void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) {
-	Coord x, y, o = 0;
-	uint16 *dst =  _workScreenP;
-
-	if (_overlayVisible) {
-		uint16 *src = _overlayP;
-
-		for (y = 0; y < 100; y++) {
-			// draw 2 lines
-			for (x = 0; x < 320; x++) {
-				*dst++ = *src++;
-				*dst++ = *src;
-				*dst++ = *src++;
-			}
-			// copy the second to the next line
-			MemMove(dst, dst - 480, 480 * 2);
-			dst += 480;
-		}
-	} else {
-		byte *src = _offScreenP;
-		o = _current_shake_pos;
-
-		for (y = 0; y < 100; y++) {
-			// draw 2 lines
-			for (x = 0; x < 320; x++) {
-				*dst++ = _nativePal[*src++];
-				*dst++ = _nativePal[*src];
-				*dst++ = _nativePal[*src++];
-			}
-			// copy the second to the next line
-			MemMove(dst, dst - 480, 480 * 2);
-			dst += 480;
-		}
-	}
-
-	p.x = _screenOffset.x;
-	p.y = _screenOffset.y + o;
-	RctSetRectangle(&r, 0, 0, 480, 300 - o);
-}
diff --git a/backends/platform/PalmOS/Src/os5_sound.cpp b/backends/platform/PalmOS/Src/os5_sound.cpp
deleted file mode 100644
index 73ab64c0d5..0000000000
--- a/backends/platform/PalmOS/Src/os5_sound.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5.h"
-#include "common/config-manager.h"
-#include "sound/mixer_intern.h"
-
-
-#ifdef PALMOS_ARM
-#	ifdef COMPILE_ZODIAC
-#		define SAMPLES_PER_SEC 44100
-#	else
-#		define SAMPLES_PER_SEC 22050
-#	endif
-#else
-#	define SAMPLES_PER_SEC 8000
-#endif
-
-
-SoundExType _soundEx;
-
-static Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) {
-	SoundExType *_soundEx = (SoundExType *)UserDataP;
-	SoundType *_sound = _soundEx->sound;
-
-	if (_soundEx->set && _soundEx->size) {
-		MemMove(bufferP, _soundEx->dataP, _soundEx->size);
-		*bufferSizeP = _soundEx->size;
-		_soundEx->set = false;
-
-	} else {
-		_soundEx->size = *bufferSizeP;
-		MemSet(bufferP, 128, 0);
-		*bufferSizeP = 128;
-	}
-
-	return errNone;
-}
-
-void OSystem_PalmOS5::sound_handler() {
-	if (_sound.active) {
-		if (_soundEx.size && !_soundEx.set) {
-			if (!_soundEx.dataP)
-				_soundEx.dataP = MemPtrNew(_soundEx.size);
-
-			_mixerMgr->mixCallback((byte *)_soundEx.dataP, _soundEx.size);
-			_soundEx.set = true;
-		}
-	}// TODO : no Sound API case
-}
-
-SndStreamVariableBufferCallback OSystem_PalmOS5::sound_callback() {
-	return sndCallback;
-}
-
-bool OSystem_PalmOS5::setupMixer() {
-	Err e;
-	Boolean success = false;
-
-	uint32 samplesPerSec;
-	if (ConfMan.hasKey("output_rate"))
-		samplesPerSec = ConfMan.getInt("output_rate");
-	else
-		samplesPerSec = SAMPLES_PER_SEC;
-
-	_mixerMgr = new Audio::MixerImpl(this, samplesPerSec);
-
-	if (!_sound.active) {
-		if (gVars->fmQuality != FM_QUALITY_INI) {
-			ConfMan.setBool("FM_medium_quality", (gVars->fmQuality == FM_QUALITY_MED));
-			ConfMan.setBool("FM_high_quality", (gVars->fmQuality == FM_QUALITY_HI));
-		}
-
-#if defined (COMPILE_OS5)
-		CALLBACK_INIT(_soundEx);
-#endif
-		_sound.proc = 0;
-		_sound.param = _mixerMgr;
-		_sound.active = true;	// always true when we call this function, false when sound is off
-
-		_soundEx.handle = 0;
-		_soundEx.size = 0;		// set by the callback
-		_soundEx.set = false;
-		_soundEx.dataP = NULL;	// set by the handler
-
-		// try to create sound stream
-		if (OPTIONS_TST(kOptPalmSoundAPI)) {
-			e = SndStreamCreateExtended(
-						&_soundEx.handle,
-						sndOutput,
-						sndFormatPCM,
-						samplesPerSec,
-						sndInt16Little,
-						sndStereo,
-						sound_callback(),
-						&_soundEx,
-						8192
-#ifdef COMPILE_OS5
-						,true
-#endif
-						);
-
-			e = e ? e : SndStreamStart(_soundEx.handle);
-			e = e ? e :	SndStreamSetVolume(_soundEx.handle, 1024L * gVars->palmVolume / 100);
-			success = (e == errNone);
-
-		// no Sound API
-		} else {
-			_soundEx.size = 512;
-			_soundEx.dataP = MemPtrNew(_soundEx.size);
-		}
-	}
-	// if not true some scenes (indy3 256,...) may freeze (ESC to skip)
-
-	_mixerMgr->setReady(true);
-
-	return true;
-}
-
-void OSystem_PalmOS5::clearSoundCallback() {
-	if (_sound.active) {
-		if (OPTIONS_TST(kOptPalmSoundAPI)) {
-			SndStreamStop(_soundEx.handle);
-			SndStreamDelete(_soundEx.handle);
-		}
-
-		if (_soundEx.dataP)
-			MemPtrFree(_soundEx.dataP);
-	}
-
-	_sound.active = false;
-	_soundEx.handle = NULL;
-	_soundEx.dataP = NULL;
-}
diff --git a/backends/platform/PalmOS/Src/os5ex_sound.cpp b/backends/platform/PalmOS/Src/os5ex_sound.cpp
deleted file mode 100644
index f27f5a202d..0000000000
--- a/backends/platform/PalmOS/Src/os5ex_sound.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_os5ex.h"
-#include "sound/mixer_intern.h"
-
-static SYSTEM_CALLBACK Err sndCallbackEx(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) {
-	CALLBACK_PROLOGUE
-	SoundType *_sound = ((SoundExType *)UserDataP)->sound;
-//	((SoundProc)_sound->proc)(_sound->param, (byte *)bufferP, *bufferSizeP);
-
-	Audio::MixerImpl *_mixerMgr = (	Audio::MixerImpl *)_sound->param;
-	_mixerMgr->mixCallback((byte *)bufferP, *bufferSizeP);
-
-	CALLBACK_EPILOGUE
-	return errNone;
-}
-
-SndStreamVariableBufferCallback OSystem_PalmOS5Ex::sound_callback() {
-	return sndCallbackEx;
-}
diff --git a/backends/platform/PalmOS/Src/palmdefs.h b/backends/platform/PalmOS/Src/palmdefs.h
deleted file mode 100644
index d37b533a21..0000000000
--- a/backends/platform/PalmOS/Src/palmdefs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef PALMDEFS_H
-#define PALMDEFS_H
-
-#define appFileCreator						'ScVM'
-#define	sysAppLaunchCustomEngineDelete		(sysAppLaunchCmdCustomBase + 0)
-#define	sysAppLaunchCustomEngineGetInfo		(sysAppLaunchCmdCustomBase + 1)
-
-enum {
-	GET_NONE		= 0,
-	GET_DATACOMMON	= 1 << 1,
-	GET_DATAENGINE	= 1 << 2,
-
-	GET_MODE68K		= 1 << 14,
-	GET_MODEARM		= 1 << 15,
-};
-
-SysAppInfoPtr SysGetAppInfo(SysAppInfoPtr *uiAppPP, SysAppInfoPtr *actionCodeAppPP)
-	SYS_TRAP(sysTrapSysGetAppInfo);
-
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h
deleted file mode 100644
index bb7230187a..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/compile.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __COMPILE_H__
-#define __COMPILE_H__
-
-#undef ENABLE_SCUMM
-#undef ENABLE_SCUMM_7_8
-#undef ENABLE_HE
-
-#undef ENABLE_AGOS
-#undef ENABLE_SKY
-#undef ENABLE_SWORD1
-#undef ENABLE_SWORD2
-#undef ENABLE_QUEEN
-#undef ENABLE_SAGA
-#undef ENABLE_KYRA
-#undef ENABLE_AWE
-#undef ENABLE_GOB
-#undef ENABLE_LURE
-#undef ENABLE_CINE
-#undef ENABLE_AGI
-#undef ENABLE_TOUCHE
-#undef ENABLE_PARALLACTION
-#undef ENABLE_CRUISE
-#undef ENABLE_DRASCULA
-
-// ScummVM
-#define USE_SCALERS
-#define DISABLE_FANCY_THEMES
-//#define CT_NO_TRANSPARENCY
-//#define REDUCE_MEMORY_USAGE
-
-#include "compile_base.h"
-
-//#define DISABLE_ADLIB
-//#define DISABLE_LIGHTSPEED
-
-#ifdef COMPILE_ZODIAC
-#	undef	DISABLE_FANCY_THEMES
-#	define	USE_ZLIB
-// set an external ZLIB since save/load implementation
-// doesn't support built-in zodiac version which is 1.1.4
-// (seen inflateInit2 which err on "MAX_WBITS + 32")
-#	define	USE_ZLIB_EXTERNAL
-#	define	DISABLE_SONY
-#endif
-
-#ifdef COMPILE_OS5
-#	define	DISABLE_TAPWAVE
-#	define	USE_ZLIB
-#endif
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_agi.h b/backends/platform/PalmOS/Src/prefixes/native_agi.h
deleted file mode 100644
index f3feee8c70..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_agi.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_AGI STATIC_PLUGIN
-
-#undef USE_MAD
-#undef USE_VORBIS
-#undef USE_TREMOR
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_agos.h b/backends/platform/PalmOS/Src/prefixes/native_agos.h
deleted file mode 100644
index 8a804e3116..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_agos.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_AGOS STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_cine.h b/backends/platform/PalmOS/Src/prefixes/native_cine.h
deleted file mode 100644
index 3d19d9c557..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_cine.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_CINE STATIC_PLUGIN
-#define _DEBUG
-
-#undef USE_MAD
-#undef USE_VORBIS
-#undef USE_TREMOR
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_common.h b/backends/platform/PalmOS/Src/prefixes/native_common.h
deleted file mode 100644
index af4db70932..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef ZNATIVE_COMMON_H
-#define ZNATIVE_COMMON_H
-
-#include "compile.h"
-
-#define __TWNEW_H__
-
-#define PALMOS_ARM
-#define DISABLE_LIGHTSPEED
-
-#define USE_MAD
-#define USE_TREMOR
-#define USE_VORBIS
-//#define USE_MPEG2
-
-// enable assert
-//#define _DEBUG
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_cruise.h b/backends/platform/PalmOS/Src/prefixes/native_cruise.h
deleted file mode 100644
index 89e6e65a70..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_cruise.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_CRUISE STATIC_PLUGIN
-
-#undef USE_MAD
-#undef USE_VORBIS
-#undef USE_TREMOR
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_drascula.h b/backends/platform/PalmOS/Src/prefixes/native_drascula.h
deleted file mode 100644
index 35bc381af4..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_drascula.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_DRASCULA STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_gob.h b/backends/platform/PalmOS/Src/prefixes/native_gob.h
deleted file mode 100644
index 9cb34099d0..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_gob.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_GOB STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_kyra.h b/backends/platform/PalmOS/Src/prefixes/native_kyra.h
deleted file mode 100644
index 3b09c63a6f..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_kyra.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_KYRA STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_lure.h b/backends/platform/PalmOS/Src/prefixes/native_lure.h
deleted file mode 100644
index 71835ee644..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_lure.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_LURE STATIC_PLUGIN
-
-#undef USE_MAD
-#undef USE_VORBIS
-#undef USE_TREMOR
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_m4.h b/backends/platform/PalmOS/Src/prefixes/native_m4.h
deleted file mode 100644
index 3bf85460a6..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_m4.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_M4 STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_made.h b/backends/platform/PalmOS/Src/prefixes/native_made.h
deleted file mode 100644
index fd439ed181..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_made.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_MADE STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_parallaction.h b/backends/platform/PalmOS/Src/prefixes/native_parallaction.h
deleted file mode 100644
index e8d46cc382..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_parallaction.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_PARALLACTION STATIC_PLUGIN
-
-#undef USE_MAD
-#undef USE_VORBIS
-#undef USE_TREMOR
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_queen.h b/backends/platform/PalmOS/Src/prefixes/native_queen.h
deleted file mode 100644
index 85bb5a0a04..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_queen.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_QUEEN STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_saga.h b/backends/platform/PalmOS/Src/prefixes/native_saga.h
deleted file mode 100644
index 19db05b633..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_saga.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_SAGA STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_scumm.h b/backends/platform/PalmOS/Src/prefixes/native_scumm.h
deleted file mode 100644
index b8433a3fa8..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_scumm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_SCUMM STATIC_PLUGIN
-#define ENABLE_SCUMM_7_8
-#define ENABLE_HE
-
-#define USE_ARM_GFX_ASM
-#define USE_ARM_SMUSH_ASM
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sky.h b/backends/platform/PalmOS/Src/prefixes/native_sky.h
deleted file mode 100644
index 49b157471f..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_sky.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_SKY STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword1.h b/backends/platform/PalmOS/Src/prefixes/native_sword1.h
deleted file mode 100644
index 6ae7bb9050..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_sword1.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_SWORD1 STATIC_PLUGIN
-#define USE_MPEG2
-#define USE_VORBIS
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword2.h b/backends/platform/PalmOS/Src/prefixes/native_sword2.h
deleted file mode 100644
index 5e9c45b047..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_sword2.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_SWORD2 STATIC_PLUGIN
-#undef _DEBUG
-#define USE_MPEG2
-#define USE_VORBIS
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_touche.h b/backends/platform/PalmOS/Src/prefixes/native_touche.h
deleted file mode 100644
index acf50e2787..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/native_touche.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "native_common.h"
-#define ENABLE_TOUCHE STATIC_PLUGIN
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h b/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h
deleted file mode 100644
index 8473214746..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#define PALMOS_68K
-#define PALMOS_MODE
-
-//#define _DEBUG_ENGINE
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/prefix_os5.h b/backends/platform/PalmOS/Src/prefixes/prefix_os5.h
deleted file mode 100644
index 6d84c543af..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/prefix_os5.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-// PalmOS
-#define PALMOS_MODE
-#define PALMOS_68K
-#define PALMOS_NATIVE
-
-#define COMPILE_OS5
-#define DISABLE_SONY
-#define DISABLE_PA1LIB
-
-#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/prefix_zodiac.h b/backends/platform/PalmOS/Src/prefixes/prefix_zodiac.h
deleted file mode 100644
index 49331d356f..0000000000
--- a/backends/platform/PalmOS/Src/prefixes/prefix_zodiac.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-// PalmOS
-#define PALMOS_MODE
-#define PALMOS_68K
-#define PALMOS_NATIVE
-
-#define COMPILE_ZODIAC
-#define DISABLE_SONY
-#define DISABLE_PA1LIB
-
-#endif
diff --git a/backends/platform/PalmOS/Src/rumble.cpp b/backends/platform/PalmOS/Src/rumble.cpp
deleted file mode 100644
index 513152f49c..0000000000
--- a/backends/platform/PalmOS/Src/rumble.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-#include "globals.h"
-#include "vibrate.h"
-#include "rumble.h"
-
-#ifndef DISABLE_TAPWAVE
-#include "tapwave.h"
-
-TwDeviceHandle hRumble;
-#endif
-
-Boolean RumbleExists() {
-	Boolean exists = false;
-	Err e;
-
-#ifndef DISABLE_TAPWAVE
-	if (OPTIONS_TST(kOptDeviceZodiac)) {
-		e = TwDeviceOpen(&hRumble, "vibrator0", "w");
-		if (!e) {
-			exists = true;
-			TwDeviceClose(hRumble);
-		}
-
-	} else
-#endif
-	{
-#ifndef PALMOS_ARM
-
-		UInt32 romVersion;
-
-		e = FtrGet(sysFtrCreator, sysFtrNumROMVersion, &romVersion);
-		if (!e) {
-			if (romVersion >= sysMakeROMVersion(4,0,0,sysROMStageRelease,0)) {
-				Boolean active = false;
-				e = HwrVibrateAttributes(0, kHwrVibrateActive, &active);
-				exists = (!e) ? true : exists;
-			}
-		}
-#endif
-	}
-
-
-	return exists;
-}
-
-void RumbleRun(Boolean active) {
-#ifndef DISABLE_TAPWAVE
-	if (OPTIONS_TST(kOptDeviceZodiac)) {
-		if (active) {
-			UInt8 buf[] = { '\64', '\100' };
-			TwDeviceControl(hRumble, 'play', buf, sizeof(buf));
-		} else {
-			TwDeviceControl(hRumble, 'stop', 0, 0);
-		}
-
-	} else
-#endif
-	{
-#ifndef PALMOS_ARM
-		UInt32 pattern	= active ? 0xFF000000 : 0x00000000;
-
-		HwrVibrateAttributes(1, kHwrVibratePattern, &pattern);
-		HwrVibrateAttributes(1, kHwrVibrateActive, &active);
-#endif
-	}
-
-}
-
-Boolean RumbleInit() {
-	Boolean done = false;
-
-#ifndef DISABLE_TAPWAVE
-	if (OPTIONS_TST(kOptDeviceZodiac)) {
-		Err e = TwDeviceOpen(&hRumble, "vibrator0", "w");
-		done = (!e);
-
-	} else
-#endif
-	{
-#ifndef PALMOS_ARM
-		if (RumbleExists()) {
-			UInt16 cycle	= (SysTicksPerSecond())/2;
-			UInt32 pattern	= 0xFF000000;
-			UInt16 delay	= 1;
-			UInt16 repeat	= 1;
-
-			HwrVibrateAttributes(1, kHwrVibrateRate, &cycle);
-			HwrVibrateAttributes(1, kHwrVibratePattern, &pattern);
-			HwrVibrateAttributes(1, kHwrVibrateDelay, &delay);
-			HwrVibrateAttributes(1, kHwrVibrateRepeatCount, &repeat);
-
-			done = true;
-		}
-#endif
-	}
-	return done;
-}
-
-void RumbleRelease() {
-#ifndef DISABLE_TAPWAVE
-	if (OPTIONS_TST(kOptDeviceZodiac)) {
-		TwDeviceClose(hRumble);
-
-	} else
-#endif
-	{
-#ifndef PALMOS_ARM
-		UInt32 pattern	= 0x00000000;
-		Boolean active = false;
-
-		HwrVibrateAttributes(1, kHwrVibratePattern, &pattern);
-		HwrVibrateAttributes(1, kHwrVibrateActive, &active);
-#endif
-	}
-}
diff --git a/backends/platform/PalmOS/Src/rumble.h b/backends/platform/PalmOS/Src/rumble.h
deleted file mode 100644
index 680c0eb164..0000000000
--- a/backends/platform/PalmOS/Src/rumble.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __RUMBLE_H__
-#define __RUMBLE_H__
-
-Boolean	RumbleExists	();
-void	RumbleRun		(Boolean active);
-Boolean	RumbleInit		();
-void	RumbleRelease	();
-
-#endif
diff --git a/backends/platform/PalmOS/Src/snd_pa1.cpp b/backends/platform/PalmOS/Src/snd_pa1.cpp
deleted file mode 100644
index ddaf6495f6..0000000000
--- a/backends/platform/PalmOS/Src/snd_pa1.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <stdlib.h>
-
-#include "native.h"
-#include "globals.h"
-
-#ifdef COMPILE_PA1SND
-#	include <endianutils.h>
-#endif
-
-
-static Int32 diffLookup[16] = {
-   1,3,5,7,9,11,13,15,
-   -1,-3,-5,-7,-9,-11,-13,-15,
-};
-
-static Int32 indexScale[16] = {
-   0x0e6, 0x0e6, 0x0e6, 0x0e6, 0x133, 0x199, 0x200, 0x266,
-   0x0e6, 0x0e6, 0x0e6, 0x0e6, 0x133, 0x199, 0x200, 0x266 /* same value for speedup */
-};
-
-static int limit(int val,int min,int max) {
-   if (val<min) return min;
-   else if (val>max) return max;
-   else return val;
-}
-
-void pcm2adpcm(Int16 *src, UInt8 *dst, UInt32 length) {
-#ifndef COMPILE_PA1SND
-/*
-	if (OPTIONS_TST(kOptDeviceARM)) {
-		PnoDescriptor pno;
-		ARMPa1SndType userData = {src, dst, length};
-
-		MemPtr armP =	_PnoInit(ARM_PA1SND, &pno);
-						_PnoCall(&pno, &userData);
-						_PnoFree(&pno, armP);
-
-		return;
-	}
-*/
-	int data,val,diff;
-	int signal,step;
-#else
-	long chan1, chan2;
-	long data,val,diff;
-	long signal,step;
-#endif
-
-	signal = 0;
-	step = 0x7F;
-	length >>= 3;	// 16bit stereo -> 4bit mono
-
-	do {
-
-		// high nibble
-#ifdef COMPILE_PA1SND
-		chan1 = ByteSwap16(*src);
-		src++;
-		chan2 = ByteSwap16(*src);
-		src++;
-
-		diff = ((chan1 + chan2) >> 1) - signal;
-#else
-		diff = ((*src++ + *src++) >> 1) - signal;
-#endif
-		diff <<= 3;
-		diff /= step;
-
-		val = abs(diff) >> 1;
-
-		if (val  > 7)	val = 7;
-		if (diff < 0)	val+= 8;
-
-		signal+= (step * diffLookup[val]) >> 3;
-		signal = limit(signal, -32768, 32767);
-
-		step = (step * indexScale[val]) >> 8;
-		step = limit(step, 0x7F, 0x6000);
-
-		data = val;
-
-		// low nibble
-#ifdef COMPILE_PA1SND
-		chan1 = ByteSwap16(*src);
-		src++;
-		chan2 = ByteSwap16(*src);
-		src++;
-
-		diff = ((chan1 + chan2) >> 1) - signal;
-#else
-		diff = ((*src++ + *src++) >> 1) - signal;
-#endif
-		diff <<= 3;
-		diff /= step;
-
-		val = abs(diff) >> 1;
-
-		if (val  > 7)	val = 7;
-		if (diff < 0)	val+= 8;
-
-		signal+= (step * diffLookup[val]) >> 3;
-		signal = limit(signal, -32768, 32767);
-
-		step = (step * indexScale[val]) >> 8;
-		step = limit(step, 0x7F, 0x6000);
-
-		data |= val << 4;
-
-		*dst++ = (UInt8)data;
-
-	} while (--length);
-
-}
diff --git a/backends/platform/PalmOS/Src/stuffs.h b/backends/platform/PalmOS/Src/stuffs.h
deleted file mode 100644
index 25bf17c8c6..0000000000
--- a/backends/platform/PalmOS/Src/stuffs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef STUFFS_H
-#define STUFFS_H
-
-enum {
-	kOptNone				=	0,
-	kOptDeviceARM			=	1 <<	0x00,
-	kOptDeviceOS5			=	1 <<	0x01,
-	kOptDeviceClie			=	1 <<	0x02,
-	kOptDeviceZodiac		=	1 <<	0x03,
-	kOptModeWide			=	1 <<	0x04,
-	kOptModeLandscape		=	1 <<	0x05,
-	kOptMode16Bit			=	1 <<	0x06,
-	kOptModeHiDensity		=	1 <<	0x07,
-	kOptCollapsible			=	1 <<	0x08,
-	kOptDisableOnScrDisp	=	1 <<	0x09,
-	kOpt5WayNavigatorV1		=	1 <<	0x0A,
-	kOpt5WayNavigatorV2		=	1 <<	0x0B,
-	kOptPalmSoundAPI		=	1 <<	0x0C,
-	kOptSonyPa1LibAPI		=	1 <<	0x0D,
-	kOptGoLcdAPI			=	1 <<	0x0E,
-	kOptLightspeedAPI		=	1 <<	0x0F,
-	kOptModeRotatable		=	1 <<	0x10,
-
-	kOptDeviceProcX86		=	1 <<	0x1F	// DEBUG only
-};
-
-// WARNING : you need to define OPTIONS_DEF()
-#define OPTIONS_TST(x)	(OPTIONS_DEF() & (x))
-#define OPTIONS_SET(x)	OPTIONS_DEF() |= (x)
-#define OPTIONS_RST(x)	OPTIONS_DEF() &= ~(x)
-
-#endif
diff --git a/backends/platform/PalmOS/Src/vibrate.h b/backends/platform/PalmOS/Src/vibrate.h
deleted file mode 100644
index 37604be5b7..0000000000
--- a/backends/platform/PalmOS/Src/vibrate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**********************************************************************
-**                                                                   **
-** vibrate.h                                                         **
-**                                                                   **
-** Definitions for setting/retrieving the state of the vibrator on   **
-** PalmOS 4.x devices. These calls are not officially supported by   **
-** Palm Inc and subsidiaries. It is not guaranteed that these calls  **
-** will work at all or at least the same on every device. YOU ARE    **
-** USING THESE ENTIRELY ON YOUR VERY OWN RISK !                      **
-**                                                                   **
-** Please send corrections to dseifert@dseifert.com                  **
-**********************************************************************/
-
-#include <PalmOS.h>
-
-/* HwrVibrateAttributes takes three arguments:
-**     Boolean set        Should the setting be set (1) or retrieved (0)
-**     UInt32  setting    what should be set
-**     void*   value      pointer to the value to set, or to store the
-**                        retrieved setting
-*/
-
-Err HwrVibrateAttributes(Boolean set, UInt32 setting, void *value)
-              SYS_TRAP(sysTrapHwrVibrateAttributes);
-
-/* to determine whether the vibrator is supported on a specific device, you
-** need to make sure that you are running on PalmOS 4.x (so that the
-** trap exists), that the attention manager exists and you need to check
-** whether HwrVibrateAttributes(0, 1, &active) returns an error code of
-** 0. ('active' is a Boolean).
-*/
-
-
-/***************************************************************/
-/* For the second parameter, the following defines can be used */
-/***************************************************************/
-
-/* *value points to a Boolean stating the state of the vibrator */
-#define kHwrVibrateActive                     1
-
-/* *value points to a UInt16, specifying the length of one cycle.
-** value is in ticks (1/100 seconds) */
-#define kHwrVibrateRate                       2
-
-/* *value points to a UInt32, specifying the pattern of vibrating
-**
-** example:
-**    0xFFFFFFFF    stay on, no vibrating
-**    0x0F0F0F0F    vibrate four times in equal intervals
-**    0xAAAAAAAA    vibrate really fast (not recommended)
-**    0x0F0F0000    vibrate twice, then pause
-*/
-#define kHwrVibratePattern                    3
-
-/* *value points to a UInt16, specifying the delay between two
-** cycles in ticks */
-#define kHwrVibrateDelay                      4
-
-/* *value points to a UInt16 specifying the amount of repeats. */
-#define kHwrVibrateRepeatCount                5
-
diff --git a/backends/platform/PalmOS/Src/zodiac_event.cpp b/backends/platform/PalmOS/Src/zodiac_event.cpp
deleted file mode 100644
index f629c4cbd6..0000000000
--- a/backends/platform/PalmOS/Src/zodiac_event.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_zodiac.h"
-
-bool OSystem_PalmZodiac::check_event(Common::Event &event, EventPtr ev) {
-	if (ev->eType == keyUpEvent) {
-		switch (ev->data.keyDown.chr) {
-		case vchrActionLeft:
-			event.type = Common::EVENT_LBUTTONUP;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-
-		case vchrActionRight:
-			event.type = Common::EVENT_RBUTTONUP;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-		}
-
-	} else if (ev->eType == keyDownEvent) {
-		switch (ev->data.keyDown.chr) {
-		// F5 = menu
-		case vchrThumbWheelBack:
-			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = Common::KEYCODE_F5;
-			event.kbd.ascii = Common::ASCII_F5;
-			event.kbd.flags = 0;
-			return true;
-
-		case vchrTriggerLeft:
-			hotswap_gfx_mode(_mode == GFX_WIDE ? GFX_NORMAL: GFX_WIDE);
-			return false; // not a key
-
-		case vchrTriggerRight:
-			setFeatureState(kFeatureAspectRatioCorrection, 0);
-			return false; // not a key
-
-		case vchrActionLeft:
-			event.type = Common::EVENT_LBUTTONDOWN;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-
-		case vchrActionRight:
-			event.type = Common::EVENT_RBUTTONDOWN;
-			event.mouse.x = _mouseCurState.x;
-			event.mouse.y = _mouseCurState.y;
-			return true;
-
-		// skip text
-		case vchrActionDown:
-			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = Common::KEYCODE_PERIOD;
-			event.kbd.ascii = '.';
-			event.kbd.flags = 0;
-			return true;
-
-		// trun off
-		case vchrAutoOff:
-		case vchrPowerOff:
-			// pause the sound thread if any
-			if (_sound.active)
-				SndStreamPause(_soundEx.handle, true);
-			break;
-
-		case vchrLateWakeup:
-			// resume the sound thread if any
-			if (_sound.active)
-				SndStreamPause(_soundEx.handle, false);
-			break;
-		}
-
-	}
-
-	return false;
-}
diff --git a/backends/platform/PalmOS/Src/zodiac_gfx.cpp b/backends/platform/PalmOS/Src/zodiac_gfx.cpp
deleted file mode 100644
index 98c563e101..0000000000
--- a/backends/platform/PalmOS/Src/zodiac_gfx.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_zodiac.h"
-#include "common/config-manager.h"
-#include "rumble.h"
-
-static asm Err _TwGfxOpen(void **aResult, void *aInfoResult) {
-	stmfd sp!, {r4-r11,lr}
-	ldr r9, [r9]
-	ldr r9, [r9]
-	sub sp, sp, #0x24
-	mov r6, r0
-	mov r7, r1
-	ldr pc, =0x200995F0
-}
-
-int OSystem_PalmZodiac::getDefaultGraphicsMode() const {
-	return GFX_WIDE;
-}
-
-void OSystem_PalmZodiac::load_gfx_mode() {
-	Err e;
-
-	if (_gfxLoaded)
-		return;
-	_gfxLoaded = true;
-
-	// get command line config
-	_fullscreen = ConfMan.getBool("fullscreen");	// TODO : (NORMAL mode)
-	_ratio.adjustAspect = ConfMan.getBool("aspect_ratio") ? kRatioHeight : kRatioNone;
-
-	// precalc ratio (WIDE mode)
-	_ratio.width = (gVars->screenFullHeight * _screenWidth / _screenHeight);
-	_ratio.height = (gVars->screenFullWidth * _screenHeight / _screenWidth);
-
-	_offScreenP = (byte *)MemPtrNew(_screenWidth * _screenHeight);
-
-	MemSet(_offScreenP, _screenWidth * _screenHeight, 0);
-	MemSet(_nativePal, sizeof(_nativePal), 0);
-	MemSet(_currentPalette, sizeof(_currentPalette), 0);
-
-	UInt32 depth = 16;
-	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
-
-	_sysOldOrientation = SysGetOrientation();
-	_sysOldTriggerState = PINGetInputTriggerState();
-	SysSetOrientation(sysOrientationLandscape);
-	SysSetOrientationTriggerState(sysOrientationTriggerDisabled);
-	PINSetInputTriggerState(pinInputTriggerDisabled);
-
-	gVars->indicator.on = Graphics::RGBToColor<Graphics::ColorMasks<565> >(0,255,0);
-	gVars->indicator.off = Graphics::RGBToColor<Graphics::ColorMasks<565> >(0,0,0);
-
-	_screenH = WinGetDisplayWindow();
-	_screenP = (byte *)BmpGetBits(WinGetBitmap(_screenH));
-
-	e = _TwGfxOpen((void **)&_gfxH, 0);
-	e = TwGfxGetPalmDisplaySurface(_gfxH, &_palmScreenP);
-
-	// overlay buffer
-	TwGfxSurfaceInfoType nfo = {
-		sizeof(TwGfxSurfaceInfoType),
-		_screenWidth, _screenHeight, _screenWidth * 2,
-		twGfxLocationAcceleratorMemory,
-		twGfxPixelFormatRGB565_LE
-	};
-	e = TwGfxAllocSurface(_gfxH, &_overlayP, &nfo);
-
-	// prepare main bitmap
-	_srcBmp.size = sizeof(TwGfxBitmapType);
-	_srcBmp.width = _screenWidth;
-	_srcBmp.height = _screenHeight;
-	_srcBmp.rowBytes = _screenWidth;
-	_srcBmp.pixelFormat = twGfxPixelFormat8bpp;
-	_srcBmp.data = _offScreenP;
-	_srcBmp.palette = (UInt16 *)_nativePal;
-
-	_srcRect.x = 0;
-	_srcRect.y = 0;
-	_srcRect.w = _screenWidth;
-	_srcRect.h = _screenHeight;
-
-	hotswap_gfx_mode(_mode);
-}
-
-void OSystem_PalmZodiac::hotswap_gfx_mode(int mode) {
-	Err e;
-	TwGfxSetClip(_palmScreenP, 0);
-	WinSetDrawWindow(_screenH);
-
-	_screenDest.w = _screenWidth;
-	_screenDest.h = _screenHeight;
-
-	// prevent bad DIA redraw (Stat part)
-	if (mode  == GFX_NORMAL) {
-		_redawOSD = true;
-		_stretched = (_screenWidth > gVars->screenWidth);
-		StatShow();
-		PINSetInputAreaState(pinInputAreaOpen);
-
-		if (_stretched) {
-			calc_rect(false);
-		} else {
-			// offsets
-			_screenOffset.x = (gVars->screenWidth - _screenWidth) / 2;
-			_screenOffset.y = (gVars->screenHeight - _screenHeight) / 2;
-
-			// clip Tapwave API
-			TwGfxRectType rt = { _screenOffset.x, _screenOffset.y, _screenWidth, _screenHeight };
-			TwGfxSetClip(_palmScreenP, &rt);
-		}
-
-	} else {
-		_redawOSD = false;
-		_stretched = true;
-		PINSetInputAreaState(pinInputAreaClosed);
-		StatHide();
-
-		calc_rect(true);
-	}
-
-	if (_stretched) {
-		OPTIONS_SET(kOptDisableOnScrDisp);
-		TwGfxSetClip(_palmScreenP, &_dstRect);
-
-		if (!_tmpScreenP) {
-			// wide buffer
-			TwGfxSurfaceInfoType nfo = {
-				sizeof(TwGfxSurfaceInfoType),
-				_screenWidth, _screenHeight, _screenWidth * 2,
-				twGfxLocationAcceleratorMemory,
-				twGfxPixelFormatRGB565_LE
-			};
-			e = TwGfxAllocSurface(_gfxH, &_tmpScreenP, &nfo);
-		}
-	} else {
-		OPTIONS_RST(kOptDisableOnScrDisp);
-		if (_tmpScreenP) {
-			e = TwGfxFreeSurface(_tmpScreenP);
-			_tmpScreenP = NULL;
-		}
-	}
-
-	_mode = mode;
-	_srcPos.x = _screenOffset.x;
-	_srcPos.y = _screenOffset.y;
-	clear_screen();
-//	updateScreen();
-}
-
-void OSystem_PalmZodiac::unload_gfx_mode() {
-	Err e;
-
-	if (!_gfxLoaded)
-		return;
-	_gfxLoaded = false;
-
-	if (_tmpScreenP) {
-		e = TwGfxFreeSurface(_tmpScreenP);
-		_tmpScreenP = NULL;
-	}
-
-	e = TwGfxFreeSurface(_overlayP);
-	e = TwGfxClose(_gfxH);
-
-	UInt32 depth = 8;
-	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
-	clear_screen();
-
-	MemPtrFree(_offScreenP);
-
-	PINSetInputTriggerState(_sysOldTriggerState);
-	SysSetOrientation(_sysOldOrientation);
-	StatShow();
-	PINSetInputAreaState(pinInputAreaOpen);
-}
-
-static void rumblePack(Boolean active) {
-	if (!gVars->vibrator)
-		return;
-
-	RumbleRun(active);
-}
-
-void OSystem_PalmZodiac::int_setShakePos(int shakeOffset) {
-	if (shakeOffset == 0)
-		rumblePack(false);
-}
-
-void OSystem_PalmZodiac::updateScreen() {
-	Err e;
-
-	// draw the mouse pointer
-	draw_mouse();
-
-	// update the screen
-	if (_overlayVisible) {
-		if (_stretched) {
-			TwGfxRectType dst = {_dstRect.x, _dstRect.y, _dstRect.w, _dstRect.h};
-			e = TwGfxStretchBlt2(_palmScreenP, &dst, _overlayP, &_srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0));
-		} else {
-			e = TwGfxBitBlt(_palmScreenP, &_srcPos, _overlayP, &_srcRect);
-		}
-
-	} else {
-		if (_stretched) {
-			TwGfxPointType pos = {0, 0};
-			TwGfxRectType dst = {_dstRect.x, _dstRect.y, _dstRect.w, _dstRect.h};
-
-			if (_new_shake_pos != _current_shake_pos) {
-				TwGfxRectType r = { _screenOffset.x, _screenOffset.y, _dstRect.w, _new_shake_pos };
-
-				if (_new_shake_pos != 0) {
-					TwGfxFillRect(_palmScreenP, &r, 0);
-					rumblePack(_new_shake_pos >= 3);
-				}
-				r.y += dst.h;
-				r.h = _current_shake_pos;
-				TwGfxFillRect(_palmScreenP, &r, 0);
-
-				_current_shake_pos = _new_shake_pos;
-				dst.y += _new_shake_pos;
-			}
-			e = TwGfxDrawBitmap(_tmpScreenP, &pos, &_srcBmp);
-			e = TwGfxWaitForVBlank(_gfxH);
-			e = TwGfxStretchBlt2(_palmScreenP, &dst, _tmpScreenP, &_srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0));
-
-		} else {
-			TwGfxPointType pos = {_srcPos.x, _srcPos.y};
-
-			if (_new_shake_pos != _current_shake_pos) {
-				if (_new_shake_pos != 0) {
-					TwGfxRectType r = { _screenOffset.x, _screenOffset.y, _screenWidth, _new_shake_pos };
-					TwGfxFillRect(_palmScreenP, &r, 0);
-					rumblePack(_new_shake_pos >= 3);
-				}
-				_current_shake_pos = _new_shake_pos;
-				pos.y += _new_shake_pos;
-			}
-			e = TwGfxDrawBitmap(_palmScreenP, &pos, &_srcBmp);
-		}
-	}
-
-	// undraw the mouse
-	undraw_mouse();
-}
-
-void OSystem_PalmZodiac::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {
-	if (_mode != GFX_NORMAL)
-		return;
-	MemHandle hTemp = DmGetResource(bitmapRsc, id + 100);
-
-	if (hTemp) {
-		RGBColorType oldRGB;
-		static const RGBColorType pal[4] = {
-			{0,0,255,0},
-			{0,255,255,0},
-			{0,255,0,0},
-			{0,0,0,0}
-		};
-
-		BitmapType *bmTemp;
-		bmTemp	= (BitmapType *)MemHandleLock(hTemp);
-
-		Coord w, h;
-		WinGetBitmapDimensions(bmTemp, &w, &h);	// return the size of the low density bmp
-
-		PointType dst = { _screenOffset.x + x, _screenOffset.y + y };
-		RectangleType c, r = { dst.x, dst.y, w * 2, h * 2 };
-
-		UInt16 old = WinSetCoordinateSystem(kCoordinatesNative);
-		WinSetDrawWindow(_screenH);
-		if (show) {
-			WinSetForeColorRGB(&pal[3], &oldRGB);
-			WinSetBackColorRGB(&pal[color], &oldRGB);
-			WinPaintBitmap(bmTemp, dst.x, dst.y);
-		} else {
-			WinSetBackColorRGB(&pal[3], &oldRGB);
-			WinFillRectangle(&r, 0);
-		}
-		WinSetCoordinateSystem(old);
-
-		MemPtrUnlock(bmTemp);
-		DmReleaseResource(hTemp);
-	}
-}
diff --git a/backends/platform/PalmOS/Src/zodiac_mouse.cpp b/backends/platform/PalmOS/Src/zodiac_mouse.cpp
deleted file mode 100644
index 39a789aaa1..0000000000
--- a/backends/platform/PalmOS/Src/zodiac_mouse.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_zodiac.h"
-
-void OSystem_PalmZodiac::draw_mouse() {
-	if (!_mouseDataP || _mouseDrawn || !_mouseVisible)
-		return;
-
-	byte *src = _mouseDataP;
-
-	int x = _mouseCurState.x - _mouseHotspotX;
-	int y = _mouseCurState.y - _mouseHotspotY;
-	int w = _mouseCurState.w;
-	int h = _mouseCurState.h;
-
-	// clip the mouse rect
-	if (y < 0) {
-		src -= y * w;
-		h += y;
-		y = 0;
-	}
-	if (x < 0) {
-		src -= x;
-		w += x;
-		x = 0;
-	}
-
-	if (h > _screenHeight - y)
-		h = _screenHeight - y;
-	if (w > _screenWidth - x)
-		w = _screenWidth - x;
-
-	if (w <= 0 || h <= 0)
-		return;
-
-	// store the bounding box so that undraw mouse can restore the area the
-	// mouse currently covers to its original content
-	_mouseOldState.x = x;
-	_mouseOldState.y = y;
-	_mouseOldState.w = w;
-	_mouseOldState.h = h;
-
-	byte color;
-	int ww;
-
-	if (_overlayVisible) {
-		uint16 *bak = (uint16 *)_mouseBackupP;
-		uint16 *pal = _cursorPaletteDisabled ? _nativePal : _mousePal;
-		uint16 *dst;
-
-		TwGfxLockSurface(_overlayP, (void **)&dst);
-		dst += y * _screenWidth + x;
-
-		do {
-			ww = w;
-			do {
-				*bak++ = *dst;
-				color = *src++;
-
-				// transparent, don't draw
-				if (color != _mouseKeyColor)
-					*dst = pal[color];
-				dst++;
-			} while (--ww);
-
-			src += _mouseCurState.w - w;
-			dst += _screenWidth - w;
-		} while (--h);
-
-		TwGfxUnlockSurface(_overlayP, true);
-
-	} else {
-		byte *bak = _mouseBackupP;
-		byte *dst =_offScreenP + y * _screenWidth + x;
-
-		do {
-			ww = w;
-			do {
-				*bak++ = *dst;
-				color = *src++;
-
-				// transparent, don't draw
-				if (color != _mouseKeyColor)
-					*dst = color;
-				dst++;
-			} while (--ww);
-
-			src += _mouseCurState.w - w;
-			dst += _screenWidth - w;
-		} while (--h);
-	}
-
-	_mouseDrawn = true;
-}
-
-void OSystem_PalmZodiac::undraw_mouse() {
-	if (!_mouseDrawn)
-		return;
-
-	int h = _mouseOldState.h;
-
-	// no need to do clipping here, since draw_mouse() did that already
-	if (_overlayVisible) {
-		uint16 *dst;
-		uint16 *bak = (uint16 *)_mouseBackupP;
-
-		TwGfxLockSurface(_overlayP, (void **)&dst);
-		dst += _mouseOldState.y * _screenWidth + _mouseOldState.x;
-
-		do {
-			MemMove(dst, bak, _mouseOldState.w * 2);
-			dst += _screenWidth;
-			bak += _mouseOldState.w;
-		} while (--h);
-
-		TwGfxUnlockSurface(_overlayP, true);
-
-	} else {
-		byte *dst = _offScreenP + _mouseOldState.y * _screenWidth + _mouseOldState.x;
-		byte *bak = _mouseBackupP;
-
-		do {
-			MemMove(dst, bak, _mouseOldState.w);
-			dst += _screenWidth;
-			bak +=  _mouseOldState.w;
-		} while (--h);
-	}
-
-	_mouseDrawn = false;
-}
diff --git a/backends/platform/PalmOS/Src/zodiac_overlay.cpp b/backends/platform/PalmOS/Src/zodiac_overlay.cpp
deleted file mode 100644
index f8322e8fa5..0000000000
--- a/backends/platform/PalmOS/Src/zodiac_overlay.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "be_zodiac.h"
-#include "common/endian.h"
-
-void OSystem_PalmZodiac::clearOverlay() {
-	if (!_overlayVisible)
-		return;
-
-	Err e;
-	TwGfxPointType pos = {0, 0};
-	TwGfxBitmapType bmp = {
-		sizeof(TwGfxBitmapType),
-		_screenWidth, _screenHeight, _screenWidth, twGfxPixelFormat8bpp,
-		(void *)_offScreenP, (UInt16 *)_nativePal
-	};
-	e = TwGfxDrawBitmap(_overlayP, &pos, &bmp);
-}
-
-void OSystem_PalmZodiac::grabOverlay(OverlayColor *buf, int pitch) {
-	Err e;
-	OverlayColor *src;
-
-	e = TwGfxLockSurface(_overlayP, (void **)&src);
-	int h = _screenHeight;
-	do {
-		memcpy(buf, src, _screenWidth * 2);
-		src += _screenWidth;
-		buf += pitch;
-	} while (--h);
-
-	e = TwGfxUnlockSurface(_overlayP, 0);
-}
-
-void OSystem_PalmZodiac::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
-	Err e;
-	TwGfxPointType pos = {x, y};
-	TwGfxBitmapType bmp = {
-		sizeof(TwGfxBitmapType),
-		w, h, pitch * 2 , twGfxPixelFormatRGB565_LE,
-		(void *)buf, 0
-	};
-	e = TwGfxDrawBitmap(_overlayP, &pos, &bmp);
-}
diff --git a/backends/platform/PalmOS/arm.bat b/backends/platform/PalmOS/arm.bat
deleted file mode 100755
index 547ae391fe..0000000000
--- a/backends/platform/PalmOS/arm.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-as.exe --defsym PALMOS_MODE=1 ../../../sound/rate_arm_asm.s -o Obj/rate_arm_asm.o
-as.exe --defsym PALMOS_MODE=1 ../../../engines/scumm/gfxARM.s -o Obj/gfxARM.o
-as.exe --defsym PALMOS_MODE=1 ../../../engines/scumm/smush/codec47ARM.s -o Obj/codec47ARM.o
diff --git a/backends/platform/PalmOS/scummvm.mcp b/backends/platform/PalmOS/scummvm.mcp
deleted file mode 100644
index a01967d059..0000000000
--- a/backends/platform/PalmOS/scummvm.mcp
+++ /dev/null
diff --git a/backends/platform/android/README.build b/backends/platform/android/README.build
new file mode 100644
index 0000000000..1c407bd469
--- /dev/null
+++ b/backends/platform/android/README.build
@@ -0,0 +1,91 @@
+Building the ScummVM Android port
+=================================
+
+You will need these things to build:
+1. Android SDK
+2. An arm-oe-linux-androideabi GCC toolchain(*)
+
+In the example commands, we are going to build against the Android 1.5
+native ABI (but using the Android 1.6 SDK tools).  Other version
+combinations might/should be possible with a bit of tweaking.
+
+(*) Any other sane Android toolchain should be easy to use, but this
+is the toolchain prefix that is used by default.  You can trivially
+find and modify the single location where it appears in ./configure if
+you have some other prefix variation.
+
+
+In detail:
+
+1. Android SDK
+
+Download the SDK from http://developer.android.com/ and install
+somewhere.  You will need both the API level 8 (aka Android 2.2) and
+API level 3 (aka Android 1.5) platforms.
+
+2. arm-*-linux-androideabi GCC toolchain
+
+You have several choices for toolchains:
+
+ - Use Google arm-eabi prebuilt toolchain.
+
+This is shipped with both the Android source release and Android NDK.
+The problem is that "arm-eabi-gcc" can't actually link anything
+successfully without extra command line flags.  To use this with the
+ScummVM configure/build environment you will need to create a family
+of shell wrapper scripts that convert "arm-oe-linux-androideabi-foo" to
+"arm-eabi-foo -mandroid".
+
+For example, I use this script:
+ #!/bin/sh
+ exec arm-eabi-${0##*-} -mandroid -DANDROID "$@"
+
+... and create a family of symlinks/hardlinks pointing to it called
+arm-oe-android-linuxeabi-gcc, arm-oe-android-linuxeabi-g++, etc.  For
+tools that don't take a "-mandroid" argument - like arm-eabi-strip - I
+bypass the shell wrapper and just create an arm-oe-android-linuxeabi-strip
+symlink to the tool directly.
+
+In practice you will probably need significant linker command line
+massaging in order to get the crtbegin/end and libraries all linked in
+the right way.  It's not hard to do manually, but it is annoying to
+script in a general purpose way.
+
+ - Build your own arm-*-linux-androideabi toolchain from GCC source.
+
+This is lots of fun, but will become significantly easier once gcc-4.6
+is released.  In the interim, I suggest using my precompiled Android
+openembedded-based toolchain:
+ wget http://commondatastorage.googleapis.com/anr/sdk/android-2.2-i686-linux-armv5te-linux-androideabi-toolchain-android.tar.bz2
+ sudo tar jxf android-2.2-i686-linux-armv5te-linux-androideabi-toolchain-android.tar.bz2 -C /
+ . /usr/local/android/arm/environment-setup
+
+Alternatively, do a websearch - there are several other cross-compile
+toolchains around.
+
+
+Building ScummVM
+================
+
+(Optionally) compress scummmodern.zip:
+(ScummVM usually ships it uncompressed, but Android can read it more
+efficiently if it is compressed *before* adding it to the apk)
+
+ ( cd gui/themes/scummmodern && zip -f ../scummmodern.zip )
+
+Then build ScummVM:
+
+ export ANDROID_SDK=<root of Android SDK>
+
+ PATH=$ANDROID_SDK/platforms/android-1.6/tools:$ANDROID_SDK/tools:$PATH
+ # You also want to ensure your arm-oe-linux-androideabi toolchain is in $PATH
+
+ export ANDROID_TOP=<root of built Android source>
+
+ ./configure --backend=android --host=android --enable-zlib #and any other flags
+ make scummvm.apk
+
+This will build a "monolithic" ScummVM package, with the engines
+statically linked in.  If you want to build separate engine packages,
+like on the market, add "--enable-plugins --default-dynamic" to
+configure and also make scummvm-engine-scumm.apk, etc.
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
new file mode 100644
index 0000000000..f6af0fcff5
--- /dev/null
+++ b/backends/platform/android/android.cpp
@@ -0,0 +1,1412 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/base-backend.h"
+#include "base/main.h"
+#include "graphics/surface.h"
+
+#include "backends/platform/android/video.h"
+
+#if defined(ANDROID_BACKEND)
+
+#include <jni.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <android/log.h>
+
+#include "common/archive.h"
+#include "common/util.h"
+#include "common/rect.h"
+#include "common/queue.h"
+#include "common/mutex.h"
+#include "common/events.h"
+#include "common/config-manager.h"
+
+#include "backends/fs/posix/posix-fs-factory.h"
+#include "backends/keymapper/keymapper.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
+#include "backends/plugins/posix/posix-provider.h"
+#include "sound/mixer_intern.h"
+
+#include "backends/platform/android/asset-archive.h"
+
+#undef LOG_TAG
+#define LOG_TAG "ScummVM"
+
+#if 0
+#define ENTER(args...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, args)
+#else
+#define ENTER(args...) /**/
+#endif
+
+// Fix JNIEXPORT declaration to actually do something useful
+#undef JNIEXPORT
+#define JNIEXPORT __attribute__ ((visibility("default")))
+
+// This replaces the bionic libc assert message with something that
+// actually prints the assertion failure before aborting.
+extern "C"
+void __assert(const char *file, int line, const char *expr) {
+	__android_log_assert(expr, LOG_TAG, "%s:%d: Assertion failure: %s",
+						 file, line, expr);
+}
+
+static JavaVM *cached_jvm;
+static jfieldID FID_Event_type;
+static jfieldID FID_Event_synthetic;
+static jfieldID FID_Event_kbd_keycode;
+static jfieldID FID_Event_kbd_ascii;
+static jfieldID FID_Event_kbd_flags;
+static jfieldID FID_Event_mouse_x;
+static jfieldID FID_Event_mouse_y;
+static jfieldID FID_Event_mouse_relative;
+static jfieldID FID_ScummVM_nativeScummVM;
+static jmethodID MID_Object_wait;
+
+JNIEnv* JNU_GetEnv() {
+	JNIEnv* env;
+	bool version_unsupported =
+		cached_jvm->GetEnv((void**)&env, JNI_VERSION_1_2);
+	assert(! version_unsupported);
+	return env;
+}
+
+static void JNU_ThrowByName(JNIEnv* env, const char* name, const char* msg) {
+	jclass cls = env->FindClass(name);
+	// if cls is NULL, an exception has already been thrown
+	if (cls != NULL)
+		env->ThrowNew(cls, msg);
+	env->DeleteLocalRef(cls);
+}
+
+// floating point.	use sparingly.
+template <class T>
+static inline T scalef(T in, float numerator, float denominator) {
+	return static_cast<float>(in) * numerator / denominator;
+}
+
+static inline GLfixed xdiv(int numerator, int denominator) {
+	assert(numerator < (1<<16));
+	return (numerator << 16) / denominator;
+}
+
+#ifdef DYNAMIC_MODULES
+class AndroidPluginProvider : public POSIXPluginProvider {
+protected:
+	virtual void addCustomDirectories(Common::FSList &dirs) const;
+};
+#endif
+
+
+#if 0
+#define CHECK_GL_ERROR() checkGlError(__FILE__, __LINE__)
+static const char* getGlErrStr(GLenum error) {
+	switch (error) {
+	case GL_NO_ERROR:		   return "GL_NO_ERROR";
+	case GL_INVALID_ENUM:	   return "GL_INVALID_ENUM";
+	case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
+	case GL_STACK_OVERFLOW:	   return "GL_STACK_OVERFLOW";
+	case GL_STACK_UNDERFLOW:   return "GL_STACK_UNDERFLOW";
+	case GL_OUT_OF_MEMORY:	   return "GL_OUT_OF_MEMORY";
+	}
+
+	static char buf[40];
+	snprintf(buf, sizeof(buf), "(Unknown GL error code 0x%x)", error);
+	return buf;
+}
+static void checkGlError(const char* file, int line) {
+	GLenum error = glGetError();
+	if (error != GL_NO_ERROR)
+		warning("%s:%d: GL error: %s", file, line, getGlErrStr(error));
+}
+#else
+#define CHECK_GL_ERROR() do {} while (false)
+#endif
+
+class OSystem_Android : public BaseBackend {
+private:
+	jobject _back_ptr;	// back pointer to (java) peer instance
+	jmethodID MID_displayMessageOnOSD;
+	jmethodID MID_setWindowCaption;
+	jmethodID MID_initBackend;
+	jmethodID MID_audioSampleRate;
+	jmethodID MID_showVirtualKeyboard;
+	jmethodID MID_getSysArchives;
+	jmethodID MID_getPluginDirectories;
+	jmethodID MID_setupScummVMSurface;
+	jmethodID MID_destroyScummVMSurface;
+	jmethodID MID_swapBuffers;
+
+	int _screen_changeid;
+	int _egl_surface_width;
+	int _egl_surface_height;
+
+	bool _force_redraw;
+
+	// Game layer
+	GLESPaletteTexture* _game_texture;
+	int _shake_offset;
+	Common::Rect _focus_rect;
+	bool _full_screen_dirty;
+
+	// Overlay layer
+	GLES4444Texture* _overlay_texture;
+	bool _show_overlay;
+
+	// Mouse layer
+	GLESPaletteATexture* _mouse_texture;
+	Common::Point _mouse_hotspot;
+	int _mouse_targetscale;
+	bool _show_mouse;
+	bool _use_mouse_palette;
+
+	Common::Queue<Common::Event> _event_queue;
+	MutexRef _event_queue_lock;
+
+	bool _timer_thread_exit;
+	pthread_t _timer_thread;
+	static void* timerThreadFunc(void* arg);
+
+	bool _enable_zoning;
+	bool _virtkeybd_on;
+
+	Common::SaveFileManager *_savefile;
+	Audio::MixerImpl *_mixer;
+	Common::TimerManager *_timer;
+	FilesystemFactory *_fsFactory;
+	Common::Archive *_asset_archive;
+	timeval _startTime;
+
+	void setupScummVMSurface();
+	void destroyScummVMSurface();
+	void setupKeymapper();
+	void _setCursorPalette(const byte *colors, uint start, uint num);
+
+public:
+	OSystem_Android(jobject am);
+	virtual ~OSystem_Android();
+	bool initJavaHooks(JNIEnv* env, jobject self);
+
+	static OSystem_Android* fromJavaObject(JNIEnv* env, jobject obj);
+	virtual void initBackend();
+	void addPluginDirectories(Common::FSList &dirs) const;
+	void enableZoning(bool enable) { _enable_zoning = enable; }
+	void setSurfaceSize(int width, int height) {
+		_egl_surface_width = width;
+		_egl_surface_height = height;
+	}
+
+	virtual bool hasFeature(Feature f);
+	virtual void setFeatureState(Feature f, bool enable);
+	virtual bool getFeatureState(Feature f);
+	virtual const GraphicsMode *getSupportedGraphicsModes() const;
+	virtual int getDefaultGraphicsMode() const;
+	bool setGraphicsMode(const char *name);
+	virtual bool setGraphicsMode(int mode);
+	virtual int getGraphicsMode() const;
+	virtual void initSize(uint width, uint height,
+				  const Graphics::PixelFormat *format);
+	virtual int getScreenChangeID() const { return _screen_changeid; }
+	virtual int16 getHeight();
+	virtual int16 getWidth();
+	virtual void setPalette(const byte *colors, uint start, uint num);
+	virtual void grabPalette(byte *colors, uint start, uint num);
+	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
+	virtual void updateScreen();
+	virtual Graphics::Surface *lockScreen();
+	virtual void unlockScreen();
+	virtual void setShakePos(int shakeOffset);
+	virtual void fillScreen(uint32 col);
+	virtual void setFocusRectangle(const Common::Rect& rect);
+	virtual void clearFocusRectangle();
+
+	virtual void showOverlay();
+	virtual void hideOverlay();
+	virtual void clearOverlay();
+	virtual void grabOverlay(OverlayColor *buf, int pitch);
+	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
+	virtual int16 getOverlayHeight();
+	virtual int16 getOverlayWidth();
+	virtual Graphics::PixelFormat getOverlayFormat() const {
+		// RGBA 4444
+		Graphics::PixelFormat format;
+		format.bytesPerPixel = 2;
+		format.rLoss = 8 - 4;
+		format.gLoss = 8 - 4;
+		format.bLoss = 8 - 4;
+		format.aLoss = 8 - 4;
+		format.rShift = 3*4;
+		format.gShift = 2*4;
+		format.bShift = 1*4;
+		format.aShift = 0*4;
+		return format;
+	}
+
+	virtual bool showMouse(bool visible);
+
+	virtual void warpMouse(int x, int y);
+	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
+	virtual void setCursorPalette(const byte *colors, uint start, uint num);
+	virtual void disableCursorPalette(bool disable);
+
+	virtual bool pollEvent(Common::Event &event);
+	void pushEvent(const Common::Event& event);
+	virtual uint32 getMillis();
+	virtual void delayMillis(uint msecs);
+
+	virtual MutexRef createMutex(void);
+	virtual void lockMutex(MutexRef mutex);
+	virtual void unlockMutex(MutexRef mutex);
+	virtual void deleteMutex(MutexRef mutex);
+
+	virtual void quit();
+
+	virtual void setWindowCaption(const char *caption);
+	virtual void displayMessageOnOSD(const char *msg);
+	virtual void showVirtualKeyboard(bool enable);
+
+	virtual Common::SaveFileManager *getSavefileManager();
+	virtual Audio::Mixer *getMixer();
+	virtual void getTimeAndDate(TimeDate &t) const;
+	virtual Common::TimerManager *getTimerManager();
+	virtual FilesystemFactory *getFilesystemFactory();
+	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+};
+
+OSystem_Android::OSystem_Android(jobject am)
+	: _back_ptr(0),
+	  _screen_changeid(0),
+	  _force_redraw(false),
+	  _game_texture(NULL),
+	  _overlay_texture(NULL),
+	  _mouse_texture(NULL),
+	  _use_mouse_palette(false),
+	  _show_mouse(false),
+	  _show_overlay(false),
+	  _enable_zoning(false),
+	  _savefile(0),
+	  _mixer(0),
+	  _timer(0),
+	  _fsFactory(new POSIXFilesystemFactory()),
+	  _asset_archive(new AndroidAssetArchive(am)),
+	  _shake_offset(0),
+	  _full_screen_dirty(false),
+	  _event_queue_lock(createMutex()) {
+}
+
+OSystem_Android::~OSystem_Android() {
+	ENTER("~OSystem_Android()");
+	delete _game_texture;
+	delete _overlay_texture;
+	delete _mouse_texture;
+	destroyScummVMSurface();
+	JNIEnv* env = JNU_GetEnv();
+	//env->DeleteWeakGlobalRef(_back_ptr);
+	env->DeleteGlobalRef(_back_ptr);
+	delete _savefile;
+	delete _mixer;
+	delete _timer;
+	delete _fsFactory;
+	delete _asset_archive;
+	deleteMutex(_event_queue_lock);
+}
+
+OSystem_Android* OSystem_Android::fromJavaObject(JNIEnv* env, jobject obj) {
+	jlong peer = env->GetLongField(obj, FID_ScummVM_nativeScummVM);
+	return (OSystem_Android*)peer;
+}
+
+bool OSystem_Android::initJavaHooks(JNIEnv* env, jobject self) {
+	// weak global ref to allow class to be unloaded
+	// ... except dalvik doesn't implement NewWeakGlobalRef (yet)
+	//_back_ptr = env->NewWeakGlobalRef(self);
+	_back_ptr = env->NewGlobalRef(self);
+
+	jclass cls = env->GetObjectClass(_back_ptr);
+
+#define FIND_METHOD(name, signature) do {						\
+		MID_ ## name = env->GetMethodID(cls, #name, signature); \
+		if (MID_ ## name == NULL)								\
+			return false;										\
+	} while (0)
+
+	FIND_METHOD(setWindowCaption, "(Ljava/lang/String;)V");
+	FIND_METHOD(displayMessageOnOSD, "(Ljava/lang/String;)V");
+	FIND_METHOD(initBackend, "()V");
+	FIND_METHOD(audioSampleRate, "()I");
+	FIND_METHOD(showVirtualKeyboard, "(Z)V");
+	FIND_METHOD(getSysArchives, "()[Ljava/lang/String;");
+	FIND_METHOD(getPluginDirectories, "()[Ljava/lang/String;");
+	FIND_METHOD(setupScummVMSurface, "()V");
+	FIND_METHOD(destroyScummVMSurface, "()V");
+	FIND_METHOD(swapBuffers, "()Z");
+
+#undef FIND_METHOD
+
+	return true;
+}
+
+static void ScummVM_create(JNIEnv* env, jobject self, jobject am) {
+	OSystem_Android* cpp_obj = new OSystem_Android(am);
+	if (!cpp_obj->initJavaHooks(env, self))
+		// Exception already thrown by initJavaHooks
+		return;
+
+	env->SetLongField(self, FID_ScummVM_nativeScummVM, (jlong)cpp_obj);
+
+#ifdef DYNAMIC_MODULES
+	PluginManager::instance().addPluginProvider(new AndroidPluginProvider());
+#endif
+}
+
+static void ScummVM_nativeDestroy(JNIEnv* env, jobject self) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+	delete cpp_obj;
+}
+
+static void ScummVM_audioMixCallback(JNIEnv* env, jobject self,
+									 jbyteArray jbuf) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+	jsize len = env->GetArrayLength(jbuf);
+	jbyte* buf = env->GetByteArrayElements(jbuf, NULL);
+	if (buf == NULL) {
+		warning("Unable to get Java audio byte array. Skipping.");
+		return;
+	}
+	Audio::MixerImpl* mixer =
+		static_cast<Audio::MixerImpl*>(cpp_obj->getMixer());
+	assert(mixer);
+	mixer->mixCallback(reinterpret_cast<byte*>(buf), len);
+	env->ReleaseByteArrayElements(jbuf, buf, 0);
+}
+
+static void ScummVM_setConfManInt(JNIEnv* env, jclass cls,
+				  jstring key_obj, jint value) {
+	ENTER("setConfManInt(%p, %d)", key_obj, (int)value);
+	const char* key = env->GetStringUTFChars(key_obj, NULL);
+	if (key == NULL)
+		return;
+	ConfMan.setInt(key, value);
+	env->ReleaseStringUTFChars(key_obj, key);
+}
+
+static void ScummVM_setConfManString(JNIEnv* env, jclass cls, jstring key_obj,
+					 jstring value_obj) {
+	ENTER("setConfManStr(%p, %p)", key_obj, value_obj);
+	const char* key = env->GetStringUTFChars(key_obj, NULL);
+	if (key == NULL)
+		return;
+	const char* value = env->GetStringUTFChars(value_obj, NULL);
+	if (value == NULL) {
+		env->ReleaseStringUTFChars(key_obj, key);
+		return;
+	}
+	ConfMan.set(key, value);
+	env->ReleaseStringUTFChars(value_obj, value);
+	env->ReleaseStringUTFChars(key_obj, key);
+}
+
+void* OSystem_Android::timerThreadFunc(void* arg) {
+	OSystem_Android* system = (OSystem_Android*)arg;
+	DefaultTimerManager* timer = (DefaultTimerManager*)(system->_timer);
+
+	struct timespec tv;
+	tv.tv_sec = 0;
+	tv.tv_nsec = 100 * 1000 * 1000;	// 100ms
+
+	while (!system->_timer_thread_exit) {
+		timer->handler();
+		nanosleep(&tv, NULL);
+	}
+
+	return NULL;
+}
+
+void OSystem_Android::initBackend() {
+	ENTER("initBackend()");
+	JNIEnv* env = JNU_GetEnv();
+
+	ConfMan.setInt("autosave_period", 0);
+	ConfMan.setInt("FM_medium_quality", true);
+
+	// must happen before creating TimerManager to avoid race in
+	// creating EventManager
+	setupKeymapper();
+
+	// BUG: "transient" ConfMan settings get nuked by the options
+	// screen.	Passing the savepath in this way makes it stick
+	// (via ConfMan.registerDefault)
+	_savefile = new DefaultSaveFileManager(ConfMan.get("savepath"));
+	_timer = new DefaultTimerManager();
+
+	gettimeofday(&_startTime, NULL);
+
+	jint sample_rate = env->CallIntMethod(_back_ptr, MID_audioSampleRate);
+	if (env->ExceptionCheck()) {
+		warning("Error finding audio sample rate - assuming 11025HZ");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+		sample_rate = 11025;
+	}
+	_mixer = new Audio::MixerImpl(this, sample_rate);
+	_mixer->setReady(true);
+
+	env->CallVoidMethod(_back_ptr, MID_initBackend);
+	if (env->ExceptionCheck()) {
+		error("Error in Java initBackend");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+	}
+
+	_timer_thread_exit = false;
+	pthread_create(&_timer_thread, NULL, timerThreadFunc, this);
+
+	OSystem::initBackend();
+
+	setupScummVMSurface();
+}
+
+void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const {
+	ENTER("OSystem_Android::addPluginDirectories()");
+	JNIEnv* env = JNU_GetEnv();
+
+	jobjectArray array =
+		(jobjectArray)env->CallObjectMethod(_back_ptr, MID_getPluginDirectories);
+	if (env->ExceptionCheck()) {
+		warning("Error finding plugin directories");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+		return;
+	}
+
+	jsize size = env->GetArrayLength(array);
+	for (jsize i = 0; i < size; ++i) {
+		jstring path_obj = (jstring)env->GetObjectArrayElement(array, i);
+		if (path_obj == NULL)
+			continue;
+		const char* path = env->GetStringUTFChars(path_obj, NULL);
+		if (path == NULL) {
+			warning("Error getting string characters from plugin directory");
+			env->ExceptionClear();
+			env->DeleteLocalRef(path_obj);
+			continue;
+		}
+		dirs.push_back(Common::FSNode(path));
+		env->ReleaseStringUTFChars(path_obj, path);
+		env->DeleteLocalRef(path_obj);
+	}
+}
+
+bool OSystem_Android::hasFeature(Feature f) {
+	return (f == kFeatureCursorHasPalette ||
+		f == kFeatureVirtualKeyboard ||
+		f == kFeatureOverlaySupportsAlpha);
+}
+
+void OSystem_Android::setFeatureState(Feature f, bool enable) {
+	ENTER("setFeatureState(%d, %d)", f, enable);
+	switch (f) {
+	case kFeatureVirtualKeyboard:
+		_virtkeybd_on = enable;
+		showVirtualKeyboard(enable);
+		break;
+	default:
+		break;
+	}
+}
+
+bool OSystem_Android::getFeatureState(Feature f) {
+	switch (f) {
+	case kFeatureVirtualKeyboard:
+		return _virtkeybd_on;
+	default:
+		return false;
+	}
+}
+
+const OSystem::GraphicsMode* OSystem_Android::getSupportedGraphicsModes() const {
+	static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
+		{"default", "Default", 1},
+		{0, 0, 0},
+	};
+	return s_supportedGraphicsModes;
+}
+
+
+int OSystem_Android::getDefaultGraphicsMode() const {
+	return 1;
+}
+
+bool OSystem_Android::setGraphicsMode(const char *mode) {
+	ENTER("setGraphicsMode(%s)", mode);
+	return true;
+}
+
+bool OSystem_Android::setGraphicsMode(int mode) {
+	ENTER("setGraphicsMode(%d)", mode);
+	return true;
+}
+
+int OSystem_Android::getGraphicsMode() const {
+	return 1;
+}
+
+void OSystem_Android::setupScummVMSurface() {
+	ENTER("setupScummVMSurface");
+	JNIEnv* env = JNU_GetEnv();
+	env->CallVoidMethod(_back_ptr, MID_setupScummVMSurface);
+	if (env->ExceptionCheck())
+		return;
+
+	// EGL set up with a new surface.  Initialise OpenGLES context.
+
+	GLESTexture::initGLExtensions();
+
+	// Turn off anything that looks like 3D ;)
+	glDisable(GL_CULL_FACE);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_FOG);
+	glDisable(GL_DITHER);
+	glShadeModel(GL_FLAT);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	glEnable(GL_TEXTURE_2D);
+
+	if (!_game_texture)
+		_game_texture = new GLESPaletteTexture();
+	else
+		_game_texture->reinitGL();
+
+	if (!_overlay_texture)
+		_overlay_texture = new GLES4444Texture();
+	else
+		_overlay_texture->reinitGL();
+
+	if (!_mouse_texture)
+		_mouse_texture = new GLESPaletteATexture();
+	else
+		_mouse_texture->reinitGL();
+
+	glViewport(0, 0, _egl_surface_width, _egl_surface_height);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrthof(0, _egl_surface_width, _egl_surface_height, 0, -1, 1);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	clearFocusRectangle();
+	CHECK_GL_ERROR();
+}
+
+void OSystem_Android::destroyScummVMSurface() {
+	JNIEnv* env = JNU_GetEnv();
+	env->CallVoidMethod(_back_ptr, MID_destroyScummVMSurface);
+	// Can't use OpenGLES functions after this
+}
+
+void OSystem_Android::initSize(uint width, uint height,
+							   const Graphics::PixelFormat *format) {
+	ENTER("initSize(%d,%d,%p)", width, height, format);
+
+	_game_texture->allocBuffer(width, height);
+
+	// Cap at 320x200 or the ScummVM themes abort :/
+	GLuint overlay_width = MIN(_egl_surface_width, 320);
+	GLuint overlay_height = MIN(_egl_surface_height, 200);
+	_overlay_texture->allocBuffer(overlay_width, overlay_height);
+
+	// Don't know mouse size yet - it gets reallocated in
+	// setMouseCursor.  We need the palette allocated before
+	// setMouseCursor however, so just take a guess at the desired
+	// size (it's small).
+	_mouse_texture->allocBuffer(20, 20);
+}
+
+int16 OSystem_Android::getHeight() {
+	return _game_texture->height();
+}
+
+int16 OSystem_Android::getWidth() {
+	return _game_texture->width();
+}
+
+void OSystem_Android::setPalette(const byte* colors, uint start, uint num) {
+	ENTER("setPalette(%p, %u, %u)", colors, start, num);
+
+	if (!_use_mouse_palette)
+		_setCursorPalette(colors, start, num);
+
+	byte* palette = _game_texture->palette() + start*3;
+	do {
+		for (int i = 0; i < 3; ++i)
+			palette[i] = colors[i];
+		palette += 3;
+		colors += 4;
+	} while (--num);
+}
+
+void OSystem_Android::grabPalette(byte *colors, uint start, uint num) {
+	ENTER("grabPalette(%p, %u, %u)", colors, start, num);
+	const byte* palette = _game_texture->palette_const() + start*3;
+	do {
+		for (int i = 0; i < 3; ++i)
+			colors[i] = palette[i];
+		colors[3] = 0xff;  // alpha
+
+		palette += 3;
+		colors += 4;
+	} while (--num);
+}
+
+void OSystem_Android::copyRectToScreen(const byte *buf, int pitch,
+					   int x, int y, int w, int h) {
+	ENTER("copyRectToScreen(%p, %d, %d, %d, %d, %d)",
+		  buf, pitch, x, y, w, h);
+
+	_game_texture->updateBuffer(x, y, w, h, buf, pitch);
+}
+
+void OSystem_Android::updateScreen() {
+	//ENTER("updateScreen()");
+
+	if (!_force_redraw &&
+		!_game_texture->dirty() &&
+		!_overlay_texture->dirty() &&
+		!_mouse_texture->dirty())
+		return;
+
+	_force_redraw = false;
+
+	glPushMatrix();
+
+	if (_shake_offset != 0 ||
+		(!_focus_rect.isEmpty() &&
+		 !Common::Rect(_game_texture->width(),
+					   _game_texture->height()).contains(_focus_rect))) {
+		// These are the only cases where _game_texture doesn't
+		// cover the entire screen.
+		glClearColorx(0, 0, 0, 1 << 16);
+		glClear(GL_COLOR_BUFFER_BIT);
+
+		// Move everything up by _shake_offset (game) pixels
+		glTranslatex(0, -_shake_offset << 16, 0);
+	}
+
+	if (_focus_rect.isEmpty()) {
+		_game_texture->drawTexture(0, 0,
+								   _egl_surface_width, _egl_surface_height);
+	} else {
+		glPushMatrix();
+		glScalex(xdiv(_egl_surface_width, _focus_rect.width()),
+				 xdiv(_egl_surface_height, _focus_rect.height()),
+				 1 << 16);
+		glTranslatex(-_focus_rect.left << 16, -_focus_rect.top << 16, 0);
+		glScalex(xdiv(_game_texture->width(), _egl_surface_width),
+				 xdiv(_game_texture->height(), _egl_surface_height),
+				 1 << 16);
+		_game_texture->drawTexture(0, 0,
+								   _egl_surface_width, _egl_surface_height);
+		glPopMatrix();
+	}
+
+	CHECK_GL_ERROR();
+
+	if (_show_overlay) {
+		_overlay_texture->drawTexture(0, 0,
+									  _egl_surface_width,
+									  _egl_surface_height);
+		CHECK_GL_ERROR();
+	}
+
+	if (_show_mouse) {
+		glPushMatrix();
+
+		glTranslatex(-_mouse_hotspot.x << 16,
+					 -_mouse_hotspot.y << 16,
+					 0);
+
+		// Scale up ScummVM -> OpenGL (pixel) coordinates
+		int texwidth, texheight;
+		if (_show_overlay) {
+			texwidth = getOverlayWidth();
+			texheight = getOverlayHeight();
+		} else {
+			texwidth = getWidth();
+			texheight = getHeight();
+		}
+		glScalex(xdiv(_egl_surface_width, texwidth),
+				 xdiv(_egl_surface_height, texheight),
+				 1 << 16);
+
+		// Note the extra half texel to position the mouse in
+		// the middle of the x,y square:
+		const Common::Point& mouse = getEventManager()->getMousePos();
+		glTranslatex((mouse.x << 16) | 1 << 15,
+					 (mouse.y << 16) | 1 << 15, 0);
+
+		// Mouse targetscale just seems to make the cursor way
+		// too big :/
+		//glScalex(_mouse_targetscale << 16, _mouse_targetscale << 16,
+		//	 1 << 16);
+
+		_mouse_texture->drawTexture();
+
+		glPopMatrix();
+	}
+
+	glPopMatrix();
+
+	CHECK_GL_ERROR();
+
+	JNIEnv* env = JNU_GetEnv();
+	if (!env->CallBooleanMethod(_back_ptr, MID_swapBuffers)) {
+		// Context lost -> need to reinit GL
+		destroyScummVMSurface();
+		setupScummVMSurface();
+	}
+}
+
+Graphics::Surface *OSystem_Android::lockScreen() {
+	ENTER("lockScreen()");
+	Graphics::Surface* surface = _game_texture->surface();
+	assert(surface->pixels);
+	return surface;
+}
+
+void OSystem_Android::unlockScreen() {
+	ENTER("unlockScreen()");
+	assert(_game_texture->dirty());
+}
+
+void OSystem_Android::setShakePos(int shake_offset) {
+	ENTER("setShakePos(%d)", shake_offset);
+	if (_shake_offset != shake_offset) {
+		_shake_offset = shake_offset;
+		_force_redraw = true;
+	}
+}
+
+void OSystem_Android::fillScreen(uint32 col) {
+	ENTER("fillScreen(%u)", col);
+	assert(col < 256);
+	_game_texture->fillBuffer(col);
+}
+
+void OSystem_Android::setFocusRectangle(const Common::Rect& rect) {
+	ENTER("setFocusRectangle(%d,%d,%d,%d)",
+		  rect.left, rect.top, rect.right, rect.bottom);
+	if (_enable_zoning) {
+		_focus_rect = rect;
+		_force_redraw = true;
+	}
+}
+
+void OSystem_Android::clearFocusRectangle() {
+	ENTER("clearFocusRectangle()");
+	if (_enable_zoning) {
+		_focus_rect = Common::Rect();
+		_force_redraw = true;
+	}
+}
+
+void OSystem_Android::showOverlay() {
+	ENTER("showOverlay()");
+	_show_overlay = true;
+	_force_redraw = true;
+}
+
+void OSystem_Android::hideOverlay() {
+	ENTER("hideOverlay()");
+	_show_overlay = false;
+	_force_redraw = true;
+}
+
+void OSystem_Android::clearOverlay() {
+	ENTER("clearOverlay()");
+	_overlay_texture->fillBuffer(0);
+}
+
+void OSystem_Android::grabOverlay(OverlayColor *buf, int pitch) {
+	ENTER("grabOverlay(%p, %d)", buf, pitch);
+	// We support overlay alpha blending, so the pixel data here
+	// shouldn't actually be used.	Let's fill it with zeros, I'm sure
+	// it will be fine...
+	const Graphics::Surface* surface = _overlay_texture->surface_const();
+	assert(surface->bytesPerPixel == sizeof(buf[0]));
+	int h = surface->h;
+	do {
+		memset(buf, 0, surface->w * sizeof(buf[0]));
+		buf += pitch;  // This 'pitch' is pixels not bytes
+	} while (--h);
+}
+
+void OSystem_Android::copyRectToOverlay(const OverlayColor *buf, int pitch,
+					int x, int y, int w, int h) {
+	ENTER("copyRectToOverlay(%p, %d, %d, %d, %d, %d)",
+		 buf, pitch, x, y, w, h);
+	const Graphics::Surface* surface = _overlay_texture->surface_const();
+	assert(surface->bytesPerPixel == sizeof(buf[0]));
+
+	// This 'pitch' is pixels not bytes
+	_overlay_texture->updateBuffer(x, y, w, h, buf, pitch * sizeof(buf[0]));
+}
+
+int16 OSystem_Android::getOverlayHeight() {
+	return _overlay_texture->height();
+}
+
+int16 OSystem_Android::getOverlayWidth() {
+	return _overlay_texture->width();
+}
+
+bool OSystem_Android::showMouse(bool visible) {
+	ENTER("showMouse(%d)", visible);
+	_show_mouse = visible;
+	return true;
+}
+
+void OSystem_Android::warpMouse(int x, int y) {
+	ENTER("warpMouse(%d, %d)", x, y);
+	// We use only the eventmanager's idea of the current mouse
+	// position, so there is nothing extra to do here.
+}
+
+void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
+					 int hotspotX, int hotspotY,
+					 uint32 keycolor, int cursorTargetScale,
+					 const Graphics::PixelFormat *format) {
+	ENTER("setMouseCursor(%p, %u, %u, %d, %d, %d, %d, %p)",
+		  buf, w, h, hotspotX, hotspotY, (int)keycolor, cursorTargetScale,
+		  format);
+
+	assert(keycolor < 256);
+
+	_mouse_texture->allocBuffer(w, h);
+
+	// Update palette alpha based on keycolor
+	byte* palette = _mouse_texture->palette();
+	int i = 256;
+	do {
+		palette[3] = 0xff;
+		palette += 4;
+	} while (--i);
+	palette = _mouse_texture->palette();
+	palette[keycolor*4 + 3] = 0x00;
+	_mouse_texture->updateBuffer(0, 0, w, h, buf, w);
+
+	_mouse_hotspot = Common::Point(hotspotX, hotspotY);
+	_mouse_targetscale = cursorTargetScale;
+}
+
+void OSystem_Android::_setCursorPalette(const byte *colors,
+					uint start, uint num) {
+	byte* palette = _mouse_texture->palette() + start*4;
+	do {
+		for (int i = 0; i < 3; ++i)
+			palette[i] = colors[i];
+		// Leave alpha untouched to preserve keycolor
+
+		palette += 4;
+		colors += 4;
+	} while (--num);
+}
+
+void OSystem_Android::setCursorPalette(const byte *colors,
+					   uint start, uint num) {
+	ENTER("setCursorPalette(%p, %u, %u)", colors, start, num);
+	_setCursorPalette(colors, start, num);
+	_use_mouse_palette = true;
+}
+
+void OSystem_Android::disableCursorPalette(bool disable) {
+	ENTER("disableCursorPalette(%d)", disable);
+	_use_mouse_palette = !disable;
+}
+
+void OSystem_Android::setupKeymapper() {
+#ifdef ENABLE_KEYMAPPER
+	using namespace Common;
+
+	Keymapper *mapper = getEventManager()->getKeymapper();
+
+	HardwareKeySet *keySet = new HardwareKeySet();
+	keySet->addHardwareKey(
+		new HardwareKey("n", KeyState(KEYCODE_n), "n (vk)",
+				kTriggerLeftKeyType,
+				kVirtualKeyboardActionType));
+	mapper->registerHardwareKeySet(keySet);
+
+	Keymap *globalMap = new Keymap("global");
+	Action *act;
+
+	act = new Action(globalMap, "VIRT", "Display keyboard",
+			 kVirtualKeyboardActionType);
+	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+
+	mapper->addGlobalKeymap(globalMap);
+
+	mapper->pushKeymap("global");
+#endif
+}
+
+bool OSystem_Android::pollEvent(Common::Event &event) {
+	//ENTER("pollEvent()");
+	lockMutex(_event_queue_lock);
+	if (_event_queue.empty()) {
+		unlockMutex(_event_queue_lock);
+		return false;
+	}
+	event = _event_queue.pop();
+	unlockMutex(_event_queue_lock);
+
+	switch (event.type) {
+	case Common::EVENT_MOUSEMOVE:
+		// TODO: only dirty/redraw move bounds
+		_force_redraw = true;
+		// fallthrough
+	case Common::EVENT_LBUTTONDOWN:
+	case Common::EVENT_LBUTTONUP:
+	case Common::EVENT_RBUTTONDOWN:
+	case Common::EVENT_RBUTTONUP:
+	case Common::EVENT_WHEELUP:
+	case Common::EVENT_WHEELDOWN:
+	case Common::EVENT_MBUTTONDOWN:
+	case Common::EVENT_MBUTTONUP: {
+		if (event.kbd.flags == 1) { // relative mouse hack
+			// Relative (trackball) mouse hack.
+			const Common::Point& mouse_pos =
+				getEventManager()->getMousePos();
+			event.mouse.x += mouse_pos.x;
+			event.mouse.y += mouse_pos.y;
+			event.mouse.x = CLIP(event.mouse.x, (int16)0, _show_overlay ?
+								 getOverlayWidth() : getWidth());
+			event.mouse.y = CLIP(event.mouse.y, (int16)0, _show_overlay ?
+								 getOverlayHeight() : getHeight());
+		} else {
+			// Touchscreen events need to be converted
+			// from device to game coords first.
+			const GLESTexture* tex = _show_overlay
+				? static_cast<GLESTexture*>(_overlay_texture)
+				: static_cast<GLESTexture*>(_game_texture);
+			event.mouse.x = scalef(event.mouse.x, tex->width(),
+								   _egl_surface_width);
+			event.mouse.y = scalef(event.mouse.y, tex->height(),
+								   _egl_surface_height);
+			event.mouse.x -= _shake_offset;
+		}
+		break;
+	}
+	case Common::EVENT_SCREEN_CHANGED:
+		debug("EVENT_SCREEN_CHANGED");
+		_screen_changeid++;
+		destroyScummVMSurface();
+		setupScummVMSurface();
+		break;
+	default:
+		break;
+	}
+
+	return true;
+}
+
+void OSystem_Android::pushEvent(const Common::Event& event) {
+	lockMutex(_event_queue_lock);
+
+	// Try to combine multiple queued mouse move events
+	if (event.type == Common::EVENT_MOUSEMOVE &&
+		!_event_queue.empty() &&
+		_event_queue.back().type == Common::EVENT_MOUSEMOVE) {
+	  Common::Event tail = _event_queue.back();
+	  if (event.kbd.flags) {
+		// relative movement hack
+		tail.mouse.x += event.mouse.x;
+		tail.mouse.y += event.mouse.y;
+	  } else {
+		// absolute position
+		tail.kbd.flags = 0;	 // clear relative flag
+		tail.mouse.x = event.mouse.x;
+		tail.mouse.y = event.mouse.y;
+	  }
+	}
+	else
+	  _event_queue.push(event);
+
+	unlockMutex(_event_queue_lock);
+}
+
+static void ScummVM_pushEvent(JNIEnv* env, jobject self, jobject java_event) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+
+	Common::Event event;
+	event.type = (Common::EventType)env->GetIntField(java_event,
+							 FID_Event_type);
+	event.synthetic =
+		env->GetBooleanField(java_event, FID_Event_synthetic);
+
+	switch (event.type) {
+	case Common::EVENT_KEYDOWN:
+	case Common::EVENT_KEYUP:
+		event.kbd.keycode = (Common::KeyCode)env->GetIntField(
+			java_event, FID_Event_kbd_keycode);
+		event.kbd.ascii = static_cast<int>(env->GetIntField(
+			java_event, FID_Event_kbd_ascii));
+		event.kbd.flags = static_cast<int>(env->GetIntField(
+			java_event, FID_Event_kbd_flags));
+		break;
+	case Common::EVENT_MOUSEMOVE:
+	case Common::EVENT_LBUTTONDOWN:
+	case Common::EVENT_LBUTTONUP:
+	case Common::EVENT_RBUTTONDOWN:
+	case Common::EVENT_RBUTTONUP:
+	case Common::EVENT_WHEELUP:
+	case Common::EVENT_WHEELDOWN:
+	case Common::EVENT_MBUTTONDOWN:
+	case Common::EVENT_MBUTTONUP:
+		event.mouse.x =
+			env->GetIntField(java_event, FID_Event_mouse_x);
+		event.mouse.y =
+			env->GetIntField(java_event, FID_Event_mouse_y);
+		// This is a terrible hack.	 We stash "relativeness"
+		// in the kbd.flags field until pollEvent() can work
+		// it out.
+		event.kbd.flags = env->GetBooleanField(
+			java_event, FID_Event_mouse_relative) ? 1 : 0;
+		break;
+	default:
+		break;
+	}
+
+	cpp_obj->pushEvent(event);
+}
+
+uint32 OSystem_Android::getMillis() {
+	timeval curTime;
+	gettimeofday(&curTime, NULL);
+	return (uint32)(((curTime.tv_sec - _startTime.tv_sec) * 1000) + \
+			((curTime.tv_usec - _startTime.tv_usec) / 1000));
+}
+
+void OSystem_Android::delayMillis(uint msecs) {
+	usleep(msecs * 1000);
+}
+
+OSystem::MutexRef OSystem_Android::createMutex() {
+	pthread_mutexattr_t attr;
+	pthread_mutexattr_init(&attr);
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+	pthread_mutex_t *mutex = new pthread_mutex_t;
+	if (pthread_mutex_init(mutex, &attr) != 0) {
+		warning("pthread_mutex_init() failed!");
+		delete mutex;
+		return NULL;
+	}
+	return (MutexRef)mutex;
+}
+
+void OSystem_Android::lockMutex(MutexRef mutex) {
+	if (pthread_mutex_lock((pthread_mutex_t*)mutex) != 0)
+		warning("pthread_mutex_lock() failed!");
+}
+
+void OSystem_Android::unlockMutex(MutexRef mutex) {
+	if (pthread_mutex_unlock((pthread_mutex_t*)mutex) != 0)
+		warning("pthread_mutex_unlock() failed!");
+}
+
+void OSystem_Android::deleteMutex(MutexRef mutex) {
+	pthread_mutex_t* m = (pthread_mutex_t*)mutex;
+	if (pthread_mutex_destroy(m) != 0)
+		warning("pthread_mutex_destroy() failed!");
+	else
+		delete m;
+}
+
+void OSystem_Android::quit() {
+	ENTER("quit()");
+
+	_timer_thread_exit = true;
+	pthread_join(_timer_thread, NULL);
+}
+
+void OSystem_Android::setWindowCaption(const char *caption) {
+	ENTER("setWindowCaption(%s)", caption);
+	JNIEnv* env = JNU_GetEnv();
+	jstring java_caption = env->NewStringUTF(caption);
+	env->CallVoidMethod(_back_ptr, MID_setWindowCaption, java_caption);
+	if (env->ExceptionCheck()) {
+		warning("Failed to set window caption");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+	}
+	env->DeleteLocalRef(java_caption);
+}
+
+void OSystem_Android::displayMessageOnOSD(const char *msg) {
+	ENTER("displayMessageOnOSD(%s)", msg);
+	JNIEnv* env = JNU_GetEnv();
+	jstring java_msg = env->NewStringUTF(msg);
+	env->CallVoidMethod(_back_ptr, MID_displayMessageOnOSD, java_msg);
+	if (env->ExceptionCheck()) {
+		warning("Failed to display OSD message");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+	}
+	env->DeleteLocalRef(java_msg);
+}
+
+void OSystem_Android::showVirtualKeyboard(bool enable) {
+	ENTER("showVirtualKeyboard(%d)", enable);
+	JNIEnv* env = JNU_GetEnv();
+	env->CallVoidMethod(_back_ptr, MID_showVirtualKeyboard, enable);
+	if (env->ExceptionCheck()) {
+		error("Error trying to show virtual keyboard");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+	}
+}
+
+Common::SaveFileManager *OSystem_Android::getSavefileManager() {
+	assert(_savefile);
+	return _savefile;
+}
+
+Audio::Mixer *OSystem_Android::getMixer() {
+	assert(_mixer);
+	return _mixer;
+}
+
+Common::TimerManager *OSystem_Android::getTimerManager() {
+	assert(_timer);
+	return _timer;
+}
+
+void OSystem_Android::getTimeAndDate(TimeDate &td) const {
+	struct tm tm;
+	const time_t curTime = time(NULL);
+	localtime_r(&curTime, &tm);
+	td.tm_sec = tm.tm_sec;
+	td.tm_min = tm.tm_min;
+	td.tm_hour = tm.tm_hour;
+	td.tm_mday = tm.tm_mday;
+	td.tm_mon = tm.tm_mon;
+	td.tm_year = tm.tm_year;
+}
+
+FilesystemFactory *OSystem_Android::getFilesystemFactory() {
+	return _fsFactory;
+}
+
+void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s,
+						int priority) {
+	s.add("ASSET", _asset_archive, priority, false);
+
+	JNIEnv* env = JNU_GetEnv();
+
+	jobjectArray array =
+		(jobjectArray)env->CallObjectMethod(_back_ptr, MID_getSysArchives);
+	if (env->ExceptionCheck()) {
+		warning("Error finding system archive path");
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+		return;
+	}
+
+	jsize size = env->GetArrayLength(array);
+	for (jsize i = 0; i < size; ++i) {
+		jstring path_obj = (jstring)env->GetObjectArrayElement(array, i);
+		const char* path = env->GetStringUTFChars(path_obj, NULL);
+		if (path != NULL) {
+			s.addDirectory(path, path, priority);
+			env->ReleaseStringUTFChars(path_obj, path);
+		}
+		env->DeleteLocalRef(path_obj);
+	}
+}
+
+
+static jint ScummVM_scummVMMain(JNIEnv* env, jobject self, jobjectArray args) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+
+	const int MAX_NARGS = 32;
+	int res = -1;
+
+	int argc = env->GetArrayLength(args);
+	if (argc > MAX_NARGS) {
+		JNU_ThrowByName(env, "java/lang/IllegalArgumentException",
+				"too many arguments");
+		return 0;
+	}
+
+	char* argv[MAX_NARGS];
+	int nargs;	// note use in cleanup loop below
+	for (nargs = 0; nargs < argc; ++nargs) {
+		jstring arg = (jstring)env->GetObjectArrayElement(args, nargs);
+		if (arg == NULL) {
+			argv[nargs] = NULL;
+		} else {
+			const char* cstr = env->GetStringUTFChars(arg, NULL);
+			argv[nargs] = const_cast<char*>(cstr);
+			if (cstr == NULL)
+				goto cleanup;  // exception already thrown
+		}
+		env->DeleteLocalRef(arg);
+	}
+
+	g_system = cpp_obj;
+	assert(g_system);
+	__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,
+				"Entering scummvm_main with %d args", argc);
+	res = scummvm_main(argc, argv);
+	__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "Exiting scummvm_main");
+	g_system->quit();
+
+cleanup:
+	nargs--;
+	for (int i = 0; i < nargs; ++i) {
+		if (argv[i] == NULL)
+			continue;
+		jstring arg = (jstring)env->GetObjectArrayElement(args, nargs);
+		if (arg == NULL)
+			// Exception already thrown
+			return res;
+		env->ReleaseStringUTFChars(arg, argv[i]);
+		env->DeleteLocalRef(arg);
+	}
+
+	return res;
+}
+
+#ifdef DYNAMIC_MODULES
+void AndroidPluginProvider::addCustomDirectories(Common::FSList &dirs) const {
+	OSystem_Android* g_system_android = (OSystem_Android*)g_system;
+	g_system_android->addPluginDirectories(dirs);
+}
+#endif
+
+static void ScummVM_enableZoning(JNIEnv* env, jobject self, jboolean enable) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+	cpp_obj->enableZoning(enable);
+}
+
+static void ScummVM_setSurfaceSize(JNIEnv* env, jobject self,
+								   jint width, jint height) {
+	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
+	cpp_obj->setSurfaceSize(width, height);	
+}
+
+const static JNINativeMethod gMethods[] = {
+	{ "create", "(Landroid/content/res/AssetManager;)V",
+	  (void*)ScummVM_create },
+	{ "nativeDestroy", "()V", (void*)ScummVM_nativeDestroy },
+	{ "scummVMMain", "([Ljava/lang/String;)I",
+	  (void*)ScummVM_scummVMMain },
+	{ "pushEvent", "(Lorg/inodes/gus/scummvm/Event;)V",
+	  (void*)ScummVM_pushEvent },
+	{ "audioMixCallback", "([B)V",
+	  (void*)ScummVM_audioMixCallback },
+	{ "setConfMan", "(Ljava/lang/String;I)V",
+	  (void*)ScummVM_setConfManInt },
+	{ "setConfMan", "(Ljava/lang/String;Ljava/lang/String;)V",
+	  (void*)ScummVM_setConfManString },
+	{ "enableZoning", "(Z)V",
+	  (void*)ScummVM_enableZoning },
+	{ "setSurfaceSize", "(II)V",
+	  (void*)ScummVM_setSurfaceSize },
+};
+
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM* jvm, void* reserved) {
+	cached_jvm = jvm;
+
+	JNIEnv* env;
+	if (jvm->GetEnv((void**)&env, JNI_VERSION_1_2))
+		return JNI_ERR;
+
+	jclass cls = env->FindClass("org/inodes/gus/scummvm/ScummVM");
+	if (cls == NULL)
+		return JNI_ERR;
+	if (env->RegisterNatives(cls, gMethods, ARRAYSIZE(gMethods)) < 0)
+		return JNI_ERR;
+
+	FID_ScummVM_nativeScummVM = env->GetFieldID(cls, "nativeScummVM", "J");
+	if (FID_ScummVM_nativeScummVM == NULL)
+		return JNI_ERR;
+
+	jclass event = env->FindClass("org/inodes/gus/scummvm/Event");
+	if (event == NULL)
+		return JNI_ERR;
+	FID_Event_type = env->GetFieldID(event, "type", "I");
+	if (FID_Event_type == NULL)
+		return JNI_ERR;
+	FID_Event_synthetic = env->GetFieldID(event, "synthetic", "Z");
+	if (FID_Event_synthetic == NULL)
+		return JNI_ERR;
+	FID_Event_kbd_keycode = env->GetFieldID(event, "kbd_keycode", "I");
+	if (FID_Event_kbd_keycode == NULL)
+		return JNI_ERR;
+	FID_Event_kbd_ascii = env->GetFieldID(event, "kbd_ascii", "I");
+	if (FID_Event_kbd_ascii == NULL)
+		return JNI_ERR;
+	FID_Event_kbd_flags = env->GetFieldID(event, "kbd_flags", "I");
+	if (FID_Event_kbd_flags == NULL)
+		return JNI_ERR;
+	FID_Event_mouse_x = env->GetFieldID(event, "mouse_x", "I");
+	if (FID_Event_mouse_x == NULL)
+		return JNI_ERR;
+	FID_Event_mouse_y = env->GetFieldID(event, "mouse_y", "I");
+	if (FID_Event_mouse_y == NULL)
+		return JNI_ERR;
+	FID_Event_mouse_relative = env->GetFieldID(event, "mouse_relative", "Z");
+	if (FID_Event_mouse_relative == NULL)
+		return JNI_ERR;
+
+	cls = env->FindClass("java/lang/Object");
+	if (cls == NULL)
+		return JNI_ERR;
+	MID_Object_wait = env->GetMethodID(cls, "wait", "()V");
+	if (MID_Object_wait == NULL)
+		return JNI_ERR;
+
+	return JNI_VERSION_1_2;
+}
+
+#endif
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
new file mode 100644
index 0000000000..95e848e0d9
--- /dev/null
+++ b/backends/platform/android/android.mk
@@ -0,0 +1,59 @@
+# Android specific build targets
+
+AAPT = aapt
+DX = dx
+APKBUILDER = apkbuilder
+ADB = adb -e
+JAVAC ?= javac
+JAVACFLAGS = -source 1.5 -target 1.5
+
+# FIXME: find/mark plugin entry points and add all this back again:
+#LDFLAGS += -Wl,--gc-sections
+#CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden
+
+resources.ap_: $(srcdir)/dists/android/AndroidManifest.xml $(RESOURCES) $(ASSETS) $(ANDROID_JAR8) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA)
+	$(INSTALL) -d build.tmp/assets/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) build.tmp/assets/
+	$(AAPT) package -f -M $< -S $(srcdir)/dists/android/res -A build.tmp/assets -I $(ANDROID_JAR8) -F $@
+
+build.tmp/%/resources.ap_: build.tmp/%/AndroidManifest.xml build.stage/%/res/values/strings.xml build.stage/%/res/drawable/scummvm.png $(ANDROID_JAR8)
+	$(AAPT) package -f -M $< -S build.stage/$*/res -I $(ANDROID_JAR8) -F $@
+
+scummvm.apk: build.tmp/libscummvm.so resources.ap_ classes.dex
+	# Package installer won't delete old libscummvm.so on upgrade so
+	# replace it with a zero size file
+	$(INSTALL) -d build.stage/common/lib/armeabi
+	touch build.stage/common/lib/armeabi/libscummvm.so
+	# We now handle the library unpacking ourselves from mylib/
+	$(INSTALL) -d build.stage/common/mylib/armeabi
+	$(INSTALL) -c -m 644 build.tmp/libscummvm.so build.stage/common/mylib/armeabi/
+	$(STRIP) build.stage/common/mylib/armeabi/libscummvm.so
+	# "-nf lib/armeabi/libscummvm.so" builds bogus paths?
+	$(APKBUILDER) $@ -z resources.ap_ -f classes.dex -rf build.stage/common || { $(RM) $@; exit 1; }
+
+scummvm-engine-%.apk: plugins/lib%.so build.tmp/%/resources.ap_ build.tmp/plugins/classes.dex
+	$(INSTALL) -d build.stage/$*/apk/mylib/armeabi/
+	$(INSTALL) -c -m 644 plugins/lib$*.so build.stage/$*/apk/mylib/armeabi/
+	$(STRIP) build.stage/$*/apk/mylib/armeabi/lib$*.so
+	$(APKBUILDER) $@ -z build.tmp/$*/resources.ap_ -f build.tmp/plugins/classes.dex -rf build.stage/$*/apk || { $(RM) $@; exit 1; }
+
+release/%.apk: %.apk
+	@$(MKDIR) -p $(@D)
+	@$(RM) $@
+	$(CP) $< $@.tmp
+	# remove debugging signature
+	zip -d $@.tmp META-INF/\*
+	jarsigner $(JARSIGNER_FLAGS) $@.tmp release
+	zipalign 4 $@.tmp $@
+	$(RM) $@.tmp
+
+androidrelease: release/scummvm.apk $(patsubst plugins/lib%.so,release/scummvm-engine-%.apk,$(PLUGINS))
+
+androidtest: scummvm.apk scummvm-engine-scumm.apk scummvm-engine-kyra.apk
+	@set -e; for apk in $^; do \
+	  echo $(ADB) install -r $$apk; \
+	  $(ADB) install -r $$apk; \
+	done
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.inodes.gus.scummvm/.Unpacker
+
+.PHONY: androidrelease androidtest
diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
new file mode 100644
index 0000000000..20c6a653c0
--- /dev/null
+++ b/backends/platform/android/asset-archive.cpp
@@ -0,0 +1,414 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#if defined(ANDROID)
+
+#include <jni.h>
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "common/str.h"
+#include "common/stream.h"
+#include "common/util.h"
+#include "common/archive.h"
+#include "common/debug.h"
+
+#include "backends/platform/android/asset-archive.h"
+
+extern JNIEnv* JNU_GetEnv();
+
+// Must match android.content.res.AssetManager.ACCESS_*
+const jint ACCESS_UNKNOWN = 0;
+const jint ACCESS_RANDOM = 1;
+
+// This might be useful to someone else.  Assumes markSupported() == true.
+class JavaInputStream : public Common::SeekableReadStream {
+public:
+	JavaInputStream(JNIEnv* env, jobject is);
+	virtual ~JavaInputStream();
+	virtual bool eos() const { return _eos; }
+	virtual bool err() const { return _err; }
+	virtual void clearErr() { _eos = _err = false; }
+	virtual uint32 read(void *dataPtr, uint32 dataSize);
+	virtual int32 pos() const { return _pos; }
+	virtual int32 size() const { return _len; }
+	virtual bool seek(int32 offset, int whence = SEEK_SET);
+private:
+	void close(JNIEnv* env);
+	jmethodID MID_mark;
+	jmethodID MID_available;
+	jmethodID MID_close;
+	jmethodID MID_read;
+	jmethodID MID_reset;
+	jmethodID MID_skip;
+	jobject _input_stream;
+	jsize _buflen;
+	jbyteArray _buf;
+	uint32 _pos;
+	jint _len;
+	bool _eos;
+	bool _err;
+};
+
+JavaInputStream::JavaInputStream(JNIEnv* env, jobject is) :
+	_eos(false), _err(false), _pos(0)
+{
+	_input_stream = env->NewGlobalRef(is);
+	_buflen = 8192;
+	_buf = static_cast<jbyteArray>(env->NewGlobalRef(env->NewByteArray(_buflen)));
+
+	jclass cls = env->GetObjectClass(_input_stream);
+	MID_mark = env->GetMethodID(cls, "mark", "(I)V");
+	assert(MID_mark);
+	MID_available = env->GetMethodID(cls, "available", "()I");
+	assert(MID_mark);
+	MID_close = env->GetMethodID(cls, "close", "()V");
+	assert(MID_close);
+	MID_read = env->GetMethodID(cls, "read", "([BII)I");
+	assert(MID_read);
+	MID_reset = env->GetMethodID(cls, "reset", "()V");
+	assert(MID_reset);
+	MID_skip = env->GetMethodID(cls, "skip", "(J)J");
+	assert(MID_skip);
+
+	// Mark start of stream, so we can reset back to it.
+	// readlimit is set to something bigger than anything we might
+	// want to seek within.
+	env->CallVoidMethod(_input_stream, MID_mark, 10*1024*1024);
+	_len = env->CallIntMethod(_input_stream, MID_available);
+}
+
+JavaInputStream::~JavaInputStream() {
+	JNIEnv* env = JNU_GetEnv();
+	close(env);
+	env->DeleteGlobalRef(_buf);
+	env->DeleteGlobalRef(_input_stream);
+}
+
+void JavaInputStream::close(JNIEnv* env) {
+	env->CallVoidMethod(_input_stream, MID_close);
+	if (env->ExceptionCheck())
+		env->ExceptionClear();
+}
+
+uint32 JavaInputStream::read(void *dataPtr, uint32 dataSize) {
+	JNIEnv* env = JNU_GetEnv();
+
+	if (_buflen < dataSize) {
+		_buflen = dataSize;
+		env->DeleteGlobalRef(_buf);
+		_buf = static_cast<jbyteArray>(env->NewGlobalRef(env->NewByteArray(_buflen)));
+	}
+
+	jint ret = env->CallIntMethod(_input_stream, MID_read, _buf, 0, dataSize);
+	if (env->ExceptionCheck()) {
+		warning("Exception during JavaInputStream::read(%p, %d)",
+				dataPtr, dataSize);
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+		_err = true;
+		ret = -1;
+	} else if (ret == -1) {
+		_eos = true;
+		ret = 0;
+	} else {
+		env->GetByteArrayRegion(_buf, 0, ret, static_cast<jbyte*>(dataPtr));
+		_pos += ret;
+	}
+	return ret;
+}
+
+bool JavaInputStream::seek(int32 offset, int whence) {
+	JNIEnv* env = JNU_GetEnv();
+	uint32 newpos;
+	switch (whence) {
+	case SEEK_SET:
+		newpos = offset;
+		break;
+	case SEEK_CUR:
+		newpos = _pos + offset;
+		break;
+	case SEEK_END:
+		newpos = _len + offset;
+		break;
+	default:
+		debug("Unknown 'whence' arg %d", whence);
+		return false;
+	}
+
+	jlong skip_bytes;
+	if (newpos > _pos) {
+		skip_bytes = newpos - _pos;
+	} else {
+		// Can't skip backwards, so jump back to start and skip from there.
+		env->CallVoidMethod(_input_stream, MID_reset);
+		if (env->ExceptionCheck()) {
+			warning("Failed to rewind to start of asset stream");
+			env->ExceptionDescribe();
+			env->ExceptionClear();
+			return false;
+		}
+		_pos = 0;
+		skip_bytes = newpos;
+	}
+
+	while (skip_bytes > 0) {
+		jlong ret = env->CallLongMethod(_input_stream, MID_skip, skip_bytes);
+		if (env->ExceptionCheck()) {
+			warning("Failed to skip %ld bytes into asset stream",
+					static_cast<long>(skip_bytes));
+			env->ExceptionDescribe();
+			env->ExceptionClear();
+			return false;
+		} else if (ret == 0) {
+			warning("InputStream->skip(%ld) didn't skip any bytes. Aborting seek.",
+					static_cast<long>(skip_bytes));
+			return false;  // No point looping forever...
+		}
+		_pos += ret;
+		skip_bytes -= ret;
+	}
+	_eos = false;
+	return true;
+}
+
+
+// Must match android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH
+const jlong UNKNOWN_LENGTH = -1;
+
+// Reading directly from a fd is so much more efficient, that it is
+// worth optimising for.
+class AssetFdReadStream : public Common::SeekableReadStream {
+public:
+	AssetFdReadStream(JNIEnv* env, jobject assetfd);
+	virtual ~AssetFdReadStream();
+	virtual bool eos() const { return _eos; }
+	virtual bool err() const { return _err; }
+	virtual void clearErr() { _eos = _err = false; }
+	virtual uint32 read(void *dataPtr, uint32 dataSize);
+	virtual int32 pos() const { return _pos; }
+	virtual int32 size() const { return _declared_len; }
+	virtual bool seek(int32 offset, int whence = SEEK_SET);
+private:
+	void close(JNIEnv* env);
+	int _fd;
+	jmethodID MID_close;
+	jobject _assetfd;
+	jlong _start_off;
+	jlong _declared_len;
+	uint32 _pos;
+	bool _eos;
+	bool _err;
+};
+
+AssetFdReadStream::AssetFdReadStream(JNIEnv* env, jobject assetfd) :
+	_eos(false), _err(false), _pos(0)
+{
+	_assetfd = env->NewGlobalRef(assetfd);
+
+	jclass cls = env->GetObjectClass(_assetfd);
+	MID_close = env->GetMethodID(cls, "close", "()V");
+	assert(MID_close);
+
+	jmethodID MID_getStartOffset =
+		env->GetMethodID(cls, "getStartOffset", "()J");
+	assert(MID_getStartOffset);
+	_start_off = env->CallLongMethod(_assetfd, MID_getStartOffset);
+
+	jmethodID MID_getDeclaredLength =
+		env->GetMethodID(cls, "getDeclaredLength", "()J");
+	assert(MID_getDeclaredLength);
+	_declared_len = env->CallLongMethod(_assetfd, MID_getDeclaredLength);
+
+	jmethodID MID_getFileDescriptor =
+		env->GetMethodID(cls, "getFileDescriptor", "()Ljava/io/FileDescriptor;");
+	assert(MID_getFileDescriptor);
+	jobject javafd = env->CallObjectMethod(_assetfd, MID_getFileDescriptor);
+	assert(javafd);
+	jclass fd_cls = env->GetObjectClass(javafd);
+	jfieldID FID_descriptor = env->GetFieldID(fd_cls, "descriptor", "I");
+	assert(FID_descriptor);
+	_fd = env->GetIntField(javafd, FID_descriptor);
+}
+
+AssetFdReadStream::~AssetFdReadStream() {
+	JNIEnv* env = JNU_GetEnv();
+	env->CallVoidMethod(_assetfd, MID_close);
+	if (env->ExceptionCheck())
+		env->ExceptionClear();
+	env->DeleteGlobalRef(_assetfd);
+}
+
+uint32 AssetFdReadStream::read(void *dataPtr, uint32 dataSize) {
+	if (_declared_len != UNKNOWN_LENGTH) {
+		jlong cap = _declared_len - _pos;
+		if (dataSize > cap)
+			dataSize = cap;
+	}
+	int ret = ::read(_fd, dataPtr, dataSize);
+	if (ret == 0)
+		_eos = true;
+	else if (ret == -1)
+		_err = true;
+	else
+		_pos += ret;
+	return ret;
+}
+
+bool AssetFdReadStream::seek(int32 offset, int whence) {
+	if (whence == SEEK_SET) {
+		if (_declared_len != UNKNOWN_LENGTH && offset > _declared_len)
+			offset = _declared_len;
+		offset += _start_off;
+	} else if (whence == SEEK_END && _declared_len != UNKNOWN_LENGTH) {
+		whence = SEEK_SET;
+		offset = _start_off + _declared_len + offset;
+	}
+	int ret = lseek(_fd, offset, whence);
+	if (ret == -1)
+		return false;
+	_pos = ret - _start_off;
+	_eos = false;
+	return true;
+}
+
+AndroidAssetArchive::AndroidAssetArchive(jobject am) {
+	JNIEnv* env = JNU_GetEnv();
+	_am = env->NewGlobalRef(am);
+
+	jclass cls = env->GetObjectClass(_am);
+	MID_open = env->GetMethodID(cls, "open",
+								"(Ljava/lang/String;I)Ljava/io/InputStream;");
+	assert(MID_open);
+	MID_openFd = env->GetMethodID(cls, "openFd",
+								  "(Ljava/lang/String;)Landroid/content/res/AssetFileDescriptor;");
+	assert(MID_openFd);
+	MID_list = env->GetMethodID(cls, "list",
+								"(Ljava/lang/String;)[Ljava/lang/String;");
+	assert(MID_list);
+}
+
+AndroidAssetArchive::~AndroidAssetArchive() {
+	JNIEnv* env = JNU_GetEnv();
+	env->DeleteGlobalRef(_am);
+}
+
+bool AndroidAssetArchive::hasFile(const Common::String &name) {
+	JNIEnv* env = JNU_GetEnv();
+	jstring path = env->NewStringUTF(name.c_str());
+	jobject result = env->CallObjectMethod(_am, MID_open, path, ACCESS_UNKNOWN);
+	if (env->ExceptionCheck()) {
+		// Assume FileNotFoundException
+		//warning("Error while calling AssetManager->open(%s)", name.c_str());
+		//env->ExceptionDescribe();
+		env->ExceptionClear();
+		env->DeleteLocalRef(path);
+		return false;
+	}
+	env->DeleteLocalRef(result);
+	env->DeleteLocalRef(path);
+	return true;
+}
+
+int AndroidAssetArchive::listMembers(Common::ArchiveMemberList &member_list) {
+	JNIEnv* env = JNU_GetEnv();
+	Common::List<Common::String> dirlist;
+	dirlist.push_back("");
+
+	int count = 0;
+	while (!dirlist.empty()) {
+		const Common::String dir = dirlist.back();
+		dirlist.pop_back();
+
+		jstring jpath = env->NewStringUTF(dir.c_str());
+		jobjectArray jpathlist = static_cast<jobjectArray>(env->CallObjectMethod(_am, MID_list, jpath));
+		if (env->ExceptionCheck()) {
+			warning("Error while calling AssetManager->list(%s). Ignoring.",
+					dir.c_str());
+			env->ExceptionDescribe();
+			env->ExceptionClear();
+			continue;  // May as well keep going ...
+		}
+		env->DeleteLocalRef(jpath);
+
+		for (jsize i = 0; i < env->GetArrayLength(jpathlist); ++i) {
+			jstring elem = (jstring)env->GetObjectArrayElement(jpathlist, i);
+			const char* p = env->GetStringUTFChars(elem, NULL);
+			Common::String thispath = dir;
+			if (!thispath.empty())
+				thispath += "/";
+			thispath += p;
+
+			// Assume files have a . in them, and directories don't
+			if (strchr(p, '.')) {
+				member_list.push_back(getMember(thispath));
+				++count;
+			} else
+				dirlist.push_back(thispath);
+
+			env->ReleaseStringUTFChars(elem, p);
+			env->DeleteLocalRef(elem);
+		}
+
+		env->DeleteLocalRef(jpathlist);
+	}
+
+	return count;
+}
+
+Common::ArchiveMemberPtr AndroidAssetArchive::getMember(const Common::String &name) {
+	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
+}
+
+Common::SeekableReadStream *AndroidAssetArchive::createReadStreamForMember(const Common::String &path) const {
+	JNIEnv* env = JNU_GetEnv();
+	jstring jpath = env->NewStringUTF(path.c_str());
+
+	// Try openFd() first ...
+	jobject afd = env->CallObjectMethod(_am, MID_openFd, jpath);
+	if (env->ExceptionCheck())
+		env->ExceptionClear();
+	else if (afd != NULL) {
+		// success :)
+		env->DeleteLocalRef(jpath);
+		return new AssetFdReadStream(env, afd);
+	}
+
+	// ... and fallback to normal open() if that doesn't work
+	jobject is = env->CallObjectMethod(_am, MID_open, jpath, ACCESS_RANDOM);
+	if (env->ExceptionCheck()) {
+		// Assume FileNotFoundException
+		//warning("Error opening %s", path.c_str());
+		//env->ExceptionDescribe();
+		env->ExceptionClear();
+		env->DeleteLocalRef(jpath);
+		return NULL;
+	}
+
+	return new JavaInputStream(env, is);
+}
+
+#endif
diff --git a/backends/platform/PalmOS/Src/cd_msa.h b/backends/platform/android/asset-archive.h
index 223bc0efcf..b3f6993c50 100644
--- a/backends/platform/PalmOS/Src/cd_msa.h
+++ b/backends/platform/android/asset-archive.h
@@ -23,46 +23,31 @@
  *
  */
 
-#ifndef CD_MSA_H
-#define CD_MSA_H
+#if defined(ANDROID)
 
-#include "cdaudio.h"
+#include <jni.h>
 
-class MsaCDPlayer : public CDAudio {
-public:
-	MsaCDPlayer(OSystem *sys);
-
-	bool init();
-	void release();
-
-	bool poll();
-	void update();
-	void play(int track, int num_loops, int start_frame, int duration);
-	void stop();
-
-	void setVolume(int volume);
+#include "common/str.h"
+#include "common/stream.h"
+#include "common/util.h"
+#include "common/archive.h"
 
- private:
-	void initInternal();
-
-	OSystem *_sys;
-	UInt16 _msaRefNum;
-
-	UInt32 _volumeLLimit;
-	UInt32 _volumeRLimit;
-
-	// cdrom
-	AlbumInfoType _msaAlbum;
-	UInt16 _msaLoops;
+class AndroidAssetArchive : public Common::Archive {
+public:
+	AndroidAssetArchive(jobject am);
+	virtual ~AndroidAssetArchive();
 
-	UInt32 _msaStopTime;
+	virtual bool hasFile(const Common::String &name);
+	virtual int listMembers(Common::ArchiveMemberList &list);
+	virtual Common::ArchiveMemberPtr getMember(const Common::String &name);
+	virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 
-	UInt32 _msaStartFrame;
-	UInt32 _msaDuration;
+private:
+	jmethodID MID_open;
+	jmethodID MID_openFd;
+	jmethodID MID_list;
 
-	UInt16 _msaTrack;
-	UInt32 _msaTrackStartSu, _msaTrackEndSu;
-	UInt32 _msaTrackLength;
+	jobject _am;
 };
 
 #endif
diff --git a/backends/platform/android/module.mk b/backends/platform/android/module.mk
new file mode 100644
index 0000000000..b457b388b1
--- /dev/null
+++ b/backends/platform/android/module.mk
@@ -0,0 +1,84 @@
+MODULE := backends/platform/android
+
+MODULE_OBJS := \
+	android.o asset-archive.o video.o
+
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
+
+JAVA_SRC = \
+	$(MODULE)/org/inodes/gus/scummvm/ScummVM.java \
+	$(MODULE)/org/inodes/gus/scummvm/ScummVMApplication.java \
+	$(MODULE)/org/inodes/gus/scummvm/ScummVMActivity.java \
+	$(MODULE)/org/inodes/gus/scummvm/EditableSurfaceView.java \
+	$(MODULE)/org/inodes/gus/scummvm/Unpacker.java \
+	$(MODULE)/org/inodes/gus/scummvm/Manifest.java \
+	$(MODULE)/org/inodes/gus/scummvm/R.java
+
+JAVA_PLUGIN_SRC = \
+	$(MODULE)/org/inodes/gus/scummvm/PluginProvider.java
+
+RESOURCES = \
+	$(srcdir)/dists/android/res/values/strings.xml \
+	$(srcdir)/dists/android/res/layout/main.xml \
+	$(srcdir)/dists/android/res/layout/splash.xml \
+	$(srcdir)/dists/android/res/drawable/gradient.xml \
+	$(srcdir)/dists/android/res/drawable/scummvm.png \
+	$(srcdir)/dists/android/res/drawable/scummvm_big.png
+
+ASSETS = $(DIST_FILES_ENGINEDATA) $(DIST_FILES_THEMES)
+
+PLUGIN_RESOURCES = \
+	$(srcdir)/dists/android/res/values/strings.xml \
+	$(srcdir)/dists/android/res/drawable/scummvm.png
+
+# These must be incremented for each market upload
+#ANDROID_VERSIONCODE = 6  Specified in dists/android/AndroidManifest.xml.in
+ANDROID_PLUGIN_VERSIONCODE = 6
+
+# This is a bit silly.  I want to compile against the 1.6 android.jar,
+# to make the compiler check that I don't use something that requires
+# a newer Android.  However, in order to use android:installLocation,
+# we need to give aapt a version >=8 android.jar - even though the
+# result will work ok on 1.5+.
+ANDROID_JAR = $(ANDROID_SDK)/platforms/android-1.5/android.jar
+ANDROID_JAR8 = $(ANDROID_SDK)/platforms/android-8/android.jar
+
+# This library contains scummvm proper
+build.tmp/libscummvm.so: $(OBJS)
+	@$(MKDIR) -p $(@D)
+	$(QUIET_LINK)$(CXX) -shared $(LDFLAGS) -Wl,-Bsymbolic -Wl,-soname,$(@F) -Wl,--no-undefined -o $@ $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LIBS)
+
+
+backends/platform/android/org/inodes/gus/scummvm/R.java backends/platform/android/org/inodes/gus/scummvm/Manifest.java: $(srcdir)/dists/android/AndroidManifest.xml $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR8)
+	$(AAPT) package -m -J backends/platform/android -M $< -S $(srcdir)/dists/android/res -I $(ANDROID_JAR8)
+
+build.tmp/classes/%.class: $(srcdir)/backends/platform/android/%.java $(srcdir)/backends/platform/android/org/inodes/gus/scummvm/R.java
+	@$(MKDIR) -p $(@D)
+	$(JAVAC) $(JAVACFLAGS) -cp $(srcdir)/backends/platform/android -d build.tmp/classes -bootclasspath $(ANDROID_JAR) $<
+
+build.tmp/classes.plugin/%.class: $(srcdir)/backends/platform/android/%.java
+	@$(MKDIR) -p $(@D)
+	$(JAVAC) $(JAVACFLAGS) -cp $(srcdir)/backends/platform/android -d build.tmp/classes.plugin -bootclasspath $(ANDROID_JAR) $<
+
+classes.dex: $(JAVA_SRC:backends/platform/android/%.java=build.tmp/classes/%.class)
+	$(DX) --dex --output=$@ build.tmp/classes
+
+build.tmp/plugins/classes.dex: $(JAVA_PLUGIN_SRC:backends/platform/android/%.java=build.tmp/classes.plugin/%.class)
+	@$(MKDIR) -p $(@D)
+	$(DX) --dex --output=$@ build.tmp/classes.plugin
+
+build.tmp/%/AndroidManifest.xml build.stage/%/res/values/strings.xml: dists/android/mkmanifest.pl configure dists/android/AndroidManifest.xml
+	dists/android/mkmanifest.pl --id=$* --configure=configure \
+	  --version-name=$(VERSION) \
+	  --version-code=$(ANDROID_PLUGIN_VERSIONCODE) \
+	  --stringres=build.stage/$*/res/values/strings.xml \
+	  --manifest=build.tmp/$*/AndroidManifest.xml \
+	  --master-manifest=dists/android/AndroidManifest.xml \
+	  --unpacklib=mylib/armeabi/lib$*.so
+
+build.stage/%/res/drawable/scummvm.png: dists/android/res/drawable/scummvm.png
+	@$(MKDIR) -p $(@D)
+	$(CP) $< $@
diff --git a/backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java b/backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java
new file mode 100644
index 0000000000..5b71d4a3a5
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java
@@ -0,0 +1,59 @@
+package org.inodes.gus.scummvm;
+
+import android.content.Context;
+import android.text.InputType;
+import android.util.AttributeSet;
+import android.view.SurfaceView;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+
+public class EditableSurfaceView extends SurfaceView {
+	public EditableSurfaceView(Context context) {
+		super(context);
+	}
+
+	public EditableSurfaceView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public EditableSurfaceView(Context context, AttributeSet attrs,
+							   int defStyle) {
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	public boolean onCheckIsTextEditor() {
+		return true;
+	}
+
+	private class MyInputConnection extends BaseInputConnection {
+		public MyInputConnection() {
+			super(EditableSurfaceView.this, false);
+		}
+
+		@Override
+		public boolean performEditorAction(int actionCode) {
+			if (actionCode == EditorInfo.IME_ACTION_DONE) {
+				InputMethodManager imm = (InputMethodManager)
+					getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+				imm.hideSoftInputFromWindow(getWindowToken(), 0);
+			}
+			return super.performEditorAction(actionCode); // Sends enter key
+		}
+	}
+
+	@Override
+	public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+		outAttrs.initialCapsMode = 0;
+		outAttrs.initialSelEnd = outAttrs.initialSelStart = -1;
+		outAttrs.inputType = (InputType.TYPE_CLASS_TEXT |
+							  InputType.TYPE_TEXT_VARIATION_NORMAL |
+							  InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
+		outAttrs.imeOptions = (EditorInfo.IME_ACTION_DONE |
+							   EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+		return new MyInputConnection();
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/Event.java b/backends/platform/android/org/inodes/gus/scummvm/Event.java
new file mode 100644
index 0000000000..f9c7aba93b
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/Event.java
@@ -0,0 +1,330 @@
+package org.inodes.gus.scummvm;
+
+import android.view.KeyEvent;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Event {
+	// Common::EventType enum.
+	// Must be kept in sync with common/events.h
+	public final static int EVENT_INVALID = 0;
+	public final static int EVENT_KEYDOWN = 1;
+	public final static int EVENT_KEYUP = 2;
+	public final static int EVENT_MOUSEMOVE = 3;
+	public final static int EVENT_LBUTTONDOWN = 4;
+	public final static int EVENT_LBUTTONUP = 5;
+	public final static int EVENT_RBUTTONDOWN = 6;
+	public final static int EVENT_RBUTTONUP = 7;
+	public final static int EVENT_WHEELUP = 8;
+	public final static int EVENT_WHEELDOWN = 9;
+	public final static int EVENT_QUIT = 10;
+	public final static int EVENT_SCREEN_CHANGED = 11;
+	public final static int EVENT_PREDICTIVE_DIALOG = 12;
+	public final static int EVENT_MBUTTONDOWN = 13;
+	public final static int EVENT_MBUTTONUP = 14;
+	public final static int EVENT_MAINMENU = 15;
+	public final static int EVENT_RTL = 16;
+
+	// common/keyboard.h
+	public final static int ASCII_F1 = 315;
+	public final static int ASCII_F2 = 316;
+	public final static int ASCII_F3 = 317;
+	public final static int ASCII_F4 = 318;
+	public final static int ASCII_F5 = 319;
+	public final static int ASCII_F6 = 320;
+	public final static int ASCII_F7 = 321;
+	public final static int ASCII_F8 = 322;
+	public final static int ASCII_F9 = 323;
+	public final static int ASCII_F10 = 324;
+	public final static int ASCII_F11 = 325;
+	public final static int ASCII_F12 = 326;
+	public final static int KBD_CTRL  = 1 << 0;
+	public final static int KBD_ALT	  = 1 << 1;
+	public final static int KBD_SHIFT = 1 << 2;
+
+	public final static int KEYCODE_INVALID = 0;
+	public final static int KEYCODE_BACKSPACE = 8;
+	public final static int KEYCODE_TAB = 9;
+	public final static int KEYCODE_CLEAR = 12;
+	public final static int KEYCODE_RETURN = 13;
+	public final static int KEYCODE_PAUSE = 19;
+	public final static int KEYCODE_ESCAPE = 27;
+	public final static int KEYCODE_SPACE = 32;
+	public final static int KEYCODE_EXCLAIM = 33;
+	public final static int KEYCODE_QUOTEDBL = 34;
+	public final static int KEYCODE_HASH = 35;
+	public final static int KEYCODE_DOLLAR = 36;
+	public final static int KEYCODE_AMPERSAND = 38;
+	public final static int KEYCODE_QUOTE = 39;
+	public final static int KEYCODE_LEFTPAREN = 40;
+	public final static int KEYCODE_RIGHTPAREN = 41;
+	public final static int KEYCODE_ASTERISK = 42;
+	public final static int KEYCODE_PLUS = 43;
+	public final static int KEYCODE_COMMA = 44;
+	public final static int KEYCODE_MINUS = 45;
+	public final static int KEYCODE_PERIOD = 46;
+	public final static int KEYCODE_SLASH = 47;
+	public final static int KEYCODE_0 = 48;
+	public final static int KEYCODE_1 = 49;
+	public final static int KEYCODE_2 = 50;
+	public final static int KEYCODE_3 = 51;
+	public final static int KEYCODE_4 = 52;
+	public final static int KEYCODE_5 = 53;
+	public final static int KEYCODE_6 = 54;
+	public final static int KEYCODE_7 = 55;
+	public final static int KEYCODE_8 = 56;
+	public final static int KEYCODE_9 = 57;
+	public final static int KEYCODE_COLON = 58;
+	public final static int KEYCODE_SEMICOLON = 59;
+	public final static int KEYCODE_LESS = 60;
+	public final static int KEYCODE_EQUALS = 61;
+	public final static int KEYCODE_GREATER = 62;
+	public final static int KEYCODE_QUESTION = 63;
+	public final static int KEYCODE_AT = 64;
+	public final static int KEYCODE_LEFTBRACKET = 91;
+	public final static int KEYCODE_BACKSLASH = 92;
+	public final static int KEYCODE_RIGHTBRACKET = 93;
+	public final static int KEYCODE_CARET = 94;
+	public final static int KEYCODE_UNDERSCORE = 95;
+	public final static int KEYCODE_BACKQUOTE = 96;
+	public final static int KEYCODE_a = 97;
+	public final static int KEYCODE_b = 98;
+	public final static int KEYCODE_c = 99;
+	public final static int KEYCODE_d = 100;
+	public final static int KEYCODE_e = 101;
+	public final static int KEYCODE_f = 102;
+	public final static int KEYCODE_g = 103;
+	public final static int KEYCODE_h = 104;
+	public final static int KEYCODE_i = 105;
+	public final static int KEYCODE_j = 106;
+	public final static int KEYCODE_k = 107;
+	public final static int KEYCODE_l = 108;
+	public final static int KEYCODE_m = 109;
+	public final static int KEYCODE_n = 110;
+	public final static int KEYCODE_o = 111;
+	public final static int KEYCODE_p = 112;
+	public final static int KEYCODE_q = 113;
+	public final static int KEYCODE_r = 114;
+	public final static int KEYCODE_s = 115;
+	public final static int KEYCODE_t = 116;
+	public final static int KEYCODE_u = 117;
+	public final static int KEYCODE_v = 118;
+	public final static int KEYCODE_w = 119;
+	public final static int KEYCODE_x = 120;
+	public final static int KEYCODE_y = 121;
+	public final static int KEYCODE_z = 122;
+	public final static int KEYCODE_DELETE = 127;
+	// Numeric keypad
+	public final static int KEYCODE_KP0 = 256;
+	public final static int KEYCODE_KP1 = 257;
+	public final static int KEYCODE_KP2 = 258;
+	public final static int KEYCODE_KP3 = 259;
+	public final static int KEYCODE_KP4 = 260;
+	public final static int KEYCODE_KP5 = 261;
+	public final static int KEYCODE_KP6 = 262;
+	public final static int KEYCODE_KP7 = 263;
+	public final static int KEYCODE_KP8 = 264;
+	public final static int KEYCODE_KP9 = 265;
+	public final static int KEYCODE_KP_PERIOD = 266;
+	public final static int KEYCODE_KP_DIVIDE = 267;
+	public final static int KEYCODE_KP_MULTIPLY = 268;
+	public final static int KEYCODE_KP_MINUS = 269;
+	public final static int KEYCODE_KP_PLUS = 270;
+	public final static int KEYCODE_KP_ENTER = 271;
+	public final static int KEYCODE_KP_EQUALS = 272;
+	// Arrows + Home/End pad
+	public final static int KEYCODE_UP = 273;
+	public final static int KEYCODE_DOWN = 274;
+	public final static int KEYCODE_RIGHT = 275;
+	public final static int KEYCODE_LEFT = 276;
+	public final static int KEYCODE_INSERT = 277;
+	public final static int KEYCODE_HOME = 278;
+	public final static int KEYCODE_END = 279;
+	public final static int KEYCODE_PAGEUP = 280;
+	public final static int KEYCODE_PAGEDOWN = 281;
+	// Function keys
+	public final static int KEYCODE_F1 = 282;
+	public final static int KEYCODE_F2 = 283;
+	public final static int KEYCODE_F3 = 284;
+	public final static int KEYCODE_F4 = 285;
+	public final static int KEYCODE_F5 = 286;
+	public final static int KEYCODE_F6 = 287;
+	public final static int KEYCODE_F7 = 288;
+	public final static int KEYCODE_F8 = 289;
+	public final static int KEYCODE_F9 = 290;
+	public final static int KEYCODE_F10 = 291;
+	public final static int KEYCODE_F11 = 292;
+	public final static int KEYCODE_F12 = 293;
+	public final static int KEYCODE_F13 = 294;
+	public final static int KEYCODE_F14 = 295;
+	public final static int KEYCODE_F15 = 296;
+	// Key state modifier keys
+	public final static int KEYCODE_NUMLOCK = 300;
+	public final static int KEYCODE_CAPSLOCK = 301;
+	public final static int KEYCODE_SCROLLOCK = 302;
+	public final static int KEYCODE_RSHIFT = 303;
+	public final static int KEYCODE_LSHIFT = 304;
+	public final static int KEYCODE_RCTRL = 305;
+	public final static int KEYCODE_LCTRL = 306;
+	public final static int KEYCODE_RALT = 307;
+	public final static int KEYCODE_LALT = 308;
+	public final static int KEYCODE_RMETA = 309;
+	public final static int KEYCODE_LMETA = 310;
+	public final static int KEYCODE_LSUPER = 311; // Left "Windows" key
+	public final static int KEYCODE_RSUPER = 312; // Right "Windows" key
+	public final static int KEYCODE_MODE = 313; // "Alt Gr" key
+	public final static int KEYCODE_COMPOSE = 314; // Multi-key compose key
+	// Miscellaneous function keys
+	public final static int KEYCODE_HELP = 315;
+	public final static int KEYCODE_PRINT = 316;
+	public final static int KEYCODE_SYSREQ = 317;
+	public final static int KEYCODE_BREAK = 318;
+	public final static int KEYCODE_MENU = 319;
+	public final static int KEYCODE_POWER = 320; // Power Macintosh power key
+	public final static int KEYCODE_EURO = 321; // Some european keyboards
+	public final static int KEYCODE_UNDO = 322; // Atari keyboard has Undo
+
+	// Android KeyEvent keycode -> ScummVM keycode
+	public final static Map<Integer, Integer> androidKeyMap;
+	static {
+		Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+
+		map.put(KeyEvent.KEYCODE_DEL, KEYCODE_BACKSPACE);
+		map.put(KeyEvent.KEYCODE_TAB, KEYCODE_TAB);
+		map.put(KeyEvent.KEYCODE_CLEAR, KEYCODE_CLEAR);
+		map.put(KeyEvent.KEYCODE_ENTER, KEYCODE_RETURN);
+		//map.put(??, KEYCODE_PAUSE);
+		map.put(KeyEvent.KEYCODE_BACK, KEYCODE_ESCAPE);
+		map.put(KeyEvent.KEYCODE_SPACE, KEYCODE_SPACE);
+		//map.put(??, KEYCODE_EXCLAIM);
+		//map.put(??, KEYCODE_QUOTEDBL);
+		map.put(KeyEvent.KEYCODE_POUND, KEYCODE_HASH);
+		//map.put(??, KEYCODE_DOLLAR);
+		//map.put(??, KEYCODE_AMPERSAND);
+		map.put(KeyEvent.KEYCODE_APOSTROPHE, KEYCODE_QUOTE);
+		//map.put(??, KEYCODE_LEFTPAREN);
+		//map.put(??, KEYCODE_RIGHTPAREN);
+		//map.put(??, KEYCODE_ASTERISK);
+		map.put(KeyEvent.KEYCODE_PLUS, KEYCODE_PLUS);
+		map.put(KeyEvent.KEYCODE_COMMA, KEYCODE_COMMA);
+		map.put(KeyEvent.KEYCODE_MINUS, KEYCODE_MINUS);
+		map.put(KeyEvent.KEYCODE_PERIOD, KEYCODE_PERIOD);
+		map.put(KeyEvent.KEYCODE_SLASH, KEYCODE_SLASH);
+		map.put(KeyEvent.KEYCODE_0, KEYCODE_0);
+		map.put(KeyEvent.KEYCODE_1, KEYCODE_1);
+		map.put(KeyEvent.KEYCODE_2, KEYCODE_2);
+		map.put(KeyEvent.KEYCODE_3, KEYCODE_3);
+		map.put(KeyEvent.KEYCODE_4, KEYCODE_4);
+		map.put(KeyEvent.KEYCODE_5, KEYCODE_5);
+		map.put(KeyEvent.KEYCODE_6, KEYCODE_6);
+		map.put(KeyEvent.KEYCODE_7, KEYCODE_7);
+		map.put(KeyEvent.KEYCODE_8, KEYCODE_8);
+		map.put(KeyEvent.KEYCODE_9, KEYCODE_9);
+		//map.put(??, KEYCODE_COLON);
+		map.put(KeyEvent.KEYCODE_SEMICOLON, KEYCODE_SEMICOLON);
+		//map.put(??, KEYCODE_LESS);
+		map.put(KeyEvent.KEYCODE_EQUALS, KEYCODE_EQUALS);
+		//map.put(??, KEYCODE_GREATER);
+		//map.put(??, KEYCODE_QUESTION);
+		map.put(KeyEvent.KEYCODE_AT, KEYCODE_AT);
+		map.put(KeyEvent.KEYCODE_LEFT_BRACKET, KEYCODE_LEFTBRACKET);
+		map.put(KeyEvent.KEYCODE_BACKSLASH, KEYCODE_BACKSLASH);
+		map.put(KeyEvent.KEYCODE_RIGHT_BRACKET, KEYCODE_RIGHTBRACKET);
+		//map.put(??, KEYCODE_CARET);
+		//map.put(??, KEYCODE_UNDERSCORE);
+		//map.put(??, KEYCODE_BACKQUOTE);
+		map.put(KeyEvent.KEYCODE_A, KEYCODE_a);
+		map.put(KeyEvent.KEYCODE_B, KEYCODE_b);
+		map.put(KeyEvent.KEYCODE_C, KEYCODE_c);
+		map.put(KeyEvent.KEYCODE_D, KEYCODE_d);
+		map.put(KeyEvent.KEYCODE_E, KEYCODE_e);
+		map.put(KeyEvent.KEYCODE_F, KEYCODE_f);
+		map.put(KeyEvent.KEYCODE_G, KEYCODE_g);
+		map.put(KeyEvent.KEYCODE_H, KEYCODE_h);
+		map.put(KeyEvent.KEYCODE_I, KEYCODE_i);
+		map.put(KeyEvent.KEYCODE_J, KEYCODE_j);
+		map.put(KeyEvent.KEYCODE_K, KEYCODE_k);
+		map.put(KeyEvent.KEYCODE_L, KEYCODE_l);
+		map.put(KeyEvent.KEYCODE_M, KEYCODE_m);
+		map.put(KeyEvent.KEYCODE_N, KEYCODE_n);
+		map.put(KeyEvent.KEYCODE_O, KEYCODE_o);
+		map.put(KeyEvent.KEYCODE_P, KEYCODE_p);
+		map.put(KeyEvent.KEYCODE_Q, KEYCODE_q);
+		map.put(KeyEvent.KEYCODE_R, KEYCODE_r);
+		map.put(KeyEvent.KEYCODE_S, KEYCODE_s);
+		map.put(KeyEvent.KEYCODE_T, KEYCODE_t);
+		map.put(KeyEvent.KEYCODE_U, KEYCODE_u);
+		map.put(KeyEvent.KEYCODE_V, KEYCODE_v);
+		map.put(KeyEvent.KEYCODE_W, KEYCODE_w);
+		map.put(KeyEvent.KEYCODE_X, KEYCODE_x);
+		map.put(KeyEvent.KEYCODE_Y, KEYCODE_y);
+		map.put(KeyEvent.KEYCODE_Z, KEYCODE_z);
+		//map.put(KeyEvent.KEYCODE_DEL, KEYCODE_DELETE); use BACKSPACE instead
+		//map.put(??, KEYCODE_KP_*);
+		map.put(KeyEvent.KEYCODE_DPAD_UP, KEYCODE_UP);
+		map.put(KeyEvent.KEYCODE_DPAD_DOWN, KEYCODE_DOWN);
+		map.put(KeyEvent.KEYCODE_DPAD_RIGHT, KEYCODE_RIGHT);
+		map.put(KeyEvent.KEYCODE_DPAD_LEFT, KEYCODE_LEFT);
+		//map.put(??, KEYCODE_INSERT);
+		//map.put(??, KEYCODE_HOME);
+		//map.put(??, KEYCODE_END);
+		//map.put(??, KEYCODE_PAGEUP);
+		//map.put(??, KEYCODE_PAGEDOWN);
+		//map.put(??, KEYCODE_F{1-15});
+		map.put(KeyEvent.KEYCODE_NUM, KEYCODE_NUMLOCK);
+		//map.put(??, KEYCODE_CAPSLOCK);
+		//map.put(??, KEYCODE_SCROLLLOCK);
+		map.put(KeyEvent.KEYCODE_SHIFT_RIGHT, KEYCODE_RSHIFT);
+		map.put(KeyEvent.KEYCODE_SHIFT_LEFT, KEYCODE_LSHIFT);
+		//map.put(??, KEYCODE_RCTRL);
+		//map.put(??, KEYCODE_LCTRL);
+		map.put(KeyEvent.KEYCODE_ALT_RIGHT, KEYCODE_RALT);
+		map.put(KeyEvent.KEYCODE_ALT_LEFT, KEYCODE_LALT);
+		// ?? META, SUPER
+		// ?? MODE, COMPOSE
+		// ?? HELP, PRINT, SYSREQ, BREAK, EURO, UNDO
+		map.put(KeyEvent.KEYCODE_MENU, KEYCODE_MENU);
+		map.put(KeyEvent.KEYCODE_POWER, KEYCODE_POWER);
+
+		androidKeyMap = Collections.unmodifiableMap(map);
+	}
+
+	public int type;
+	public boolean synthetic;
+	public int kbd_keycode;
+	public int kbd_ascii;
+	public int kbd_flags;
+	public int mouse_x;
+	public int mouse_y;
+	public boolean mouse_relative;	// Used for trackball events
+
+	public Event() {
+		type = EVENT_INVALID;
+		synthetic = false;
+	}
+
+	public Event(int type) {
+		this.type = type;
+		synthetic = false;
+	}
+
+	public static Event KeyboardEvent(int type, int keycode, int ascii,
+									  int flags) {
+		Event e = new Event();
+		e.type = type;
+		e.kbd_keycode = keycode;
+		e.kbd_ascii = ascii;
+		e.kbd_flags = flags;
+		return e;
+	}
+
+	public static Event MouseEvent(int type, int x, int y) {
+		Event e = new Event();
+		e.type = type;
+		e.mouse_x = x;
+		e.mouse_y = y;
+		return e;
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java b/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
new file mode 100644
index 0000000000..840f3440d5
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
@@ -0,0 +1,52 @@
+package org.inodes.gus.scummvm;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class PluginProvider extends BroadcastReceiver {
+	public final static String META_UNPACK_LIB =
+		"org.inodes.gus.scummvm.meta.UNPACK_LIB";
+
+	public void onReceive(Context context, Intent intent) {
+		if (!intent.getAction().equals(ScummVMApplication.ACTION_PLUGIN_QUERY))
+			return;
+
+		Bundle extras = getResultExtras(true);
+
+		final ActivityInfo info;
+		try {
+			info = context.getPackageManager()
+				.getReceiverInfo(new ComponentName(context, this.getClass()),
+								 PackageManager.GET_META_DATA);
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.e(this.toString(), "Error finding my own info?", e);
+			return;
+		}
+
+		String mylib = info.metaData.getString(META_UNPACK_LIB);
+		if (mylib != null) {
+			ArrayList<String> all_libs =
+				extras.getStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS);
+
+			all_libs.add(new Uri.Builder()
+						 .scheme("plugin")
+						 .authority(context.getPackageName())
+						 .path(mylib)
+						 .toString());
+
+			extras.putStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS,
+									  all_libs);
+		}
+
+		setResultExtras(extras);
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
new file mode 100644
index 0000000000..d39aa363ef
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
@@ -0,0 +1,353 @@
+package org.inodes.gus.scummvm;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Process;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import javax.microedition.khronos.opengles.GL;
+import javax.microedition.khronos.opengles.GL10;
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGL11;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+
+import java.io.File;
+import java.util.concurrent.Semaphore;
+
+
+// At least in Android 2.1, eglCreateWindowSurface() requires an
+// EGLNativeWindowSurface object, which is hidden deep in the bowels
+// of libui.  Until EGL is properly exposed, it's probably safer to
+// use the Java versions of most EGL functions :(
+
+public class ScummVM implements SurfaceHolder.Callback {
+	private final static String LOG_TAG = "ScummVM.java";
+
+	private final int AUDIO_FRAME_SIZE = 2 * 2;	 // bytes. 16bit audio * stereo
+	public static class AudioSetupException extends Exception {}
+
+	private long nativeScummVM;	// native code hangs itself here
+	boolean scummVMRunning = false;
+
+	private native void create(AssetManager am);
+
+	public ScummVM(Context context) {
+		create(context.getAssets());  // Init C++ code, set nativeScummVM
+	}
+
+	private native void nativeDestroy();
+
+	public synchronized void destroy() {
+		if (nativeScummVM != 0) {
+			nativeDestroy();
+			nativeScummVM = 0;
+		}
+	}
+	protected void finalize() {
+		destroy();
+	}
+
+	// Surface creation:
+	// GUI thread: create surface, release lock
+	// ScummVM thread: acquire lock (block), read surface
+	//
+	// Surface deletion:
+	// GUI thread: post event, acquire lock (block), return
+	// ScummVM thread: read event, free surface, release lock
+	//
+	// In other words, ScummVM thread does this:
+	//	acquire lock
+	//	setup surface
+	//	when SCREEN_CHANGED arrives:
+	//	 destroy surface
+	//	 release lock
+	//	back to acquire lock
+	static final int configSpec[] = {
+		EGL10.EGL_RED_SIZE, 5,
+		EGL10.EGL_GREEN_SIZE, 5,
+		EGL10.EGL_BLUE_SIZE, 5,
+		EGL10.EGL_DEPTH_SIZE, 0,
+		EGL10.EGL_SURFACE_TYPE, EGL10.EGL_WINDOW_BIT,
+		EGL10.EGL_NONE,
+	};
+	EGL10 egl;
+	EGLDisplay eglDisplay = EGL10.EGL_NO_DISPLAY;
+	EGLConfig eglConfig;
+	EGLContext eglContext = EGL10.EGL_NO_CONTEXT;
+	EGLSurface eglSurface = EGL10.EGL_NO_SURFACE;
+	Semaphore surfaceLock = new Semaphore(0, true);
+	SurfaceHolder nativeSurface;
+
+	public void surfaceCreated(SurfaceHolder holder) {
+		nativeSurface = holder;
+		surfaceLock.release();
+	}
+
+	public void surfaceChanged(SurfaceHolder holder, int format,
+							   int width, int height) {
+		// Disabled while I debug GL problems
+		//pushEvent(new Event(Event.EVENT_SCREEN_CHANGED));
+	}
+
+	public void surfaceDestroyed(SurfaceHolder holder) {
+		pushEvent(new Event(Event.EVENT_SCREEN_CHANGED));
+		try {
+			surfaceLock.acquire();
+		} catch (InterruptedException e) {
+			Log.e(this.toString(),
+				  "Interrupted while waiting for surface lock", e);
+		}
+	}
+
+	// Called by ScummVM thread (from initBackend)
+	private void createScummVMGLContext() {
+		egl = (EGL10)EGLContext.getEGL();
+		eglDisplay = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+		int[] version = new int[2];
+		egl.eglInitialize(eglDisplay, version);
+		int[] num_config = new int[1];
+		egl.eglChooseConfig(eglDisplay, configSpec, null, 0, num_config);
+
+		final int numConfigs = num_config[0];
+		if (numConfigs <= 0)
+			throw new IllegalArgumentException("No configs match configSpec");
+
+		EGLConfig[] configs = new EGLConfig[numConfigs];
+		egl.eglChooseConfig(eglDisplay, configSpec, configs, numConfigs,
+							num_config);
+		eglConfig = configs[0];
+
+		eglContext = egl.eglCreateContext(eglDisplay, eglConfig,
+										  EGL10.EGL_NO_CONTEXT, null);
+	}
+
+	// Called by ScummVM thread
+	static private boolean _log_version = true;
+	protected void setupScummVMSurface() {
+		try {
+			surfaceLock.acquire();
+		} catch (InterruptedException e) {
+			Log.e(this.toString(),
+				  "Interrupted while waiting for surface lock", e);
+			return;
+		}
+		eglSurface = egl.eglCreateWindowSurface(eglDisplay, eglConfig,
+												nativeSurface, null);
+		egl.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext);
+
+		GL10 gl = (GL10)eglContext.getGL();
+
+		if (_log_version) {
+			Log.i(LOG_TAG, String.format("Using EGL %s (%s); GL %s/%s (%s)",
+										 egl.eglQueryString(eglDisplay, EGL10.EGL_VERSION),
+										 egl.eglQueryString(eglDisplay, EGL10.EGL_VENDOR),
+										 gl.glGetString(GL10.GL_VERSION),
+										 gl.glGetString(GL10.GL_RENDERER),
+										 gl.glGetString(GL10.GL_VENDOR)));
+			_log_version = false; // only log this once
+		}
+
+		int[] value = new int[1];
+		egl.eglQuerySurface(eglDisplay, eglSurface, EGL10.EGL_WIDTH, value);
+		int width = value[0];
+		egl.eglQuerySurface(eglDisplay, eglSurface, EGL10.EGL_HEIGHT, value);
+		int height = value[0];
+		Log.i(LOG_TAG, String.format("New surface is %dx%d", width, height));
+		setSurfaceSize(width, height);
+	}
+
+	// Called by ScummVM thread
+	protected void destroyScummVMSurface() {
+		if (eglSurface != null) {
+			egl.eglMakeCurrent(eglDisplay, EGL10.EGL_NO_SURFACE,
+							   EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+			egl.eglDestroySurface(eglDisplay, eglSurface);
+			eglSurface = EGL10.EGL_NO_SURFACE;
+		}
+
+		surfaceLock.release();
+	}
+
+	public void setSurface(SurfaceHolder holder) {
+		holder.addCallback(this);
+	}
+
+	final public boolean swapBuffers() {
+		if (!egl.eglSwapBuffers(eglDisplay, eglSurface)) {
+			int error = egl.eglGetError();
+			Log.w(LOG_TAG, String.format("eglSwapBuffers exited with error 0x%x", error));
+			if (error == EGL11.EGL_CONTEXT_LOST)
+				return false;
+		}
+		return true;
+	}
+
+	// Set scummvm config options
+	final public native static void loadConfigFile(String path);
+	final public native static void setConfMan(String key, int value);
+	final public native static void setConfMan(String key, String value);
+	final public native void enableZoning(boolean enable);
+	final public native void setSurfaceSize(int width, int height);
+
+	// Feed an event to ScummVM.  Safe to call from other threads.
+	final public native void pushEvent(Event e);
+
+	final private native void audioMixCallback(byte[] buf);
+
+	// Runs the actual ScummVM program and returns when it does.
+	// This should not be called from multiple threads simultaneously...
+	final public native int scummVMMain(String[] argv);
+
+	// Callbacks from C++ peer instance
+	//protected GraphicsMode[] getSupportedGraphicsModes() {}
+	protected void displayMessageOnOSD(String msg) {}
+	protected void setWindowCaption(String caption) {}
+	protected void showVirtualKeyboard(boolean enable) {}
+	protected String[] getSysArchives() { return new String[0]; }
+	protected String[] getPluginDirectories() { return new String[0]; }
+	protected void initBackend() throws AudioSetupException {
+		createScummVMGLContext();
+		initAudio();
+	}
+
+	private static class AudioThread extends Thread {
+		final private int buf_size;
+		private boolean is_paused = false;
+		final private ScummVM scummvm;
+		final private AudioTrack audio_track;
+
+		AudioThread(ScummVM scummvm, AudioTrack audio_track, int buf_size) {
+			super("AudioThread");
+			this.scummvm = scummvm;
+			this.audio_track = audio_track;
+			this.buf_size = buf_size;
+			setPriority(Thread.MAX_PRIORITY);
+			setDaemon(true);
+		}
+
+		public void pauseAudio() {
+			synchronized (this) {
+				is_paused = true;
+			}
+			audio_track.pause();
+		}
+
+		public void resumeAudio() {
+			synchronized (this) {
+				is_paused = false;
+				notifyAll();
+			}
+			audio_track.play();
+		}
+
+		public void run() {
+			byte[] buf = new byte[buf_size];
+			audio_track.play();
+			int offset = 0;
+			try {
+				while (true) {
+					synchronized (this) {
+						while (is_paused)
+							wait();
+					}
+
+					if (offset == buf.length) {
+						// Grab new audio data
+						scummvm.audioMixCallback(buf);
+						offset = 0;
+					}
+					int len = buf.length - offset;
+					int ret = audio_track.write(buf, offset, len);
+					if (ret < 0) {
+						Log.w(LOG_TAG, String.format(
+							"AudioTrack.write(%dB) returned error %d",
+							buf.length, ret));
+						break;
+					} else if (ret != len) {
+						Log.w(LOG_TAG, String.format(
+							"Short audio write.	 Wrote %dB, not %dB",
+							ret, buf.length));
+						// Buffer is full, so yield cpu for a while
+						Thread.sleep(100);
+					}
+					offset += ret;
+				}
+			} catch (InterruptedException e) {
+				Log.e(this.toString(), "Audio thread interrupted", e);
+			}
+		}
+	}
+	private AudioThread audio_thread;
+
+	final public int audioSampleRate() {
+		return AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
+	}
+
+	private void initAudio() throws AudioSetupException {
+		int sample_rate = audioSampleRate();
+		int buf_size =
+			AudioTrack.getMinBufferSize(sample_rate,
+										AudioFormat.CHANNEL_CONFIGURATION_STEREO,
+										AudioFormat.ENCODING_PCM_16BIT);
+		if (buf_size < 0) {
+			int guess = AUDIO_FRAME_SIZE * sample_rate / 100;  // 10ms of audio
+			Log.w(LOG_TAG, String.format(
+										 "Unable to get min audio buffer size (error %d). Guessing %dB.",
+										 buf_size, guess));
+			buf_size = guess;
+		}
+		Log.d(LOG_TAG, String.format("Using %dB buffer for %dHZ audio",
+									 buf_size, sample_rate));
+		AudioTrack audio_track =
+			new AudioTrack(AudioManager.STREAM_MUSIC,
+						   sample_rate,
+						   AudioFormat.CHANNEL_CONFIGURATION_STEREO,
+						   AudioFormat.ENCODING_PCM_16BIT,
+						   buf_size,
+						   AudioTrack.MODE_STREAM);
+		if (audio_track.getState() != AudioTrack.STATE_INITIALIZED) {
+			Log.e(LOG_TAG, "Error initialising Android audio system.");
+			throw new AudioSetupException();
+		}
+
+		audio_thread = new AudioThread(this, audio_track, buf_size);
+		audio_thread.start();
+	}
+
+	public void pause() {
+		audio_thread.pauseAudio();
+		// TODO: need to pause engine too
+	}
+
+	public void resume() {
+		// TODO: need to resume engine too
+		audio_thread.resumeAudio();
+	}
+
+	static {
+		// For grabbing with gdb...
+		final boolean sleep_for_debugger = false;
+		if (sleep_for_debugger) {
+			try {
+				Thread.sleep(20*1000);
+			} catch (InterruptedException e) {
+			}
+		}
+
+		//System.loadLibrary("scummvm");
+		File cache_dir = ScummVMApplication.getLastCacheDir();
+		String libname = System.mapLibraryName("scummvm");
+		File libpath = new File(cache_dir, libname);
+		System.load(libpath.getPath());
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
new file mode 100644
index 0000000000..b37b2b8a52
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
@@ -0,0 +1,466 @@
+package org.inodes.gus.scummvm;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.res.Configuration;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import java.io.IOException;
+
+public class ScummVMActivity extends Activity {
+	private boolean _do_right_click;
+	private boolean _last_click_was_right;
+
+	// game pixels to move per trackball/dpad event.
+	// FIXME: replace this with proper mouse acceleration
+	private final static int TRACKBALL_SCALE = 2;
+
+	private class MyScummVM extends ScummVM {
+		private boolean scummvmRunning = false;
+
+		private boolean usingSmallScreen() {
+			// Multiple screen sizes came in with Android 1.6.  Have
+			// to use reflection in order to continue supporting 1.5
+			// devices :(
+			DisplayMetrics metrics = new DisplayMetrics();
+			getWindowManager().getDefaultDisplay().getMetrics(metrics);
+			try {
+				// This 'density' term is very confusing.
+				int DENSITY_LOW = metrics.getClass().getField("DENSITY_LOW").getInt(null);
+				int densityDpi = metrics.getClass().getField("densityDpi").getInt(metrics);
+				return densityDpi <= DENSITY_LOW;
+			} catch (Exception e) {
+				return false;
+			}
+		}
+
+		public MyScummVM() {
+			super(ScummVMActivity.this);
+
+			// Enable ScummVM zoning on 'small' screens.
+			enableZoning(usingSmallScreen());
+		}
+
+		@Override
+		protected void initBackend() throws ScummVM.AudioSetupException {
+			synchronized (this) {
+				scummvmRunning = true;
+				notifyAll();
+			}
+			super.initBackend();
+		}
+
+		public void waitUntilRunning() throws InterruptedException {
+			synchronized (this) {
+				while (!scummvmRunning)
+					wait();
+			}
+		}
+
+		@Override
+		protected void displayMessageOnOSD(String msg) {
+			Log.i(this.toString(), "OSD: " + msg);
+			Toast.makeText(ScummVMActivity.this, msg, Toast.LENGTH_LONG).show();
+		}
+
+		@Override
+		protected void setWindowCaption(final String caption) {
+			runOnUiThread(new Runnable() {
+					public void run() {
+						setTitle(caption);
+					}
+				});
+		}
+
+		@Override
+		protected String[] getPluginDirectories() {
+			String[] dirs = new String[1];
+			dirs[0] = ScummVMApplication.getLastCacheDir().getPath();
+			return dirs;
+		}
+
+		@Override
+		protected void showVirtualKeyboard(final boolean enable) {
+			if (getResources().getConfiguration().keyboard ==
+				Configuration.KEYBOARD_NOKEYS) {
+				runOnUiThread(new Runnable() {
+						public void run() {
+							showKeyboard(enable);
+						}
+					});
+			}
+		}
+	}
+	private MyScummVM scummvm;
+	private Thread scummvm_thread;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		_do_right_click = false;
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+		setContentView(R.layout.main);
+		takeKeyEvents(true);
+
+		// This is a common enough error that we should warn about it
+		// explicitly.
+		if (!Environment.getExternalStorageDirectory().canRead()) {
+			new AlertDialog.Builder(this)
+				.setTitle(R.string.no_sdcard_title)
+				.setIcon(android.R.drawable.ic_dialog_alert)
+				.setMessage(R.string.no_sdcard)
+				.setNegativeButton(R.string.quit,
+								   new DialogInterface.OnClickListener() {
+									   public void onClick(DialogInterface dialog,
+														   int which) {
+										   finish();
+									   }
+								   })
+				.show();
+			return;
+		}
+
+		SurfaceView main_surface = (SurfaceView)findViewById(R.id.main_surface);
+		main_surface.setOnTouchListener(new View.OnTouchListener() {
+				public boolean onTouch(View v, MotionEvent event) {
+					return onTouchEvent(event);
+				}
+			});
+		main_surface.setOnKeyListener(new View.OnKeyListener() {
+				public boolean onKey(View v, int code, KeyEvent ev) {
+					return onKeyDown(code, ev);
+				}
+			});
+		main_surface.requestFocus();
+
+		// Start ScummVM
+		scummvm = new MyScummVM();
+		scummvm_thread = new Thread(new Runnable() {
+				public void run() {
+					try {
+						runScummVM();
+					} catch (Exception e) {
+						Log.e("ScummVM", "Fatal error in ScummVM thread", e);
+						new AlertDialog.Builder(ScummVMActivity.this)
+							.setTitle("Error")
+							.setMessage(e.toString())
+							.setIcon(android.R.drawable.ic_dialog_alert)
+							.show();
+						finish();
+					}
+				}
+			}, "ScummVM");
+		scummvm_thread.start();
+
+		// Block UI thread until ScummVM has started.  In particular,
+		// this means that surface and event callbacks should be safe
+		// after this point.
+		try {
+			scummvm.waitUntilRunning();
+		} catch (InterruptedException e) {
+			Log.e(this.toString(),
+				  "Interrupted while waiting for ScummVM.initBackend", e);
+			finish();
+		}
+
+		scummvm.setSurface(main_surface.getHolder());
+	}
+
+	// Runs in another thread
+	private void runScummVM() throws IOException {
+		getFilesDir().mkdirs();
+		String[] args = {
+			"ScummVM-lib",
+			"--config=" + getFileStreamPath("scummvmrc").getPath(),
+			"--path=" + Environment.getExternalStorageDirectory().getPath(),
+			"--gui-theme=scummmodern",
+			"--savepath=" + getDir("saves", 0).getPath(),
+		};
+
+		int ret = scummvm.scummVMMain(args);
+
+		// On exit, tear everything down for a fresh
+		// restart next time.
+		System.exit(ret);
+	}
+
+	private boolean was_paused = false;
+
+	@Override
+	public void onPause() {
+		if (scummvm != null) {
+			was_paused = true;
+			scummvm.pause();
+		}
+		super.onPause();
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (scummvm != null && was_paused)
+			scummvm.resume();
+		was_paused = false;
+	}
+
+	@Override
+	public void onStop() {
+		if (scummvm != null) {
+			scummvm.pushEvent(new Event(Event.EVENT_QUIT));
+			try {
+				scummvm_thread.join(1000);	// 1s timeout
+			} catch (InterruptedException e) {
+				Log.i(this.toString(),
+					  "Error while joining ScummVM thread", e);
+			}
+		}
+		super.onStop();
+	}
+
+	static final int MSG_MENU_LONG_PRESS = 1;
+	private final Handler keycodeMenuTimeoutHandler = new Handler() {
+			@Override
+			public void handleMessage(Message msg) {
+				if (msg.what == MSG_MENU_LONG_PRESS) {
+					InputMethodManager imm = (InputMethodManager)
+						getSystemService(INPUT_METHOD_SERVICE);
+					if (imm != null)
+						imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+				}
+			}
+		};
+
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent kevent) {
+		return onKeyDown(keyCode, kevent);
+	}
+
+	@Override
+	public boolean onKeyMultiple(int keyCode, int repeatCount,
+									 KeyEvent kevent) {
+		return onKeyDown(keyCode, kevent);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent kevent) {
+		// Filter out "special" keys
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_MENU:
+			// Have to reimplement hold-down-menu-brings-up-softkeybd
+			// ourselves, since we are otherwise hijacking the menu
+			// key :(
+			// See com.android.internal.policy.impl.PhoneWindow.onKeyDownPanel()
+			// for the usual Android implementation of this feature.
+			if (kevent.getRepeatCount() > 0)
+				// Ignore keyrepeat for menu
+				return false;
+			boolean timeout_fired = false;
+			if (getResources().getConfiguration().keyboard ==
+				Configuration.KEYBOARD_NOKEYS) {
+				timeout_fired = !keycodeMenuTimeoutHandler.hasMessages(MSG_MENU_LONG_PRESS);
+				keycodeMenuTimeoutHandler.removeMessages(MSG_MENU_LONG_PRESS);
+				if (kevent.getAction() == KeyEvent.ACTION_DOWN) {
+					keycodeMenuTimeoutHandler.sendMessageDelayed(
+																 keycodeMenuTimeoutHandler.obtainMessage(MSG_MENU_LONG_PRESS),
+																 ViewConfiguration.getLongPressTimeout());
+					return true;
+				}
+			}
+			if (kevent.getAction() == KeyEvent.ACTION_UP) {
+				if (!timeout_fired)
+					scummvm.pushEvent(new Event(Event.EVENT_MAINMENU));
+				return true;
+			}
+			return false;
+		case KeyEvent.KEYCODE_CAMERA:
+		case KeyEvent.KEYCODE_SEARCH:
+			_do_right_click = (kevent.getAction() == KeyEvent.ACTION_DOWN);
+			return true;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+		case KeyEvent.KEYCODE_DPAD_UP:
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+		case KeyEvent.KEYCODE_DPAD_RIGHT: {
+			// HTC Hero doesn't seem to generate
+			// MotionEvent.ACTION_DOWN events on trackball press :(
+			// We'll have to just fake one here.
+			// Some other handsets lack a trackball, so the DPAD is
+			// the only way of moving the cursor.
+			int motion_action;
+			// FIXME: this logic is a mess.
+			if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+				switch (kevent.getAction()) {
+				case KeyEvent.ACTION_DOWN:
+					motion_action = MotionEvent.ACTION_DOWN;
+					break;
+				case KeyEvent.ACTION_UP:
+					motion_action = MotionEvent.ACTION_UP;
+					break;
+				default:  // ACTION_MULTIPLE
+					return false;
+				}
+			} else
+				motion_action = MotionEvent.ACTION_MOVE;
+
+			Event e = new Event(getEventType(motion_action));
+			e.mouse_x = 0;
+			e.mouse_y = 0;
+			e.mouse_relative = true;
+			switch (keyCode) {
+			case KeyEvent.KEYCODE_DPAD_UP:
+				e.mouse_y = -TRACKBALL_SCALE;
+				break;
+			case KeyEvent.KEYCODE_DPAD_DOWN:
+				e.mouse_y = TRACKBALL_SCALE;
+				break;
+			case KeyEvent.KEYCODE_DPAD_LEFT:
+				e.mouse_x = -TRACKBALL_SCALE;
+				break;
+			case KeyEvent.KEYCODE_DPAD_RIGHT:
+				e.mouse_x = TRACKBALL_SCALE;
+				break;
+			}
+			scummvm.pushEvent(e);
+			return true;
+		}
+		case KeyEvent.KEYCODE_BACK:
+			// skip isSystem() check and fall through to main code
+			break;
+		default:
+			if (kevent.isSystem())
+				return false;
+		}
+
+		// FIXME: what do I need to do for composed characters?
+
+		Event e = new Event();
+
+		switch (kevent.getAction()) {
+		case KeyEvent.ACTION_DOWN:
+			e.type = Event.EVENT_KEYDOWN;
+			e.synthetic = false;
+			break;
+		case KeyEvent.ACTION_UP:
+			e.type = Event.EVENT_KEYUP;
+			e.synthetic = false;
+			break;
+		case KeyEvent.ACTION_MULTIPLE:
+			// e.type is handled below
+			e.synthetic = true;
+			break;
+		default:
+			return false;
+		}
+
+		e.kbd_keycode = Event.androidKeyMap.containsKey(keyCode) ?
+			Event.androidKeyMap.get(keyCode) : Event.KEYCODE_INVALID;
+		e.kbd_ascii = kevent.getUnicodeChar();
+		if (e.kbd_ascii == 0)
+			e.kbd_ascii = e.kbd_keycode; // scummvm keycodes are mostly ascii
+
+
+		e.kbd_flags = 0;
+		if (kevent.isAltPressed())
+			e.kbd_flags |= Event.KBD_ALT;
+		if (kevent.isSymPressed()) // no ctrl key in android, so use sym (?)
+			e.kbd_flags |= Event.KBD_CTRL;
+		if (kevent.isShiftPressed()) {
+			if (keyCode >= KeyEvent.KEYCODE_0 &&
+				keyCode <= KeyEvent.KEYCODE_9) {
+				// Shift+number -> convert to F* key
+				int offset = keyCode == KeyEvent.KEYCODE_0 ?
+					10 : keyCode - KeyEvent.KEYCODE_1; // turn 0 into 10
+				e.kbd_keycode = Event.KEYCODE_F1 + offset;
+				e.kbd_ascii = Event.ASCII_F1 + offset;
+			} else
+				e.kbd_flags |= Event.KBD_SHIFT;
+		}
+
+		if (kevent.getAction() == KeyEvent.ACTION_MULTIPLE) {
+			for (int i = 0; i <= kevent.getRepeatCount(); i++) {
+				e.type = Event.EVENT_KEYDOWN;
+				scummvm.pushEvent(e);
+				e.type = Event.EVENT_KEYUP;
+				scummvm.pushEvent(e);
+			}
+		} else
+			scummvm.pushEvent(e);
+
+		return true;
+	}
+
+	private int getEventType(int action) {
+		switch (action) {
+		case MotionEvent.ACTION_DOWN:
+			_last_click_was_right = _do_right_click;
+			return _last_click_was_right ?
+				Event.EVENT_RBUTTONDOWN : Event.EVENT_LBUTTONDOWN;
+		case MotionEvent.ACTION_UP:
+			return _last_click_was_right ?
+				Event.EVENT_RBUTTONUP : Event.EVENT_LBUTTONUP;
+		case MotionEvent.ACTION_MOVE:
+			return Event.EVENT_MOUSEMOVE;
+		default:
+			return Event.EVENT_INVALID;
+		}
+	}
+
+	@Override
+	public boolean onTrackballEvent(MotionEvent event) {
+		int type = getEventType(event.getAction());
+		if (type == Event.EVENT_INVALID)
+			return false;
+
+		Event e = new Event(type);
+		e.mouse_x =
+			(int)(event.getX() * event.getXPrecision()) * TRACKBALL_SCALE;
+		e.mouse_y =
+			(int)(event.getY() * event.getYPrecision()) * TRACKBALL_SCALE;
+		e.mouse_relative = true;
+		scummvm.pushEvent(e);
+
+		return true;
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		int type = getEventType(event.getAction());
+		if (type == Event.EVENT_INVALID)
+			return false;
+
+		Event e = new Event(type);
+		e.mouse_x = (int)event.getX();
+		e.mouse_y = (int)event.getY();
+		e.mouse_relative = false;
+		scummvm.pushEvent(e);
+
+		return true;
+	}
+
+	private void showKeyboard(boolean show) {
+		SurfaceView main_surface = (SurfaceView)findViewById(R.id.main_surface);
+		InputMethodManager imm = (InputMethodManager)
+			getSystemService(INPUT_METHOD_SERVICE);
+		if (show)
+			imm.showSoftInput(main_surface, InputMethodManager.SHOW_IMPLICIT);
+		else
+			imm.hideSoftInputFromWindow(main_surface.getWindowToken(),
+										InputMethodManager.HIDE_IMPLICIT_ONLY);
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java
new file mode 100644
index 0000000000..37a9d09e1a
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java
@@ -0,0 +1,29 @@
+package org.inodes.gus.scummvm;
+
+import android.app.Application;
+
+import java.io.File;
+
+public class ScummVMApplication extends Application {
+	public final static String ACTION_PLUGIN_QUERY = "org.inodes.gus.scummvm.action.PLUGIN_QUERY";
+	public final static String EXTRA_UNPACK_LIBS = "org.inodes.gus.scummvm.extra.UNPACK_LIBS";
+
+	private static File cache_dir;
+
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		// This is still on /data :(
+		cache_dir = getCacheDir();
+		// This is mounted noexec :(
+		//cache_dir = new File(Environment.getExternalStorageDirectory(),
+		//			 "/.ScummVM.tmp");
+		// This is owned by download manager and requires special
+		// permissions to access :(
+		//cache_dir = Environment.getDownloadCacheDirectory();
+	}
+
+	public static File getLastCacheDir() {
+		return cache_dir;
+	}
+}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/Unpacker.java b/backends/platform/android/org/inodes/gus/scummvm/Unpacker.java
new file mode 100644
index 0000000000..7280aac7d4
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/Unpacker.java
@@ -0,0 +1,370 @@
+package org.inodes.gus.scummvm;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ProgressBar;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+
+public class Unpacker extends Activity {
+	private final static boolean PLUGINS_ENABLED = true;
+	private final static String META_NEXT_ACTIVITY =
+		"org.inodes.gus.unpacker.nextActivity";
+	private ProgressBar mProgress;
+	private File mUnpackDest;  // location to unpack into
+	private AsyncTask<String, Integer, Void> mUnpacker;
+	private final static int REQUEST_MARKET = 1;
+
+	private static class UnpackJob {
+		public ZipFile zipfile;
+		public Set<String> paths;
+
+		public UnpackJob(ZipFile zipfile, Set<String> paths) {
+			this.zipfile = zipfile;
+			this.paths = paths;
+		}
+
+		public long UnpackSize() {
+			long size = 0;
+			for (String path: paths) {
+				ZipEntry entry = zipfile.getEntry(path);
+				if (entry != null) size += entry.getSize();
+			}
+			return size;
+		}
+	}
+
+	private class UnpackTask extends AsyncTask<String, Integer, Void> {
+		@Override
+		protected void onProgressUpdate(Integer... progress) {
+			mProgress.setIndeterminate(false);
+			mProgress.setMax(progress[1]);
+			mProgress.setProgress(progress[0]);
+			mProgress.postInvalidate();
+		}
+
+		@Override
+		protected void onPostExecute(Void result) {
+			Bundle md = getMetaData();
+			String nextActivity = md.getString(META_NEXT_ACTIVITY);
+			if (nextActivity != null) {
+				final ComponentName cn =
+					ComponentName.unflattenFromString(nextActivity);
+				if (cn != null) {
+					final Intent origIntent = getIntent();
+					Intent intent = new Intent();
+					intent.setComponent(cn);
+					if (origIntent.getExtras() != null)
+						intent.putExtras(origIntent.getExtras());
+					intent.putExtra(Intent.EXTRA_INTENT, origIntent);
+					intent.setDataAndType(origIntent.getData(),
+										  origIntent.getType());
+					//intent.fillIn(getIntent(), 0);
+					intent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+					Log.i(this.toString(),
+						  "Starting next activity with intent " + intent);
+					startActivity(intent);
+				} else {
+					Log.w(this.toString(),
+						  "Unable to extract a component name from " + nextActivity);
+				}
+			}
+
+			finish();
+		}
+
+		@Override
+		protected Void doInBackground(String... all_libs) {
+			// This will contain all unpack jobs
+			Map<String, UnpackJob> unpack_jobs =
+				new HashMap<String, UnpackJob>(all_libs.length);
+
+			// This will contain all unpack filenames (so we can
+			// detect stale files in the unpack directory)
+			Set<String> all_files = new HashSet<String>(all_libs.length);
+
+			for (String lib: all_libs) {
+				final Uri uri = Uri.parse(lib);
+				final String pkg = uri.getAuthority();
+				final String path = uri.getPath().substring(1); // skip first /
+
+				all_files.add(new File(path).getName());
+
+				UnpackJob job = unpack_jobs.get(pkg);
+				if (job == null) {
+					try {
+						// getPackageResourcePath is hidden in Context,
+						// but exposed in ContextWrapper...
+						ContextWrapper context =
+							new ContextWrapper(createPackageContext(pkg, 0));
+						ZipFile zipfile =
+							new ZipFile(context.getPackageResourcePath());
+						job = new UnpackJob(zipfile, new HashSet<String>(1));
+					} catch (PackageManager.NameNotFoundException e) {
+						Log.e(this.toString(), "Package " + pkg +
+							  " not found", e);
+						continue;
+					} catch (IOException e) {
+						// FIXME: show some sort of GUI error dialog
+						Log.e(this.toString(),
+							  "Error opening ZIP for package " + pkg, e);
+						continue;
+					}
+					unpack_jobs.put(pkg, job);
+				}
+				job.paths.add(path);
+			}
+
+			// Delete stale filenames from mUnpackDest
+			for (File file: mUnpackDest.listFiles()) {
+				if (!all_files.contains(file.getName())) {
+					Log.i(this.toString(),
+						  "Deleting stale cached file " + file);
+					file.delete();
+				}
+			}
+
+			int total_size = 0;
+			for (UnpackJob job: unpack_jobs.values())
+				total_size += job.UnpackSize();
+
+			publishProgress(0, total_size);
+
+			mUnpackDest.mkdirs();
+
+			int progress = 0;
+
+			for (UnpackJob job: unpack_jobs.values()) {
+				try {
+					ZipFile zipfile = job.zipfile;
+					for (String path: job.paths) {
+						ZipEntry zipentry = zipfile.getEntry(path);
+						if (zipentry == null)
+							throw new FileNotFoundException(
+															"Couldn't find " + path + " in zip");
+						File dest = new File(mUnpackDest, new File(path).getName());
+						if (dest.exists() &&
+							dest.lastModified() == zipentry.getTime() &&
+							dest.length() == zipentry.getSize()) {
+							// Already unpacked
+							progress += zipentry.getSize();
+						} else {
+							if (dest.exists())
+								Log.d(this.toString(),
+									  "Replacing " + dest.getPath() +
+									  " old.mtime=" + dest.lastModified() +
+									  " new.mtime=" + zipentry.getTime() +
+									  " old.size=" + dest.length() +
+									  " new.size=" + zipentry.getSize());
+							else
+								Log.i(this.toString(),
+									  "Extracting " + zipentry.getName() +
+									  " from " + zipfile.getName() +
+									  " to " + dest.getPath());
+
+							long next_update = progress;
+
+							InputStream in = zipfile.getInputStream(zipentry);
+							OutputStream out = new FileOutputStream(dest);
+							int len;
+							byte[] buffer = new byte[4096];
+							while ((len = in.read(buffer)) != -1) {
+								out.write(buffer, 0, len);
+								progress += len;
+								if (progress >= next_update) {
+									publishProgress(progress, total_size);
+									// Arbitrary limit of 2% update steps
+									next_update += total_size / 50;
+								}
+							}
+
+							in.close();
+							out.close();
+							dest.setLastModified(zipentry.getTime());
+						}
+						publishProgress(progress, total_size);
+					}
+
+					zipfile.close();
+				} catch (IOException e) {
+					// FIXME: show some sort of GUI error dialog
+					Log.e(this.toString(), "Error unpacking plugin", e);
+				}
+			}
+
+			if (progress != total_size)
+				Log.d(this.toString(), "Ended with progress " + progress +
+					  " != total size " + total_size);
+
+			setResult(RESULT_OK);
+
+			return null;
+		}
+	}
+
+	private class PluginBroadcastReciever extends BroadcastReceiver {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if (!intent.getAction()
+				.equals(ScummVMApplication.ACTION_PLUGIN_QUERY)) {
+				Log.e(this.toString(),
+					  "Received unexpected action " + intent.getAction());
+				return;
+			}
+
+			Bundle extras = getResultExtras(false);
+			if (extras == null) {
+				// Nothing for us to do.
+				Unpacker.this.setResult(RESULT_OK);
+				finish();
+			}
+
+			ArrayList<String> unpack_libs =
+				extras.getStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS);
+
+			if (unpack_libs != null && !unpack_libs.isEmpty()) {
+				final String[] libs =
+					unpack_libs.toArray(new String[unpack_libs.size()]);
+				mUnpacker = new UnpackTask().execute(libs);
+			}
+		}
+	}
+
+	private void initPlugins() {
+		Bundle extras = new Bundle(1);
+
+		ArrayList<String> unpack_libs = new ArrayList<String>(1);
+		// This is the common ScummVM code (not really a "plugin" as such)
+		unpack_libs.add(new Uri.Builder()
+						.scheme("plugin")
+						.authority(getPackageName())
+						.path("mylib/armeabi/libscummvm.so")
+						.toString());
+		extras.putStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS,
+								  unpack_libs);
+
+		Intent intent = new Intent(ScummVMApplication.ACTION_PLUGIN_QUERY);
+		sendOrderedBroadcast(intent, Manifest.permission.SCUMMVM_PLUGIN,
+							 new PluginBroadcastReciever(),
+							 null, RESULT_OK, null, extras);
+	}
+
+	@Override
+	public void onCreate(Bundle b) {
+		super.onCreate(b);
+
+		mUnpackDest = ScummVMApplication.getLastCacheDir();
+
+		setContentView(R.layout.splash);
+		mProgress = (ProgressBar)findViewById(R.id.progress);
+
+		setResult(RESULT_CANCELED);
+
+		tryUnpack();
+	}
+
+	private void tryUnpack() {
+		Intent intent = new Intent(ScummVMApplication.ACTION_PLUGIN_QUERY);
+		List<ResolveInfo> plugins = getPackageManager()
+			.queryBroadcastReceivers(intent, 0);
+		if (PLUGINS_ENABLED && plugins.isEmpty()) {
+			// No plugins installed
+			AlertDialog.Builder alert = new AlertDialog.Builder(this)
+				.setTitle(R.string.no_plugins_title)
+				.setMessage(R.string.no_plugins_found)
+				.setIcon(android.R.drawable.ic_dialog_alert)
+				.setOnCancelListener(new DialogInterface.OnCancelListener() {
+						public void onCancel(DialogInterface dialog) {
+							finish();
+						}
+					})
+				.setNegativeButton(R.string.quit,
+								   new DialogInterface.OnClickListener() {
+									   public void onClick(DialogInterface dialog, int which) {
+										   finish();
+									   }
+								   });
+
+			final Uri uri = Uri.parse("market://search?q=ScummVM plugin");
+			final Intent market_intent = new Intent(Intent.ACTION_VIEW, uri);
+			if (getPackageManager().resolveActivity(market_intent, 0) != null) {
+				alert.setPositiveButton(R.string.to_market,
+										new DialogInterface.OnClickListener() {
+											public void onClick(DialogInterface dialog, int which) {
+												dialog.dismiss();
+												try {
+													startActivityForResult(market_intent,
+																		   REQUEST_MARKET);
+												} catch (ActivityNotFoundException e) {
+													Log.e(this.toString(),
+														  "Error starting market", e);
+												}
+											}
+										});
+			}
+
+			alert.show();
+
+		} else {
+			// Already have at least one plugin installed
+			initPlugins();
+		}
+	}
+
+	@Override
+	public void onStop() {
+		if (mUnpacker != null)
+			mUnpacker.cancel(true);
+		super.onStop();
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode,
+										Intent data) {
+		switch (requestCode) {
+		case REQUEST_MARKET:
+			if (resultCode != RESULT_OK)
+				Log.w(this.toString(), "Market returned " + resultCode);
+			tryUnpack();
+			break;
+		}
+	}
+
+	private Bundle getMetaData() {
+		try {
+			ActivityInfo ai = getPackageManager()
+				.getActivityInfo(getComponentName(), PackageManager.GET_META_DATA);
+			return ai.metaData;
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.w(this.toString(), "Unable to find my own meta-data", e);
+			return new Bundle();
+		}
+	}
+}
diff --git a/backends/platform/android/video.cpp b/backends/platform/android/video.cpp
new file mode 100644
index 0000000000..d4c002fbd0
--- /dev/null
+++ b/backends/platform/android/video.cpp
@@ -0,0 +1,334 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/null/null.cpp $
+ * $Id: null.cpp 34912 2008-11-06 15:02:50Z fingolfin $
+ *
+ */
+
+#include "base/main.h"
+#include "graphics/surface.h"
+
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+
+#include <android/log.h>
+
+#include "common/rect.h"
+#include "common/array.h"
+#include "common/util.h"
+#include "common/tokenizer.h"
+
+#include "backends/platform/android/video.h"
+
+#undef LOG_TAG
+#define LOG_TAG "ScummVM-video"
+
+#if 0
+#define ENTER(args...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, args)
+#else
+#define ENTER(args...) /**/
+#endif
+
+#if 0
+#define CHECK_GL_ERROR() checkGlError(__FILE__, __LINE__)
+static const char* getGlErrStr(GLenum error) {
+	switch (error) {
+	case GL_NO_ERROR:		   return "GL_NO_ERROR";
+	case GL_INVALID_ENUM:	   return "GL_INVALID_ENUM";
+	case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
+	case GL_STACK_OVERFLOW:	   return "GL_STACK_OVERFLOW";
+	case GL_STACK_UNDERFLOW:   return "GL_STACK_UNDERFLOW";
+	case GL_OUT_OF_MEMORY:	   return "GL_OUT_OF_MEMORY";
+	}
+
+	static char buf[40];
+	snprintf(buf, sizeof(buf), "(Unknown GL error code 0x%x)", error);
+	return buf;
+}
+static void checkGlError(const char* file, int line) {
+	GLenum error = glGetError();
+	if (error != GL_NO_ERROR)
+		warning("%s:%d: GL error: %s", file, line, getGlErrStr(error));
+}
+#else
+#define CHECK_GL_ERROR() do {} while (false)
+#endif
+
+// Supported GL extensions
+static bool npot_supported = false;
+#ifdef GL_OES_draw_texture
+static bool draw_tex_supported = false;
+#endif
+
+static inline GLfixed xdiv(int numerator, int denominator) {
+	assert(numerator < (1<<16));
+	return (numerator << 16) / denominator;
+}
+
+template <class T>
+static T nextHigher2(T k) {
+	if (k == 0)
+		return 1;
+	--k;
+	for (uint i = 1; i < sizeof(T)*CHAR_BIT; i <<= 1)
+		k = k | k >> i;
+	return k + 1;
+}
+
+void GLESTexture::initGLExtensions() {
+	const char* ext_string =
+		reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+	__android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+				"Extensions: %s", ext_string);
+	Common::StringTokenizer tokenizer(ext_string, " ");
+	while (!tokenizer.empty()) {
+		Common::String token = tokenizer.nextToken();
+		if (token == "GL_ARB_texture_non_power_of_two")
+			npot_supported = true;
+#ifdef GL_OES_draw_texture
+		if (token == "GL_OES_draw_texture")
+			draw_tex_supported = true;
+#endif
+	}
+}
+
+GLESTexture::GLESTexture() :
+	_texture_width(0),
+	_texture_height(0),
+	_all_dirty(true)
+{
+	glGenTextures(1, &_texture_name);
+	// This all gets reset later in allocBuffer:
+	_surface.w = 0;
+	_surface.h = 0;
+	_surface.pitch = _texture_width;
+	_surface.pixels = NULL;
+	_surface.bytesPerPixel = 0;
+}
+
+GLESTexture::~GLESTexture() {
+	debug("Destroying texture %u", _texture_name);
+	glDeleteTextures(1, &_texture_name);
+}
+
+void GLESTexture::reinitGL() {
+	glGenTextures(1, &_texture_name);
+	setDirty();
+}
+
+void GLESTexture::allocBuffer(GLuint w, GLuint h) {
+	CHECK_GL_ERROR();
+	int bpp = bytesPerPixel();
+	_surface.w = w;
+	_surface.h = h;
+	_surface.bytesPerPixel = bpp;
+
+	if (w <= _texture_width && h <= _texture_height)
+		// Already allocated a sufficiently large buffer
+		return;
+
+	if (npot_supported) {
+		_texture_width = _surface.w;
+		_texture_height = _surface.h;
+	} else {
+		_texture_width = nextHigher2(_surface.w);
+		_texture_height = nextHigher2(_surface.h);
+	}
+	_surface.pitch = _texture_width * bpp;
+
+	// Allocate room for the texture now, but pixel data gets uploaded
+	// later (perhaps with multiple TexSubImage2D operations).
+	CHECK_GL_ERROR();
+	glBindTexture(GL_TEXTURE_2D, _texture_name);
+	CHECK_GL_ERROR();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	CHECK_GL_ERROR();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	CHECK_GL_ERROR();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	CHECK_GL_ERROR();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	CHECK_GL_ERROR();
+	glTexImage2D(GL_TEXTURE_2D, 0, glFormat(),
+		     _texture_width, _texture_height,
+		     0, glFormat(), glType(), NULL);
+	CHECK_GL_ERROR();
+}
+
+void GLESTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h,
+							   const void* buf, int pitch) {
+	ENTER("updateBuffer(%u, %u, %u, %u, %p, %d)", x, y, w, h, buf, pitch);
+	glBindTexture(GL_TEXTURE_2D, _texture_name);
+
+	setDirtyRect(Common::Rect(x, y, x+w, y+h));
+
+	if (static_cast<int>(w) * bytesPerPixel() == pitch) {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h,
+						glFormat(), glType(), buf);
+	} else {
+		// GLES removed the ability to specify pitch, so we
+		// have to do this row by row.
+		const byte* src = static_cast<const byte*>(buf);
+		do {
+			glTexSubImage2D(GL_TEXTURE_2D, 0, x, y,
+							w, 1, glFormat(), glType(), src);
+			++y;
+			src += pitch;
+		} while (--h);
+	}
+}
+
+void GLESTexture::fillBuffer(byte x) {
+	byte tmpbuf[_surface.h * _surface.w * bytesPerPixel()];
+	memset(tmpbuf, 0, _surface.h * _surface.w * bytesPerPixel());
+	glBindTexture(GL_TEXTURE_2D, _texture_name);
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, _surface.w, _surface.h,
+					glFormat(), glType(), tmpbuf);
+	setDirty();
+}
+
+void GLESTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) {
+	glBindTexture(GL_TEXTURE_2D, _texture_name);
+
+#ifdef GL_OES_draw_texture
+	// Great extension, but only works under specific conditions.
+	// Still a work-in-progress - disabled for now.
+	if (false && draw_tex_supported && paletteSize() == 0) {
+		//glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+		const GLint crop[4] = {0, _surface.h, _surface.w, -_surface.h};
+		glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, crop);
+		glDrawTexiOES(x, y, 0, w, h);
+	} else
+#endif
+	{
+		const GLfixed tex_width = xdiv(_surface.w, _texture_width);
+		const GLfixed tex_height = xdiv(_surface.h, _texture_height);
+		const GLfixed texcoords[] = {
+			0, 0,
+			tex_width, 0,
+			0, tex_height,
+			tex_width, tex_height,
+		};
+		glTexCoordPointer(2, GL_FIXED, 0, texcoords);
+
+		const GLshort vertices[] = {
+			x,	 y,
+			x+w, y,
+			x,	 y+h,
+			x+w, y+h,
+		};
+		glVertexPointer(2, GL_SHORT, 0, vertices);
+
+		assert(ARRAYSIZE(vertices) == ARRAYSIZE(texcoords));
+		glDrawArrays(GL_TRIANGLE_STRIP, 0, ARRAYSIZE(vertices)/2);
+	}
+
+	_all_dirty = false;
+	_dirty_rect = Common::Rect();
+}
+
+GLESPaletteTexture::GLESPaletteTexture() :
+	GLESTexture(),
+	_texture(NULL)
+{
+}
+
+GLESPaletteTexture::~GLESPaletteTexture() {
+	delete[] _texture;
+}
+
+void GLESPaletteTexture::allocBuffer(GLuint w, GLuint h) {
+	CHECK_GL_ERROR();
+	int bpp = bytesPerPixel();
+	_surface.w = w;
+	_surface.h = h;
+	_surface.bytesPerPixel = bpp;
+
+	if (w <= _texture_width && h <= _texture_height)
+		// Already allocated a sufficiently large buffer
+		return;
+
+	if (npot_supported) {
+		_texture_width = _surface.w;
+		_texture_height = _surface.h;
+	} else {
+		_texture_width = nextHigher2(_surface.w);
+		_texture_height = nextHigher2(_surface.h);
+	}
+	_surface.pitch = _texture_width * bpp;
+
+	// Texture gets uploaded later (from drawTexture())
+
+	byte* new_buffer = new byte[paletteSize() +
+		_texture_width * _texture_height * bytesPerPixel()];
+	if (_texture) {
+		memcpy(new_buffer, _texture, paletteSize()); // preserve palette
+		delete[] _texture;
+	}
+	_texture = new_buffer;
+	_surface.pixels = _texture + paletteSize();
+}
+
+void GLESPaletteTexture::fillBuffer(byte x) {
+	assert(_surface.pixels);
+	memset(_surface.pixels, x, _surface.pitch * _surface.h);
+	setDirty();
+}
+
+void GLESPaletteTexture::updateBuffer(GLuint x, GLuint y,
+									  GLuint w, GLuint h,
+									  const void* buf, int pitch) {
+	_all_dirty = true;
+
+	const byte* src = static_cast<const byte*>(buf);
+	byte* dst = static_cast<byte*>(_surface.getBasePtr(x, y));
+	do {
+		memcpy(dst, src, w * bytesPerPixel());
+		dst += _surface.pitch;
+		src += pitch;
+	} while (--h);
+}
+
+void GLESPaletteTexture::uploadTexture() const {
+	const size_t texture_size =
+		paletteSize() + _texture_width * _texture_height * bytesPerPixel();
+	glCompressedTexImage2D(GL_TEXTURE_2D, 0, glType(),
+						   _texture_width, _texture_height,
+						   0, texture_size, _texture);
+	CHECK_GL_ERROR();
+}
+
+void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) {
+	if (_all_dirty) {
+		glBindTexture(GL_TEXTURE_2D, _texture_name);
+		CHECK_GL_ERROR();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		CHECK_GL_ERROR();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		CHECK_GL_ERROR();
+		uploadTexture();
+		_all_dirty = false;
+	}
+
+	GLESTexture::drawTexture(x, y, w, h);
+}
diff --git a/backends/platform/android/video.h b/backends/platform/android/video.h
new file mode 100644
index 0000000000..ee707e4cb5
--- /dev/null
+++ b/backends/platform/android/video.h
@@ -0,0 +1,140 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/null/null.cpp $
+ * $Id: null.cpp 34912 2008-11-06 15:02:50Z fingolfin $
+ *
+ */
+
+#if defined(ANDROID)
+
+#include <GLES/gl.h>
+
+#include "graphics/surface.h"
+
+#include "common/rect.h"
+#include "common/array.h"
+
+class GLESTexture {
+public:
+	static void initGLExtensions();
+
+	GLESTexture();
+	virtual ~GLESTexture();
+	virtual void reinitGL();
+	virtual void allocBuffer(GLuint width, GLuint height);
+	const Graphics::Surface* surface_const() const { return &_surface; }
+	GLuint width() const { return _surface.w; }
+	GLuint height() const { return _surface.h; }
+	GLuint texture_name() const { return _texture_name; }
+	bool dirty() const { return _all_dirty || !_dirty_rect.isEmpty(); }
+	virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height,
+							  const void* buf, int pitch);
+	virtual void fillBuffer(byte x);
+	virtual void drawTexture() {
+		drawTexture(0, 0, _surface.w, _surface.h);
+	}
+	virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h);
+
+protected:
+	virtual byte bytesPerPixel() const = 0;
+	virtual GLenum glFormat() const = 0;
+	virtual GLenum glType() const = 0;
+	virtual size_t paletteSize() const { return 0; };
+	void setDirty() {
+		_all_dirty = true;
+		_dirty_rect = Common::Rect();
+	}
+	void setDirtyRect(const Common::Rect& r) {
+		if (!_all_dirty) {
+			if (_dirty_rect.isEmpty())
+				_dirty_rect = r;
+			else
+				_dirty_rect.extend(r);
+		}
+	}
+	GLuint _texture_name;
+	Graphics::Surface _surface;
+	GLuint _texture_width;
+	GLuint _texture_height;
+	bool _all_dirty;
+	Common::Rect _dirty_rect;  // Covers dirty area
+};
+
+// RGBA4444 texture
+class GLES4444Texture : public GLESTexture {
+protected:
+	virtual byte bytesPerPixel() const { return 2; }
+	virtual GLenum glFormat() const { return GL_RGBA; }
+	virtual GLenum glType() const { return GL_UNSIGNED_SHORT_4_4_4_4; }
+};
+
+// RGB565 texture
+class GLES565Texture : public GLESTexture {
+protected:
+	virtual byte bytesPerPixel() const { return 2; }
+	virtual GLenum glFormat() const { return GL_RGB; }
+	virtual GLenum glType() const { return GL_UNSIGNED_SHORT_5_6_5; }
+};
+
+// RGB888 256-entry paletted texture
+class GLESPaletteTexture : public GLESTexture {
+public:
+	GLESPaletteTexture();
+	virtual ~GLESPaletteTexture();
+	virtual void allocBuffer(GLuint width, GLuint height);
+	virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height,
+							  const void* buf, int pitch);
+	Graphics::Surface* surface() {
+		setDirty();
+		return &_surface;
+	}
+	void* pixels() {
+		setDirty();
+		return _surface.pixels;
+	}
+	const byte* palette_const() const { return _texture; };
+	byte* palette() {
+		setDirty();
+		return _texture;
+	};
+	virtual void drawTexture() {
+		drawTexture(0, 0, _surface.w, _surface.h);
+	}
+	virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h);
+	virtual void fillBuffer(byte x);
+protected:
+	virtual byte bytesPerPixel() const { return 1; }
+	virtual GLenum glFormat() const { return GL_RGB; }
+	virtual GLenum glType() const { return GL_PALETTE8_RGB8_OES; }
+	virtual size_t paletteSize() const { return 256 * 3; };
+	virtual void uploadTexture() const;
+	byte* _texture;
+};
+
+// RGBA8888 256-entry paletted texture
+class GLESPaletteATexture : public GLESPaletteTexture {
+protected:
+	virtual GLenum glFormat() const { return GL_RGBA; }
+	virtual GLenum glType() const { return GL_PALETTE8_RGBA8_OES; }
+	virtual size_t paletteSize() const { return 256 * 4; };
+};
+
+#endif
diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index 2dcf9b7a7c..4494e8da78 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -69,6 +69,8 @@ OBJS :=	dcmain.o time.o display.o audio.o input.o selector.o icon.o \
 
 MODULE_DIRS += ./
 
+BACKEND := dc
+
 include $(srcdir)/Makefile.common
 
 scummvm.bin : scummvm.elf
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 8a122ebb27..057ab283cf 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -86,7 +86,7 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys
   Graphics::PixelFormat getScreenFormat() const;
 
   // Returns a list of all pixel formats supported by the backend.
-  Common::List<Graphics::PixelFormat> getSupportedFormats();
+  Common::List<Graphics::PixelFormat> getSupportedFormats() const;
 
   // Set the size of the video bitmap.
   // Typically, 320x200
@@ -233,6 +233,9 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys
 
 
   Common::SaveFileManager *createSavefileManager();
+
+  Common::SeekableReadStream *createConfigReadStream();
+  Common::WriteStream *createConfigWriteStream();
 };
 
 
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 5a9286093f..5fde919650 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -31,6 +31,7 @@
 #include "icon.h"
 #include "DCLauncherDialog.h"
 #include <common/config-manager.h>
+#include <common/stream.h>
 
 #include "backends/plugins/dc/dc-provider.h"
 #include "sound/mixer_intern.h"
@@ -206,6 +207,16 @@ void OSystem_Dreamcast::getTimeAndDate(TimeDate &td) const {
   td.tm_year = t.tm_year;
 }
 
+Common::SeekableReadStream *OSystem_Dreamcast::createConfigReadStream() {
+  Common::FSNode file("/scummvm.ini");
+  Common::SeekableReadStream *s = file.createReadStream();
+  return s? s : new Common::MemoryReadStream((const byte *)"", 0);
+}
+
+Common::WriteStream *OSystem_Dreamcast::createConfigWriteStream() {
+  return 0;
+}
+
 void DCHardware::dc_init_hardware()
 {
 #ifndef NOSERIAL
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index 35fc94b3cc..53dbff333d 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -198,7 +198,7 @@ Graphics::PixelFormat OSystem_Dreamcast::getScreenFormat() const
   return screenFormats[_screenFormat];
 }
 
-Common::List<Graphics::PixelFormat> OSystem_Dreamcast::getSupportedFormats()
+Common::List<Graphics::PixelFormat> OSystem_Dreamcast::getSupportedFormats() const
 {
   Common::List<Graphics::PixelFormat> list;
   unsigned i;
diff --git a/backends/platform/dc/module.mk b/backends/platform/dc/module.mk
index eecb91909c..c52ca1a474 100644
--- a/backends/platform/dc/module.mk
+++ b/backends/platform/dc/module.mk
@@ -3,8 +3,7 @@ MODULE := backends/platform/dc
 MODULE_OBJS :=	dcmain.o time.o display.o audio.o input.o selector.o icon.o \
 	label.o vmsave.o softkbd.o dcloader.o cache.o dc-fs.o
 
-MODULE_DIRS += \
-        backends/platform/dc/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 0d8e0a0188..0d9b931d2c 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -30,6 +30,7 @@
 #include <base/plugins.h>
 #include <common/fs.h>
 #include <common/events.h>
+#include <common/config-manager.h>
 #include "dc.h"
 #include "icon.h"
 #include "label.h"
@@ -200,12 +201,43 @@ static bool uniqueGame(const char *base, const char *dir,
   return true;
 }
 
-static int findGames(Game *games, int max)
+static int findGames(Game *games, int max, bool use_ini)
 {
   Dir *dirs = new Dir[MAX_DIR];
-  int curr_game = 0, curr_dir = 0, num_dirs = 1;
-  dirs[0].node = Common::FSNode("");
-  while (curr_game < max && curr_dir < num_dirs) {
+  int curr_game = 0, curr_dir = 0, num_dirs = 0;
+
+  if (use_ini) {
+    ConfMan.loadDefaultConfigFile();
+    Common::ConfigManager::DomainMap &game_domains = ConfMan.getGameDomains();
+    for(Common::ConfigManager::DomainMap::const_iterator i =
+	  game_domains.begin(); curr_game < max && i != game_domains.end(); i++) {
+      Common::String path = (*i)._value["path"];
+      if (path.size() && path.lastChar() != '/')
+	path += "/";
+      int j;
+      for (j=0; j<num_dirs; j++)
+	if (path.equals(dirs[j].node.getPath()))
+	  break;
+      if (j >= num_dirs) {
+	if (num_dirs >= MAX_DIR)
+	  continue;
+	dirs[j = num_dirs++].node = Common::FSNode(path);
+      }
+      if (curr_game < max) {
+	strcpy(games[curr_game].filename_base, (*i)._key.c_str());
+	strncpy(games[curr_game].dir, dirs[j].node.getPath().c_str(), 256);
+	games[curr_game].dir[255] = '\0';
+	games[curr_game].language = Common::UNK_LANG;
+	games[curr_game].platform = Common::kPlatformUnknown;
+	strcpy(games[curr_game].text, (*i)._value["description"].c_str());
+	curr_game++;
+      }
+    }
+  } else {
+    dirs[num_dirs++].node = Common::FSNode("");
+  }
+
+  while ((curr_game < max || use_ini) && curr_dir < num_dirs) {
     strncpy(dirs[curr_dir].name, dirs[curr_dir].node.getPath().c_str(), 252);
     dirs[curr_dir].name[251] = '\0';
     dirs[curr_dir].deficon[0] = '\0';
@@ -214,44 +246,46 @@ static int findGames(Game *games, int max)
     for (Common::FSList::const_iterator entry = fslist.begin(); entry != fslist.end();
 	 ++entry) {
       if (entry->isDirectory()) {
-	if (num_dirs < MAX_DIR && strcasecmp(entry->getDisplayName().c_str(),
-					    "install")) {
+	if (!use_ini && num_dirs < MAX_DIR &&
+	    strcasecmp(entry->getDisplayName().c_str(), "install")) {
 	  dirs[num_dirs].node = *entry;
 	  num_dirs++;
 	}
       } else
 	if (isIcon(*entry))
 	  strcpy(dirs[curr_dir-1].deficon, entry->getDisplayName().c_str());
-	else
+	else if(!use_ini)
 	  files.push_back(*entry);
     }
 
-    GameList candidates = EngineMan.detectGames(files);
-
-    for (GameList::const_iterator ge = candidates.begin();
-	ge != candidates.end(); ++ge)
-      if (curr_game < max) {
-	strcpy(games[curr_game].filename_base, ge->gameid().c_str());
-	strcpy(games[curr_game].dir, dirs[curr_dir-1].name);
-	games[curr_game].language = ge->language();
-	games[curr_game].platform = ge->platform();
-	if (uniqueGame(games[curr_game].filename_base,
-		       games[curr_game].dir,
-		       games[curr_game].language,
-		       games[curr_game].platform, games, curr_game)) {
-
-	  strcpy(games[curr_game].text, ge->description().c_str());
+    if (!use_ini) {
+      GameList candidates = EngineMan.detectGames(files);
+
+      for (GameList::const_iterator ge = candidates.begin();
+	   ge != candidates.end(); ++ge)
+	if (curr_game < max) {
+	  strcpy(games[curr_game].filename_base, ge->gameid().c_str());
+	  strcpy(games[curr_game].dir, dirs[curr_dir-1].name);
+	  games[curr_game].language = ge->language();
+	  games[curr_game].platform = ge->platform();
+	  if (uniqueGame(games[curr_game].filename_base,
+			 games[curr_game].dir,
+			 games[curr_game].language,
+			 games[curr_game].platform, games, curr_game)) {
+	    
+	    strcpy(games[curr_game].text, ge->description().c_str());
 #if 0
-	  printf("Registered game <%s> (l:%d p:%d) in <%s> <%s> because of <%s> <*>\n",
-		 games[curr_game].text,
-		 (int)games[curr_game].language,
-		 (int)games[curr_game].platform,
-		 games[curr_game].dir, games[curr_game].filename_base,
-		 dirs[curr_dir-1].name);
+	    printf("Registered game <%s> (l:%d p:%d) in <%s> <%s> because of <%s> <*>\n",
+		   games[curr_game].text,
+		   (int)games[curr_game].language,
+		   (int)games[curr_game].platform,
+		   games[curr_game].dir, games[curr_game].filename_base,
+		   dirs[curr_dir-1].name);
 #endif
-	  curr_game++;
+	    curr_game++;
+	  }
 	}
-      }
+    }
   }
 
   for (int i=0; i<curr_game; i++)
@@ -426,7 +460,9 @@ bool selectGame(char *&ret, char *&dir_ret, Common::Language &lang_ret, Common::
   void *mark = ta_txmark();
 
   for (;;) {
-    num_games = findGames(games, MAX_GAMES);
+    num_games = findGames(games, MAX_GAMES, true);
+    if (!num_games)
+      num_games = findGames(games, MAX_GAMES, false);
 
     for (int i=0; i<num_games; i++) {
       games[i].icon.create_texture();
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index c2e949cd90..75f7012ed0 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -8,17 +8,19 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
- * $Header: /cvsroot/scummvm/scummvm/backends/fs/fs.cpp,v 1.3.2.1 2004/12/18 02:33:52 fingolfin Exp $
  */
 
 //////////////////////////////////////////////////////////////////////
@@ -58,10 +60,10 @@ s32 TOUCH_HEIGHT = TOUCH_CAL_Y2 - TOUCH_CAL_Y1;
 s32 TOUCH_OFFSET_X = ( ((SCREEN_WIDTH -60) * TOUCH_CAL_X1) / TOUCH_WIDTH  ) - 28;
 s32 TOUCH_OFFSET_Y = ( ((SCREEN_HEIGHT-60) * TOUCH_CAL_Y1) / TOUCH_HEIGHT ) - 28;
 
-vu8* soundData;
+vu8 *soundData;
 
-vu8* soundBuffer;
-vu8* arm9Buffer;
+vu8 *soundBuffer;
+vu8 *arm9Buffer;
 bool soundFilled[4];
 
 int playingSection;
@@ -81,7 +83,7 @@ int adpcmBufferNum = 0;
 //////////////////////////////////////////////////////////////////////
 
 /*
-void startSound(int sampleRate, const void* data, uint32 bytes, u8 channel=0, u8 vol=0x7F,  u8 pan=63, u8 format=0) {
+void startSound(int sampleRate, const void *data, uint32 bytes, u8 channel=0, u8 vol=0x7F,  u8 pan=63, u8 format=0) {
   SCHANNEL_TIMER(channel)  = SOUND_FREQ(sampleRate);
   SCHANNEL_SOURCE(channel) = (uint32)data;
   SCHANNEL_LENGTH(channel) = bytes;
@@ -106,7 +108,7 @@ s8 getFreeSoundChannel() {
   return -1;
 }
 
-void startSound(int sampleRate, const void* data, uint32 bytes, u8 channel=0, u8 vol=0x7F,  u8 pan=63, u8 format=0) {
+void startSound(int sampleRate, const void *data, uint32 bytes, u8 channel=0, u8 vol=0x7F,  u8 pan=63, u8 format=0) {
 //  REG_IME = IME_DISABLE;
 
   channel = getFreeSoundChannel();
@@ -177,7 +179,7 @@ void startSound(int sampleRate, const void* data, uint32 bytes, u8 channel=0, u8
 
 
 
-  soundData = (vu8* ) data;
+  soundData = (vu8 *) data;
 
   SCHANNEL_CR(channel)     = flags;
   SCHANNEL_CR(channel + 2)     = flags;
@@ -386,7 +388,7 @@ void InterruptTimer1() {
 		//if ((!soundFilled[r]) && (!IPC->fillNeeded[playingSection])) {
 			memcpy((void *) (soundBuffer + (r * 1024)), (void *) (arm9Buffer + (r * 1024)), 1024);
 
-			vu16* p = (vu16 *) (soundBuffer);
+			vu16 *p = (vu16 *) (soundBuffer);
 			//for (int t = 0; t < 2048; t++) {
 		//		*(p + t) = (t & 1)? 0xF000: 0x0000;
 			//}
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index c43c28c223..c9a665c442 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -111,7 +111,7 @@ USE_ARM_COSTUME_ASM = 1
 #WRAP_MALLOC = 1
 
 ifdef DS_BUILD_A
-	DEFINES += -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
+	DEFINES = -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
 	LOGO = logoa.bmp
 	ENABLE_SCUMM = $(ENABLED)
 	USE_ARM_GFX_ASM = 1
@@ -119,7 +119,7 @@ ifdef DS_BUILD_A
 endif
 
 ifdef DS_BUILD_B
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_B
+	DEFINES = -DDS_BUILD_B
 	LOGO = logob.bmp
 	ENABLE_SKY = $(ENABLED)
 	ENABLE_QUEEN = $(ENABLED)
@@ -127,14 +127,14 @@ ifdef DS_BUILD_B
 endif
 
 ifdef DS_BUILD_C
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_C
+	DEFINES = -DDS_BUILD_C
 	LOGO = logoc.bmp
 	ENABLE_AGOS = $(ENABLED)
 	BUILD=scummvm-C
 endif
 
 ifdef DS_BUILD_D
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_D
+	DEFINES = -DDS_BUILD_D
 	LOGO = logod.bmp
 	ENABLE_GOB = $(ENABLED)
 	ENABLE_CINE = $(ENABLED)
@@ -143,42 +143,42 @@ ifdef DS_BUILD_D
 endif
 
 ifdef DS_BUILD_E
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_E
+	DEFINES = -DDS_BUILD_E
 	LOGO = logoe.bmp
 	ENABLE_SAGA = $(ENABLED)
 	BUILD=scummvm-E
 endif
 
 ifdef DS_BUILD_F
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_F
+	DEFINES = -DDS_BUILD_F
 	LOGO = logof.bmp
 	ENABLE_KYRA = $(ENABLED)
 	BUILD=scummvm-F
 endif
 
 ifdef DS_BUILD_G
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_G
+	DEFINES = -DDS_BUILD_G
 	LOGO = logog.bmp
 	ENABLE_LURE = $(ENABLED)
 	BUILD=scummvm-G
 endif
 
 ifdef DS_BUILD_H
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_H
+	DEFINES = -DDS_BUILD_H
 	LOGO = logoh.bmp
 	ENABLE_PARALLACTION = $(ENABLED)
 	BUILD=scummvm-H
 endif
 
 ifdef DS_BUILD_I
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_I
+	DEFINES = -DDS_BUILD_I
 	LOGO = logoi.bmp
 	ENABLE_MADE = $(ENABLED)
 	BUILD=scummvm-I
 endif
 
 ifdef DS_BUILD_K
-	DEFINES += -DDS_NON_SCUMM_BUILD -DDS_BUILD_K
+	DEFINES = -DDS_BUILD_K
 	LOGO = logok.bmp
 	ENABLE_CRUISE = $(ENABLED)
 	BUILD=scummvm-K
@@ -186,14 +186,14 @@ endif
 
 
 #ifdef DS_BUILD_L
-#	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_L
+#	DEFINES = -DDS_BUILD_L
 #	LOGO = logog.bmp
 #	ENABLE_DRASCULA = $(ENABLED)
 #	BUILD=scummvm-K
 #endif
 
 #ifdef DS_BUILD_M
-#	DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_M
+#	DEFINES = -DDS_BUILD_M
 #	LOGO = logog.bmp
 #	ENABLE_TUCKER = $(ENABLED)
 #	BUILD=scummvm-K
@@ -206,7 +206,6 @@ CXX     = arm-eabi-g++
 LD	= arm-eabi-g++
 
 CFLAGS	=	-Wno-multichar -Wall\
-		-Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
 		-mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
 		-mthumb-interwork -DUSE_ARM_COSTUME_ASM=1 -DDISABLE_SID
 
@@ -252,9 +251,11 @@ ifdef WRAP_MALLOC
 	DEFINES += -DWRAP_MALLOC
 endif
 
+BACKEND := ds
+
 INCLUDES= -I$(portdir) -I$(srcdir) -I$(srcdir)/engines \
 			-I$(portdir)/data -I$(portdir)/../commoninclude \
-			-I$(portdir)/source -I$(portdir)/source/mad -I$(portdir)/source/libcartreset \
+			-I$(portdir)/source -I$(portdir)/source/mad \
 			-I$(libndsdir)/include -include $(srcdir)/common/scummsys.h
 
 LIBS	= -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9
@@ -271,12 +272,13 @@ PRE_OBJS_FLAGS = -Wl,--whole-archive
 POST_OBJS_FLAGS = -Wl,--no-whole-archive
 endif
 
-#-Lscumm -lscumm -Lbase -lbase -Lcommon -lcommon -Lgraphics -lgraphics -Lgui -lgui -Lsound -lsound
 EXECUTABLE = scummvm.elf
+
 PLUGIN_PREFIX =
 PLUGIN_SUFFIX = .plg
 PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/ds/plugin.ld $(srcdir)/backends/plugins/plugin.syms $(EXECUTABLE)
 PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--target1-abs,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ds/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc -mthumb-interwork -mno-fpu#-Wl,--gc-sections -mno-crt0 $(DEVKITPRO)/devkitARM/arm-eabi/lib/ds_arm9_crt0.o
+
 MKDIR = mkdir -p
 RM = rm -f
 RM_REC = rm -rf
@@ -286,72 +288,77 @@ OBJCOPY = arm-eabi-objcopy
 AS = arm-eabi-as
 HAVE_GCC3 = true
 
-PORT_OBJS :=	$(portdir)/source/blitters_arm.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \
-		$(portdir)/../../../fs/ds/ds-fs.o $(portdir)/source/gbampsave.o $(portdir)/source/scummhelp.o\
-		$(portdir)/source/osystem_ds.o $(portdir)/source/ramsave.o\
-		$(portdir)/source/touchkeyboard.o $(portdir)/source/zipreader.o\
-		$(portdir)/source/dsoptions.o $(portdir)/source/keys.o $(portdir)/source/wordcompletion.o\
-		$(portdir)/source/interrupt.o
+PORT_OBJS := \
+	$(portdir)/source/blitters_arm.o \
+	$(portdir)/source/cdaudio.o \
+	$(portdir)/source/dsmain.o \
+	$(portdir)/source/gbampsave.o \
+	$(portdir)/source/scummhelp.o \
+	$(portdir)/source/osystem_ds.o \
+	$(portdir)/source/touchkeyboard.o \
+	$(portdir)/source/zipreader.o \
+	$(portdir)/source/dsoptions.o \
+	$(portdir)/source/keys.o \
+	$(portdir)/source/wordcompletion.o \
+	$(portdir)/source/interrupt.o
 
 ifdef USE_PROFILER
 	PORT_OBJS += $(portdir)/source/profiler/cyg-profile.o
 endif
 
 
-DATA_OBJS := $(portdir)/data/icons.o $(portdir)/data/keyboard.o $(portdir)/data/keyboard_pal.o $(portdir)/data/default_font.o $(portdir)/data/8x8font_tga.o
-
-COMPRESSOR_OBJS :=
-#$(portdir)/source/compressor/lz.o
+DATA_OBJS := \
+	$(portdir)/data/icons.o \
+	$(portdir)/data/keyboard.o \
+	$(portdir)/data/keyboard_pal.o \
+	$(portdir)/data/default_font.o \
+	$(portdir)/data/8x8font_tga.o
+
+FAT_OBJS := \
+	$(portdir)/source/fat/disc_io.o \
+	$(portdir)/source/fat/gba_nds_fat.o \
+	$(portdir)/source/fat/io_fcsr.o \
+	$(portdir)/source/fat/io_m3cf.o \
+	$(portdir)/source/fat/io_mpcf.o \
+	$(portdir)/source/fat/io_sccf.o \
+	$(portdir)/source/fat/io_m3sd.o \
+	$(portdir)/source/fat/io_nmmc.o \
+	$(portdir)/source/fat/io_scsd.o \
+	$(portdir)/source/fat/io_scsd_asm.o \
+	$(portdir)/source/fat/io_njsd.o \
+	$(portdir)/source/fat/io_mmcf.o \
+	$(portdir)/source/fat/io_sd_common.o \
+	$(portdir)/source/fat/io_m3_common.o \
+	$(portdir)/source/fat/io_dldi.o \
+	$(portdir)/source/fat/m3sd.o
 
-FAT_OBJS :=  $(portdir)/source/fat/disc_io.o $(portdir)/source/fat/gba_nds_fat.o\
-			$(portdir)/source/fat/io_fcsr.o $(portdir)/source/fat/io_m3cf.o\
-			$(portdir)/source/fat/io_mpcf.o $(portdir)/source/fat/io_sccf.o\
-			$(portdir)/source/fat/io_m3sd.o\
-			$(portdir)/source/fat/io_nmmc.o $(portdir)/source/fat/io_scsd.o \
-			$(portdir)/source/fat/io_scsd_asm.o \
-			$(portdir)/source/fat/io_njsd.o \
-			$(portdir)/source/fat/io_mmcf.o \
-			$(portdir)/source/fat/io_sd_common.o \
-			$(portdir)/source/fat/io_m3_common.o \
-			$(portdir)/source/fat/io_dldi.o \
-			$(portdir)/source/fat/m3sd.o
-
-
-#			$(portdir)/source/fat/io_cf_common.o $(portdir)/source/fat/io_m3_common.o\
-#			$(portdir)/source/fat/io_sd_common.o $(portdir)/source/fat/io_scsd_s.o \
-#			$(portdir)/source/fat/io_sc_common.o $(portdir)/source/fat/io_sd_common.o
-
-LIBCARTRESET_OBJS :=
-#$(portdir)/source/libcartreset/cartreset.o
 
 # Files in this list will be optimisied for speed, otherwise they will be optimised for space
-OPTLIST := actor.cpp ds_main.cpp osystem_ds.cpp blitters.cpp mame.cpp rate.cpp isomap.cpp image.cpp gfx.cpp sprite.cpp actor_path.cpp actor_walk.cpp script.cpp
+OPTLIST := actor.cpp dsmain.cpp osystem_ds.cpp blitters.cpp mame.cpp rate.cpp isomap.cpp image.cpp gfx.cpp sprite.cpp actor_path.cpp actor_walk.cpp script.cpp
 #OPTLIST :=
 
 # Compiler options for files which should be optimised for speed
 ifdef DS_BUILD_E
-# Another attempt to save some RAM in ITE
-OPT_SPEED := -O3 -mthumb
+  # Another attempt to save some RAM in ITE
+  OPT_SPEED := -O3 -mthumb
 else
-#OPT_SPEED := -O3
-
-OPT_SPEED := -Os -mthumb
-
+  OPT_SPEED := -O3
 endif
 
 # Compiler options for files which should be optimised for space
 OPT_SIZE := -Os -mthumb
 
 
-#-mthumb -fno-gcse -fno-schedule-insns2
-
+OBJS := $(DATA_OBJS) $(PORT_OBJS) $(FAT_OBJS)
 
-OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
 
 MODULE_DIRS += .
 
+#ndsall: plugins
+#	make -f makefile scummvm.nds
+
 ndsall: plugins
-	make -f makefile scummvm.nds
+	make -f makefile scummvm.nds scummvm.ds.gba
 
 include $(srcdir)/Makefile.common
 
@@ -360,26 +367,13 @@ semiclean:
 
 clean:
 	$(RM) $(OBJS) $(EXECUTABLE)
-	rm -rf gui engines sound common plugins base backends graphics scummvm.nds scummvm.elf scummvm-stripped.elf scummvm.ds.gba *.h
-
-plugin_dist :
-	for p in $(PLUGINS); do \
-	  arm-elf-strip -g -o "`basename \"$$p\" | LC_CTYPE=C tr '[:lower:]' '[:upper:]'`" "$$p"; \
-	done
+	rm -rf *.h engines plugins scummvm.nds scummvm.ds.gba
 
 dist : SCUMMVM.BIN plugins plugin_dist
 
 #---------------------------------------------------------------------------------
 # canned command sequence for binary data
 #---------------------------------------------------------------------------------
-#define bin2o
-#	bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
-#	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw_end[];" > `(echo $(<F) | tr . _)`.h
-#	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw[];" >> `(echo $(<F) | tr . _)`.h
-#	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_raw_size";" >> `(echo $(<F) | tr . _)`.h
-#endef
-
-
 define bin2o
 	bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
 	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
@@ -388,34 +382,10 @@ define bin2o
 endef
 
 
-#define bin2o
-#	@echo $(*)
-#	cp $(<) $(*).tmp
-#	$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
-#	--rename-section .data=.rodata \
-#	--redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_start=$(notdir $*)\
-#	--redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_end=$(notdir $*)_end\
-#	$(*).tmp $(@)
-#	echo "extern const u8" $(notdir $*)"[] __attribute__ ((aligned (4)));" > $(*).h
-#	echo "extern const u32" $(notdir $(*))_size[]";" >> $(*).h
-#
-#	echo $(*).h
-#	rm $(*).tmp
-#endef
-
-
 ##############
 # Replacement rule for the one in makefile.common
 ##############
 %.o: %.cpp
-#	echo !!!!!!!!!!!! $(notdir $<)
-#	ifeq ( $(notdir $<), $(findstring $(notdir $<), $(OPTLIST)) )
-#	 OPTFLAG=-O3
-#	else
-#	 OPTFLAG=-Os
-#	endif
-#	export OPTFLAG = ;
-#	echo !!!!!!!! $(OPTFLAG)
 	$(MKDIR) $(*D)/$(DEPDIR)
 	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(if $(findstring $(notdir $<), $(OPTLIST)), $(OPT_SPEED), $(OPT_SIZE)) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
@@ -423,12 +393,6 @@ endef
 #---------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------
-%.o	:	%.pcx
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------
 %.o	:	%.bin
 #---------------------------------------------------------------------------------
 	@echo $(notdir $<)
@@ -447,31 +411,17 @@ endef
 	@$(bin2o)
 
 #---------------------------------------------------------------------------------
-%.o	:	%.map
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o	:	%.mdl
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------
 %.nds: %.bin
-	@echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../$(LOGO) "$(shell basename $@);ScummVM $(VERSION);DS Port"
-	ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../$(LOGO) "$(shell basename $@);ScummVM $(VERSION);DS Port"
-	dsbuild $@ -l ndsloader.bin
+	ndstool -c $@ -9 $< $(ARM7BIN) -b ../$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"
 
-	padbin 16 $(basename $@).ds.gba
+%.ds.gba: %.nds
+	dsbuild $< -o $@ -l $(portdir)/ndsloader.bin
+	padbin 16 $@
 
 #---------------------------------------------------------------------------------
-# FIXME: The following rule hardcodes the input & output filename -- shouldn't it use $< and $@ instead?
 
 %.bin: %.elf
-	$(OBJCOPY) -S scummvm.elf scummvm-stripped.elf
-	$(OBJCOPY) -O binary scummvm-stripped.elf scummvm.bin
+	$(OBJCOPY) -S -O binary $< $@
 
 #%.o: %.s
 #	$(MKDIR) $(*D)/$(DEPDIR)
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 07c6b3fee1..5d29672ef6 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -27,13 +30,13 @@
 
 namespace DS {
 
-void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
+void asmDrawStripToScreen(int height, int width, byte const *text, byte const *src, byte *dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch) {
 
-
-	if (height <= 0) height = 1;
-	if (width < 4) return;
-
+	if (height <= 0)
+		height = 1;
+	if (width < 4)
+		return;
 
 	width &= ~4;
 //	src = (const byte *) (((int) (src)) & (~4));
@@ -111,7 +114,7 @@ void asmDrawStripToScreen(int height, int width, byte const* text, byte const* s
 
 
 
-void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height) {
+void asmCopy8Col(byte *dst, int dstPitch, const byte *src, int height) {
 	asm("ands r0, %3, #1\n"
 		 "addne %3, %3, #1\n"
 		 "bne roll2\n"
@@ -141,22 +144,19 @@ void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height) {
 static bool isDivBy5Ready = false;
 static u32  DIV_BY_5[160];
 
-void ComputeDivBy5TableIFN()
-{
+void ComputeDivBy5TableIFN() {
     if (isDivBy5Ready)
         return;
     isDivBy5Ready = true;
 
-    for (int i=0; i<160; ++i)
-    {
+    for (int i = 0; i < 160; ++i) {
         DIV_BY_5[i] = (2*i+5)/10;
     }
 }
 
 #ifdef PERFECT_5_TO_4_RESCALING
 static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3, u16 s4,
-                                                    u16* dest)
-{
+                                                    u16 *dest) {
     u32 bs0 = s0 & 0x1F;
     u32 bs1 = s1 & 0x1F;
     u32 bs2 = s2 & 0x1F;
@@ -230,8 +230,7 @@ static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3
 }
 #else
 static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3, u16 s4,
-                                                    u16* dest)
-{
+                                                    u16 *dest) {
     static const u32 MASK = 0x03E07C1F;
 
     u32 argbargbs0 = u32(s0) | (u32(s0) << 16);
@@ -279,8 +278,7 @@ static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3
 #endif
 
 static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3, u32 s4,
-                                                    u16* dest)
-{
+                                                    u16 *dest) {
     u32 d0 = 4*s0 +   s1;
     u32 d1 = 2*s1 +   s1 + 2*s2;
 
@@ -317,12 +315,10 @@ static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3
 
 // Can't work in place
 #ifdef PERFECT_5_TO_4_RESCALING
-static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u32* palette)
-{
+static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16 *dest, const u8 *src, const u32 *palette) {
     ComputeDivBy5TableIFN();
 
-    for (size_t i=0; i<64; ++i)
-    {
+    for (size_t i = 0; i < 64; ++i) {
         u32 s0 = palette[src[5*i+0]];
         u32 s1 = palette[src[5*i+1]];
         u32 s2 = palette[src[5*i+2]];
@@ -333,10 +329,8 @@ static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const
     }
 }
 #else
-static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u16* palette)
-{
-    for (size_t i=0; i<64; ++i)
-    {
+static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16 *dest, const u8 *src, const u16 *palette) {
+    for (size_t i = 0; i < 64; ++i) {
         u16 s0 = palette[src[5*i+0]];
         u16 s1 = palette[src[5*i+1]];
         u16 s2 = palette[src[5*i+2]];
@@ -350,12 +344,10 @@ static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const
 
 
 // Can work in place, because it's a contraction
-static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src)
-{
+static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16 *dest, const u16 *src) {
     ComputeDivBy5TableIFN();
 
-    for (size_t i=0; i<64; ++i)
-    {
+    for (size_t i = 0; i < 64; ++i) {
         u16 s0 = src[5*i+0];
         u16 s1 = src[5*i+1];
         u16 s2 = src[5*i+2];
@@ -367,13 +359,11 @@ static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const
 }
 
 #ifdef PERFECT_5_TO_4_RESCALING
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette)
-{
+void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette) {
 	u32 fastRam[768];
 
     // Palette lookup -> 0_888
-    for (size_t i=0; i<256; ++i)
-    {
+    for (size_t i = 0; i < 256; ++i) {
         u32 col = palette[i];
         u32 result = col & 0x0000001F;
         result |= (col << 3) & 0x00001F00;
@@ -382,31 +372,26 @@ void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStri
         fastRam[i] = result;
     }
 
-	for (size_t i=0; i<200; ++i)
-	{
+	for (size_t i = 0; i < 200; ++i) {
 		Rescale_320xPAL8Scanline_To_256x1555Scanline(dest + i*destStride, src + i *srcStride, fastRam);
 	}
 }
 #else
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette)
-{
+void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette) {
 	u16 fastRam[256];
-    for (size_t i=0; i<128; ++i)
+    for (size_t i = 0; i < 128; ++i)
         ((u32*)fastRam)[i] = ((const u32*)palette)[i];
 
-	for (size_t i=0; i<200; ++i)
-	{
+	for (size_t i = 0; i < 200; ++i) {
 		Rescale_320xPAL8Scanline_To_256x1555Scanline(dest + i*destStride, src + i *srcStride, fastRam);
 	}
 }
 #endif
 
-void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride)
-{
-	for (size_t i=0; i<200; ++i)
-	{
+void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStride, int srcStride) {
+	for (size_t i = 0; i < 200; ++i) {
 		Rescale_320x1555Scanline_To_256x1555Scanline(dest + i*destStride, src + i *srcStride);
 	}
 }
 
-}
+}	// End of namespace DS
diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h
index 5f541d1bd6..88506a4405 100644
--- a/backends/platform/ds/arm9/source/blitters.h
+++ b/backends/platform/ds/arm9/source/blitters.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -29,23 +32,23 @@
 
 namespace DS {
 
-void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
+void asmDrawStripToScreen(int height, int width, byte const *text, byte const *src, byte *dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
-void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette);
-void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
+void asmCopy8Col(byte *dst, int dstPitch, const byte *src, int height);
+void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette);
+void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStride, int srcStride);
 
-}
+}	// End of namespace DS
 
 #else
 
 extern "C" {
 
-void ITCM_CODE asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
+void ITCM_CODE asmDrawStripToScreen(int height, int width, byte const *text, byte const *src, byte *dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
-void ITCM_CODE asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void ITCM_CODE Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette, u32 numLines);
-void ITCM_CODE Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
+void ITCM_CODE asmCopy8Col(byte *dst, int dstPitch, const byte *src, int height);
+void ITCM_CODE Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette, u32 numLines);
+void ITCM_CODE Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStride, int srcStride);
 
 }
 
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp
index 7756286117..5860dea4f2 100644
--- a/backends/platform/ds/arm9/source/cdaudio.cpp
+++ b/backends/platform/ds/arm9/source/cdaudio.cpp
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -71,25 +74,25 @@ struct decoderFormat {
 	unsigned char	sample[1024];
 } __attribute__ ((packed));
 
-bool active = false;
-WaveHeader waveHeader;
-Header blockHeader;
-FILE* file;
-int fillPos;
-bool isPlayingFlag = false;
+static bool s_active = false;
+static WaveHeader waveHeader;
+static Header blockHeader;
+static FILE *s_file;
+static int fillPos;
+static bool isPlayingFlag = false;
 
-s16* audioBuffer;
-u32 sampleNum;
-s16* decompressionBuffer;
-int numLoops;
-int blockCount;
-int dataChunkStart;
-int blocksLeft;
-bool trackStartsAt2 = false;
+static s16 *audioBuffer;
+static u32 sampleNum;
+static s16 *decompressionBuffer;
+static int s_numLoops;
+static int blockCount;
+static int dataChunkStart;
+static int blocksLeft;
+static bool trackStartsAt2 = false;
 
 
 // These are from Microsoft's document on DVI ADPCM
-const int stepTab[ 89 ] = {
+static const int stepTab[ 89 ] = {
 7, 8, 9, 10, 11, 12, 13, 14,
 16, 17, 19, 21, 23, 25, 28, 31,
 34, 37, 41, 45, 50, 55, 60, 66,
@@ -103,7 +106,7 @@ const int stepTab[ 89 ] = {
 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794,
 32767 };
 
-const int indexTab[ 16 ] = { -1, -1, -1, -1, 2, 4, 6, 8,
+static const int indexTab[ 16 ] = { -1, -1, -1, -1, 2, 4, 6, 8,
 -1, -1, -1, -1, 2, 4, 6, 8 };
 
 void playNextBlock();
@@ -115,11 +118,11 @@ void allocBuffers() {
 }
 
 void setActive(bool active) {
-	DS::CD::active = active;
+	s_active = active;
 }
 
 bool getActive() {
-	return active;
+	return s_active;
 }
 
 void playTrack(int track, int numLoops, int startFrame, int duration) {
@@ -145,21 +148,21 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
 
 	sprintf(str, "track%d.wav", track);
 	fname = path + str;
-	file = DS::std_fopen(fname.c_str(), "rb");
+	s_file = DS::std_fopen(fname.c_str(), "rb");
 
-	if (!file) {
+	if (!s_file) {
 		sprintf(str, "track%02d.wav", track);
 		fname = path + str;
-		file = DS::std_fopen(fname.c_str(), "rb");
+		s_file = DS::std_fopen(fname.c_str(), "rb");
 	}
 
-	if (!file) {
+	if (!s_file) {
 		consolePrintf("Failed to open %s!\n", path.c_str());
 		return;
 	}
 
 
-	DS::std_fread((const void *) &waveHeader, sizeof(waveHeader), 1, file);
+	DS::std_fread(&waveHeader, sizeof(waveHeader), 1, s_file);
 
 	consolePrintf("File: %s\n", fname.c_str());
 
@@ -171,7 +174,7 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
 
 	if ((waveHeader.fmtFormatTag != 17) && (waveHeader.fmtFormatTag != 20)) {
 		consolePrintf("Wave file is in the wrong format!  You must use IMA-ADPCM 4-bit mono.\n");
-		DS::std_fclose(file);
+		DS::std_fclose(s_file);
 		return;
 	}
 
@@ -183,14 +186,14 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
 
 	// Skip chunks until we reach the data chunk
 	chunkHeader chunk;
-	DS::std_fread((const void *) &chunk, sizeof(chunkHeader), 1, file);
+	DS::std_fread(&chunk, sizeof(chunkHeader), 1, s_file);
 
 	while (!((chunk.name[0] == 'd') && (chunk.name[1] == 'a') && (chunk.name[2] == 't') && (chunk.name[3] == 'a'))) {
-		DS::std_fseek(file, chunk.size, SEEK_CUR);
-		DS::std_fread((const void *) &chunk, sizeof(chunkHeader), 1, file);
+		DS::std_fseek(s_file, chunk.size, SEEK_CUR);
+		DS::std_fread(&chunk, sizeof(chunkHeader), 1, s_file);
 	}
 
-	dataChunkStart = DS::std_ftell(file);
+	dataChunkStart = DS::std_ftell(s_file);
 
 
 	static bool started = false;
@@ -234,14 +237,14 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
 
 	// No need to seek if we're starting from the beginning
 	if (block != 0) {
-		DS::std_fseek(file, dataChunkStart + block * waveHeader.fmtBlockAlign, SEEK_SET);
+		DS::std_fseek(s_file, dataChunkStart + block * waveHeader.fmtBlockAlign, SEEK_SET);
 //		consolePrintf("Startframe: %d  msec: %d (%d,%d)\n", startFrame, tenthssec, samples, block);
 	}
 
 
 	//decompressBlock();
 	playNextBlock();
-	DS::CD::numLoops = numLoops;
+	s_numLoops = numLoops;
 }
 
 void update() {
@@ -263,20 +266,20 @@ void decompressBlock() {
 
 
 	do {
-		DS::std_fread((const void *) &blockHeader, sizeof(blockHeader), 1, file);
+		DS::std_fread(&blockHeader, sizeof(blockHeader), 1, s_file);
 
-		DS::std_fread(&block[0], waveHeader.fmtBlockAlign - sizeof(blockHeader), 1, file);
+		DS::std_fread(&block[0], waveHeader.fmtBlockAlign - sizeof(blockHeader), 1, s_file);
 
-		if (DS::std_feof(file) ) {
+		if (DS::std_feof(s_file)) {
 			// Reached end of file, so loop
 
 
-			if ((numLoops == -1) || (numLoops > 1)) {
+			if ((s_numLoops == -1) || (s_numLoops > 1)) {
 				// Seek file to first packet
-				if (numLoops != -1) {
-					numLoops--;
+				if (s_numLoops != -1) {
+					s_numLoops--;
 				}
-				DS::std_fseek(file, dataChunkStart, SEEK_SET);
+				DS::std_fseek(s_file, dataChunkStart, SEEK_SET);
 				loop = true;
 			} else {
 				// Fill decompression buffer with zeros to prevent glitching
@@ -325,45 +328,30 @@ void decompressBlock() {
 		int offset = 0;
 
 		switch (7 - (r & 0x0007)) {
-			case 0: {
-				offset = (word & 0xF0000000) >> 28;
-				break;
-			}
-
-			case 1: {
-				offset = (word & 0x0F000000) >> 24;
-				break;
-			}
-
-			case 2: {
-				offset = (word & 0x00F00000) >> 20;
-				break;
-			}
-
-			case 3: {
-				offset = (word & 0x000F0000) >> 16;
-				break;
-			}
-
-			case 4: {
-				offset = (word & 0x0000F000) >> 12;
-				break;
-			}
-
-			case 5: {
-				offset = (word & 0x00000F00) >> 8;
-				break;
-			}
-
-			case 6: {
-				offset = (word & 0x000000F0) >> 4;
-				break;
-			}
-
-			case 7: {
-				offset = (word & 0x0000000F);
-				break;
-			}
+		case 0:
+			offset = (word & 0xF0000000) >> 28;
+			break;
+		case 1:
+			offset = (word & 0x0F000000) >> 24;
+			break;
+		case 2:
+			offset = (word & 0x00F00000) >> 20;
+			break;
+		case 3:
+			offset = (word & 0x000F0000) >> 16;
+			break;
+		case 4:
+			offset = (word & 0x0000F000) >> 12;
+			break;
+		case 5:
+			offset = (word & 0x00000F00) >> 8;
+			break;
+		case 6:
+			offset = (word & 0x000000F0) >> 4;
+			break;
+		case 7:
+			offset = (word & 0x0000000F);
+			break;
 		}
 
 		int diff = 0;
@@ -406,7 +394,8 @@ void decompressBlock() {
 }
 
 void playNextBlock() {
-	if (!isPlayingFlag) return;
+	if (!isPlayingFlag)
+		return;
 	int lastBlockId = -1;
 
 	while (IPC->adpcm.semaphore);		// Wait for buffer to become free if needed
@@ -442,9 +431,6 @@ void playNextBlock() {
 //			DC_FlushAll();
 
 		}
-
-
-
 	}
 
 
@@ -460,9 +446,10 @@ void playNextBlock() {
 }
 
 void stopTrack() {
-	if (!isPlayingFlag) return;
+	if (!isPlayingFlag)
+		return;
 
-	DS::std_fclose(file);
+	DS::std_fclose(s_file);
 
 	isPlayingFlag = false;
 
@@ -470,7 +457,7 @@ void stopTrack() {
 		audioBuffer[r] = 0;
 	}
 
-	for (int r= 0; r < waveHeader.fmtExtra; r++) {
+	for (int r = 0; r < waveHeader.fmtExtra; r++) {
 		decompressionBuffer[r] = 0;
 	}
 //	DS::stopSound(1);
@@ -495,8 +482,8 @@ bool trackExists(int num) {
 	}
 	consolePrintf("Looking for %s...", path.c_str());
 
-	FILE* file;
-	if ((file = DS::std_fopen(path.c_str(), "r"))) {
+	FILE *file = DS::std_fopen(path.c_str(), "r");
+	if (file) {
 		consolePrintf("Success!\n");
 		setActive(true);
 		DS::std_fclose(file);
@@ -548,4 +535,4 @@ bool isPlaying() {
 }
 
 }
-}
+}	// End of namespace DS
diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h
index aac303dd5e..6e53ef7bd2 100644
--- a/backends/platform/ds/arm9/source/cdaudio.h
+++ b/backends/platform/ds/arm9/source/cdaudio.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -35,6 +38,6 @@ bool isPlaying();
 void update();
 
 }
-}
+}	// End of namespace DS
 
 #endif
diff --git a/backends/platform/ds/arm9/source/compressor/lz.cpp b/backends/platform/ds/arm9/source/compressor/lz.cpp
deleted file mode 100644
index 47a36646c6..0000000000
--- a/backends/platform/ds/arm9/source/compressor/lz.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/*************************************************************************
-* Name:        lz.c
-* Author:      Marcus Geelnard
-* Description: LZ77 coder/decoder implementation.
-* Reentrant:   Yes
-* $Id$
-*
-* The LZ77 compression scheme is a substitutional compression scheme
-* proposed by Abraham Lempel and Jakob Ziv in 1977. It is very simple in
-* its design, and uses no fancy bit level compression.
-*
-* This is my first attempt at an implementation of a LZ77 code/decoder.
-*
-* The principle of the LZ77 compression algorithm is to store repeated
-* occurrences of strings as references to previous occurrences of the same
-* string. The point is that the reference consumes less space than the
-* string itself, provided that the string is long enough (in this
-* implementation, the string has to be at least 4 bytes long, since the
-* minimum coded reference is 3 bytes long). Also note that the term
-* "string" refers to any kind of byte sequence (it does not have to be
-* an ASCII string, for instance).
-*
-* The coder uses a brute force approach to finding string matches in the
-* history buffer (or "sliding window", if you wish), which is very, very
-* slow. I recon the complexity is somewhere between O(n^2) and O(n^3),
-* depending on the input data.
-*
-* There is also a faster implementation that uses a large working buffer
-* in which a "jump table" is stored, which is used to quickly find
-* possible string matches (see the source code for LZ_CompressFast() for
-* more information). The faster method is an order of magnitude faster,
-* and also does a full string search in the entire input buffer (it does
-* not use a sliding window).
-*
-* The upside is that decompression is very fast, and the compression ratio
-* is often very good.
-*
-* The reference to a string is coded as a (length,offset) pair, where the
-* length indicates the length of the string, and the offset gives the
-* offset from the current data position. To distinguish between string
-* references and literal strings (uncompressed bytes), a string reference
-* is preceded by a marker byte, which is chosen as the least common byte
-* symbol in the input data stream (this marker byte is stored in the
-* output stream as the first byte).
-*
-* Occurrences of the marker byte in the stream are encoded as the marker
-* byte followed by a zero byte, which means that occurrences of the marker
-* byte have to be coded with two bytes.
-*
-* The lengths and offsets are coded in a variable length fashion, allowing
-* values of any magnitude (up to 4294967295 in this implementation).
-*
-* With this compression scheme, the worst case compression result is
-* (257/256)*insize + 1.
-*
-*-------------------------------------------------------------------------
-* Copyright (c) 2003-2004 Marcus Geelnard
-*
-* This software is provided 'as-is', without any express or implied
-* warranty. In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would
-*    be appreciated but is not required.
-*
-* 2. Altered source versions must be plainly marked as such, and must not
-*    be misrepresented as being the original software.
-*
-* 3. This notice may not be removed or altered from any source
-*    distribution.
-*
-* Marcus Geelnard
-* marcus.geelnard at home.se
-*************************************************************************/
-
-
-/*************************************************************************
-* Constants used for LZ77 coding
-*************************************************************************/
-
-/* Maximum offset (can be any size < 2^32). Lower values gives faster
-   compression, while higher values gives better compression.
-   NOTE: LZ_CompressFast does not use this constant. */
-#define LZ_MAX_OFFSET 512
-
-
-
-/*************************************************************************
-*                           INTERNAL FUNCTIONS                           *
-*************************************************************************/
-
-
-/*************************************************************************
-* _LZ_StringCompare() - Return maximum length string match.
-*************************************************************************/
-
-inline static unsigned int _LZ_StringCompare( unsigned char * str1,
-  unsigned char * str2, unsigned int minlen, unsigned int maxlen )
-{
-    unsigned int len;
-
-    for ( len = minlen; (len < maxlen) && (str1[len] == str2[len]); ++ len );
-
-    return len;
-}
-
-
-/*************************************************************************
-* _LZ_WriteVarSize() - Write unsigned integer with variable number of
-* bytes depending on value.
-*************************************************************************/
-
-inline static int _LZ_WriteVarSize( unsigned int x, unsigned char * buf )
-{
-    unsigned int y;
-    int num_bytes, i, b;
-
-    /* Determine number of bytes needed to store the number x */
-    y = x >> 3;
-    for ( num_bytes = 5; num_bytes >= 2; -- num_bytes )
-    {
-        if ( y & 0xfe000000 ) break;
-        y <<= 7;
-    }
-
-    /* Write all bytes, seven bits in each, with 8:th bit set for all */
-    /* but the last byte. */
-    for ( i = num_bytes-1; i >= 0; -- i )
-    {
-        b = (x >> (i*7)) & 0x0000007f;
-        if ( i > 0 )
-        {
-            b |= 0x00000080;
-        }
-        *buf ++ = (unsigned char) b;
-    }
-
-    /* Return number of bytes written */
-    return num_bytes;
-}
-
-
-/*************************************************************************
-* _LZ_ReadVarSize() - Read unsigned integer with variable number of
-* bytes depending on value.
-*************************************************************************/
-
-inline static int _LZ_ReadVarSize( unsigned int * x, unsigned char * buf )
-{
-    unsigned int y, b, num_bytes;
-
-    /* Read complete value (stop when byte contains zero in 8:th bit) */
-    y = 0;
-    num_bytes = 0;
-    do
-    {
-        b = (unsigned int) (*buf ++);
-        y = (y << 7) | (b & 0x0000007f);
-        ++ num_bytes;
-    }
-    while ( b & 0x00000080 );
-
-    /* Store value in x */
-    *x = y;
-
-    /* Return number of bytes read */
-    return num_bytes;
-}
-
-
-
-/*************************************************************************
-*                            PUBLIC FUNCTIONS                            *
-*************************************************************************/
-
-
-/*************************************************************************
-* LZ_Compress() - Compress a block of data using an LZ77 coder.
-*  in     - Input (uncompressed) buffer.
-*  out    - Output (compressed) buffer. This buffer must be 0.4% larger
-*           than the input buffer, plus one byte.
-*  insize - Number of input bytes.
-* The function returns the size of the compressed data.
-*************************************************************************/
-
-int LZ_Compress( unsigned char *in, unsigned char *out,
-    unsigned int insize )
-{
-    unsigned char marker, symbol;
-    unsigned int  inpos, outpos, bytesleft, i;
-    unsigned int  maxoffset, offset, bestoffset;
-    unsigned int  maxlength, length, bestlength;
-    unsigned int  histogram[ 256 ];
-    unsigned char *ptr1, *ptr2;
-
-    /* Do we have anything to compress? */
-    if ( insize < 1 )
-    {
-        return 0;
-    }
-
-    /* Create histogram */
-    for ( i = 0; i < 256; ++ i )
-    {
-        histogram[ i ] = 0;
-    }
-    for ( i = 0; i < insize; ++ i )
-    {
-        ++ histogram[ in[ i ] ];
-    }
-
-    /* Find the least common byte, and use it as the code marker */
-    marker = 0;
-    for ( i = 1; i < 256; ++ i )
-    {
-        if ( histogram[ i ] < histogram[ marker ] )
-        {
-            marker = i;
-        }
-    }
-
-    /* Remember the repetition marker for the decoder */
-    out[ 0 ] = marker;
-
-    /* Start of compression */
-    inpos = 0;
-    outpos = 1;
-
-    /* Main compression loop */
-    bytesleft = insize;
-    do
-    {
-        /* Determine most distant position */
-        if ( inpos > LZ_MAX_OFFSET ) maxoffset = LZ_MAX_OFFSET;
-        else                        maxoffset = inpos;
-
-        /* Get pointer to current position */
-        ptr1 = &in[ inpos ];
-
-        /* Search history window for maximum length string match */
-        bestlength = 3;
-        bestoffset = 0;
-        for ( offset = 3; offset <= maxoffset; ++ offset )
-        {
-            /* Get pointer to candidate string */
-            ptr2 = &ptr1[ -offset ];
-
-            /* Quickly determine if this is a candidate (for speed) */
-            if ( (ptr1[ 0 ] == ptr2[ 0 ]) &&
-                (ptr1[ bestlength ] == ptr2[ bestlength ]) )
-            {
-                /* Determine maximum length for this offset */
-                maxlength = (bytesleft < offset ? bytesleft : offset);
-
-                /* Count maximum length match at this offset */
-                length = _LZ_StringCompare( ptr1, ptr2, 0, maxlength );
-
-                /* Better match than any previous match? */
-                if ( length > bestlength )
-                {
-                    bestlength = length;
-                    bestoffset = offset;
-                }
-            }
-        }
-
-        /* Was there a good enough match? */
-        if ( (bestlength >= 8) ||
-            ((bestlength == 4) && (bestoffset <= 0x0000007f)) ||
-            ((bestlength == 5) && (bestoffset <= 0x00003fff)) ||
-            ((bestlength == 6) && (bestoffset <= 0x001fffff)) ||
-            ((bestlength == 7) && (bestoffset <= 0x0fffffff)) )
-        {
-            out[ outpos ++ ] = (unsigned char) marker;
-            outpos += _LZ_WriteVarSize( bestlength, &out[ outpos ] );
-            outpos += _LZ_WriteVarSize( bestoffset, &out[ outpos ] );
-            inpos += bestlength;
-            bytesleft -= bestlength;
-        }
-        else
-        {
-            /* Output single byte (or two bytes if marker byte) */
-            symbol = in[ inpos ++ ];
-            out[ outpos ++ ] = symbol;
-            if ( symbol == marker )
-            {
-                out[ outpos ++ ] = 0;
-            }
-            -- bytesleft;
-        }
-    }
-    while ( bytesleft > 3 );
-
-    /* Dump remaining bytes, if any */
-    while ( inpos < insize )
-    {
-        if ( in[ inpos ] == marker )
-        {
-            out[ outpos ++ ] = marker;
-            out[ outpos ++ ] = 0;
-        }
-        else
-        {
-            out[ outpos ++ ] = in[ inpos ];
-        }
-        ++ inpos;
-    }
-
-    return outpos;
-}
-
-
-/*************************************************************************
-* LZ_CompressFast() - Compress a block of data using an LZ77 coder.
-*  in     - Input (uncompressed) buffer.
-*  out    - Output (compressed) buffer. This buffer must be 0.4% larger
-*           than the input buffer, plus one byte.
-*  insize - Number of input bytes.
-*  work   - Pointer to a temporary buffer (internal working buffer), which
-*           must be able to hold (insize+65536) unsigned integers.
-* The function returns the size of the compressed data.
-*************************************************************************/
-
-int LZ_CompressFast( unsigned char *in, unsigned char *out,
-    unsigned int insize, unsigned int *work )
-{
-    unsigned char marker, symbol;
-    unsigned int  inpos, outpos, bytesleft, i, index, symbols;
-    unsigned int  offset, bestoffset;
-    unsigned int  maxlength, length, bestlength;
-    unsigned int  histogram[ 256 ], *lastindex, *jumptable;
-    unsigned char *ptr1, *ptr2;
-
-    /* Do we have anything to compress? */
-    if ( insize < 1 )
-    {
-        return 0;
-    }
-
-    /* Assign arrays to the working area */
-    lastindex = work;
-    jumptable = &work[ 65536 ];
-
-    /* Build a "jump table". Here is how the jump table works:
-       jumptable[i] points to the nearest previous occurrence of the same
-       symbol pair as in[i]:in[i+1], so in[i] == in[jumptable[i]] and
-       in[i+1] == in[jumptable[i]+1]. Following the jump table gives a
-       dramatic boost for the string search'n'match loop compared to doing
-       a brute force search. */
-    for ( i = 0; i < 65536; ++ i )
-    {
-        lastindex[ i ] = 0xffffffff;
-    }
-    for ( i = 0; i < insize-1; ++ i )
-    {
-        symbols = (((unsigned int)in[i]) << 8) | ((unsigned int)in[i+1]);
-        index = lastindex[ symbols ];
-        lastindex[ symbols ] = i;
-        jumptable[ i ] = index;
-    }
-    jumptable[ insize-1 ] = 0xffffffff;
-
-    /* Create histogram */
-    for ( i = 0; i < 256; ++ i )
-    {
-        histogram[ i ] = 0;
-    }
-    for ( i = 0; i < insize; ++ i )
-    {
-        ++ histogram[ in[ i ] ];
-    }
-
-    /* Find the least common byte, and use it as the code marker */
-    marker = 0;
-    for ( i = 1; i < 256; ++ i )
-    {
-        if ( histogram[ i ] < histogram[ marker ] )
-        {
-            marker = i;
-        }
-    }
-
-    /* Remember the repetition marker for the decoder */
-    out[ 0 ] = marker;
-
-    /* Start of compression */
-    inpos = 0;
-    outpos = 1;
-
-    /* Main compression loop */
-    bytesleft = insize;
-    do
-    {
-        /* Get pointer to current position */
-        ptr1 = &in[ inpos ];
-
-        /* Search history window for maximum length string match */
-        bestlength = 3;
-        bestoffset = 0;
-        index = jumptable[ inpos ];
-        while ( index != 0xffffffff )
-        {
-            /* Get pointer to candidate string */
-            ptr2 = &in[ index ];
-
-            /* Quickly determine if this is a candidate (for speed) */
-            if ( ptr2[ bestlength ] == ptr1[ bestlength ] )
-            {
-                /* Determine maximum length for this offset */
-                offset = inpos - index;
-                maxlength = (bytesleft < offset ? bytesleft : offset);
-
-                /* Count maximum length match at this offset */
-                length = _LZ_StringCompare( ptr1, ptr2, 2, maxlength );
-
-                /* Better match than any previous match? */
-                if ( length > bestlength )
-                {
-                    bestlength = length;
-                    bestoffset = offset;
-                }
-            }
-
-            /* Get next possible index from jump table */
-            index = jumptable[ index ];
-        }
-
-        /* Was there a good enough match? */
-        if ( (bestlength >= 8) ||
-            ((bestlength == 4) && (bestoffset <= 0x0000007f)) ||
-            ((bestlength == 5) && (bestoffset <= 0x00003fff)) ||
-            ((bestlength == 6) && (bestoffset <= 0x001fffff)) ||
-            ((bestlength == 7) && (bestoffset <= 0x0fffffff)) )
-        {
-            out[ outpos ++ ] = (unsigned char) marker;
-            outpos += _LZ_WriteVarSize( bestlength, &out[ outpos ] );
-            outpos += _LZ_WriteVarSize( bestoffset, &out[ outpos ] );
-            inpos += bestlength;
-            bytesleft -= bestlength;
-        }
-        else
-        {
-            /* Output single byte (or two bytes if marker byte) */
-            symbol = in[ inpos ++ ];
-            out[ outpos ++ ] = symbol;
-            if ( symbol == marker )
-            {
-                out[ outpos ++ ] = 0;
-            }
-            -- bytesleft;
-        }
-    }
-    while ( bytesleft > 3 );
-
-    /* Dump remaining bytes, if any */
-    while ( inpos < insize )
-    {
-        if ( in[ inpos ] == marker )
-        {
-            out[ outpos ++ ] = marker;
-            out[ outpos ++ ] = 0;
-        }
-        else
-        {
-            out[ outpos ++ ] = in[ inpos ];
-        }
-        ++ inpos;
-    }
-
-    return outpos;
-}
-
-
-/*************************************************************************
-* LZ_Uncompress() - Uncompress a block of data using an LZ77 decoder.
-*  in      - Input (compressed) buffer.
-*  out     - Output (uncompressed) buffer. This buffer must be large
-*            enough to hold the uncompressed data.
-*  insize  - Number of input bytes.
-*************************************************************************/
-
-void LZ_Uncompress( unsigned char *in, unsigned char *out,
-    unsigned int insize )
-{
-    unsigned char marker, symbol;
-    unsigned int  i, inpos, outpos, length, offset;
-
-    /* Do we have anything to compress? */
-    if ( insize < 1 )
-    {
-        return;
-    }
-
-    /* Get marker symbol from input stream */
-    marker = in[ 0 ];
-    inpos = 1;
-
-    /* Main decompression loop */
-    outpos = 0;
-    do
-    {
-        symbol = in[ inpos ++ ];
-        if ( symbol == marker )
-        {
-            /* We had a marker byte */
-            if ( in[ inpos ] == 0 )
-            {
-                /* It was a single occurrence of the marker byte */
-                out[ outpos ++ ] = marker;
-                ++ inpos;
-            }
-            else
-            {
-                /* Extract true length and offset */
-                inpos += _LZ_ReadVarSize( &length, &in[ inpos ] );
-                inpos += _LZ_ReadVarSize( &offset, &in[ inpos ] );
-
-                /* Copy corresponding data from history window */
-                for ( i = 0; i < length; ++ i )
-                {
-                    out[ outpos ] = out[ outpos - offset ];
-                    ++ outpos;
-                }
-            }
-        }
-        else
-        {
-            /* No marker, plain copy */
-            out[ outpos ++ ] = symbol;
-        }
-    }
-    while ( inpos < insize );
-}
diff --git a/backends/platform/ds/arm9/source/compressor/lz.h b/backends/platform/ds/arm9/source/compressor/lz.h
deleted file mode 100644
index e7ea1567ca..0000000000
--- a/backends/platform/ds/arm9/source/compressor/lz.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
-* Name:        lz.h
-* Author:      Marcus Geelnard
-* Description: LZ77 coder/decoder interface.
-* Reentrant:   Yes
-* $Id$
-*-------------------------------------------------------------------------
-* Copyright (c) 2003-2004 Marcus Geelnard
-*
-* This software is provided 'as-is', without any express or implied
-* warranty. In no event will the authors be held liable for any damages
-* arising from the use of this software.
-*
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-*
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would
-*    be appreciated but is not required.
-*
-* 2. Altered source versions must be plainly marked as such, and must not
-*    be misrepresented as being the original software.
-*
-* 3. This notice may not be removed or altered from any source
-*    distribution.
-*
-* Marcus Geelnard
-* marcus.geelnard at home.se
-*************************************************************************/
-
-#ifndef _lz_h_
-#define _lz_h_
-
-
-
-/*************************************************************************
-* Function prototypes
-*************************************************************************/
-
-int LZ_Compress( unsigned char *in, unsigned char *out,
-                 unsigned int insize );
-int LZ_CompressFast( unsigned char *in, unsigned char *out,
-                     unsigned int insize, unsigned int *work );
-void LZ_Uncompress( unsigned char *in, unsigned char *out,
-                    unsigned int insize );
-
-
-#endif /* _lz_h_ */
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index ee9e4d7622..4c7d6b89ae 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -73,8 +73,6 @@
 
 
 
-//#define USE_LIBCARTRESET
-
 #include <nds.h>
 #include <nds/registers_alt.h>
 #include <nds/arm9/exceptions.h>
@@ -100,20 +98,15 @@
 #ifdef USE_DEBUGGER
 #include "user_debugger.h"
 #endif
-#include "ramsave.h"
 #include "blitters.h"
-#include "libcartreset/cartreset_nolibfat.h"
 #include "keys.h"
 #ifdef USE_PROFILER
 #include "profiler/cyg-profile.h"
 #endif
-#include "base/version.h"
 #include "engine.h"
 
-
-#include "backends/plugins/elf-provider.h"
 #include "backends/plugins/ds/ds-provider.h"
-
+#include "backends/plugins/elf-provider.h"
 #include "backends/fs/ds/ds-fs.h"
 #include "base/version.h"
 #include "common/util.h"
@@ -388,6 +381,9 @@ void uploadSpriteGfx();
 
 static TransferSound soundControl;
 
+static bool isScrollingWithDPad() {
+	return (getKeysHeld() & (KEY_L | KEY_R)) != 0;
+}
 
 bool isCpuScalerEnabled() {
 	return cpuScalerEnable || !displayModeIs8Bit;
@@ -1344,7 +1340,7 @@ void doScreenTapMode(OSystem_DS *system) {
 		right = true;
 	}
 
-	if (!(getKeysHeld() & (KEY_L | KEY_R))) {
+	if (!isScrollingWithDPad()) {
 
 		if (getKeysDown() & KEY_LEFT) {
 			event.type = Common::EVENT_LBUTTONDOWN;
@@ -1381,7 +1377,7 @@ void doButtonSelectMode(OSystem_DS *system) {
 	Common::Event event;
 
 
-	if ((!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R))) {
+	if (!isScrollingWithDPad()) {
 		event.type = Common::EVENT_MOUSEMOVE;
 		event.mouse = Common::Point(getPenX(), getPenY());
 		system->addEvent(event);
@@ -1404,7 +1400,7 @@ void doButtonSelectMode(OSystem_DS *system) {
 
 
 	if ((mouseMode != MOUSE_HOVER) || (!displayModeIs8Bit)) {
-		if (getPenDown() && (!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R))) {
+		if (getPenDown() && !isScrollingWithDPad()) {
 			if (mouseMode == MOUSE_LEFT) {
 				event.type = Common::EVENT_LBUTTONDOWN;
 				leftButtonDown = true;
@@ -1446,7 +1442,7 @@ void doButtonSelectMode(OSystem_DS *system) {
 		}
 	}
 
-	if (!((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (!getIndyFightState()) && (!getKeyboardEnable())) {
+	if (!isScrollingWithDPad() && !getIndyFightState() && !getKeyboardEnable()) {
 
 		if (!getPenHeld() || (mouseMode != MOUSE_HOVER)) {
 			if (getKeysDown() & KEY_LEFT) {
@@ -1542,7 +1538,7 @@ void addEventsToQueue() {
 
 			if (!indyFightState) {
 
-				if ((!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_B)) {
+				if (!isScrollingWithDPad() && (getKeysDown() & KEY_B)) {
 					if (s_currentGame->control == CONT_AGI) {
 						event.kbd.keycode = Common::KEYCODE_RETURN;
 						event.kbd.ascii = 13;
@@ -1614,7 +1610,7 @@ void addEventsToQueue() {
 
 			}
 
-			if (!((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (!getIndyFightState()) && (!getKeyboardEnable())) {
+			if (!isScrollingWithDPad() && !getIndyFightState() && !getKeyboardEnable()) {
 
 				if ((getKeysDown() & KEY_A) && (!indyFightState)) {
 					gameScreenSwap = !gameScreenSwap;
@@ -1653,7 +1649,7 @@ void addEventsToQueue() {
 			}
 		}
 
-		if (!getIndyFightState() && !((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_X)) {
+		if (!getIndyFightState() && !isScrollingWithDPad() && (getKeysDown() & KEY_X)) {
 			setKeyboardEnable(!keyboardEnable);
 		}
 
@@ -1675,7 +1671,7 @@ void addEventsToQueue() {
 
 		if (!keyboardEnable) {
 
-			if (((!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R)) || (indyFightState)) && (displayModeIs8Bit)) {
+			if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
 				// Controls specific to the control method
 
 				if (s_currentGame->control == CONT_SKY) {
@@ -2017,7 +2013,7 @@ void VBlankHandler(void) {
 	soundUpdate();
 
 
-	if ((!gameScreenSwap) && (!(getKeysHeld() & KEY_L) && !(getKeysHeld() & KEY_R))) {
+	if ((!gameScreenSwap) && !isScrollingWithDPad()) {
 		if (s_currentGame) {
 			if (s_currentGame->control != CONT_SCUMM_SAMNMAX) {
 				if (getPenHeld() && (getPenY() < SCUMM_GAME_HEIGHT)) {
@@ -2059,7 +2055,7 @@ void VBlankHandler(void) {
 		callbackTimer -= FRAME_TIME;
 	}
 
-	if ((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) {
+	if (isScrollingWithDPad()) {
 
 		if ((!dragging) && (getPenHeld()) && (penDownFrames > 5)) {
 			dragging = true;
@@ -2113,7 +2109,7 @@ void VBlankHandler(void) {
 
 	bool zooming = false;
 
-	if ((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) {
+	if (isScrollingWithDPad()) {
 		if ((getKeysHeld() & KEY_A) && (subScreenScale < ratio)) {
 			subScreenScale += 1;
 			zooming = true;
@@ -2190,7 +2186,7 @@ void VBlankHandler(void) {
 
 	if (displayModeIs8Bit) {
 
-		if ((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) {
+		if (isScrollingWithDPad()) {
 
 			int offsX = 0, offsY = 0;
 
@@ -2777,31 +2773,6 @@ GLvector getPenPos() {
 	return v;
 }
 
-#ifdef GBA_SRAM_SAVE
-
-void formatSramOption() {
-	consolePrintf("The following files are present in save RAM:\n");
-	DSSaveFileManager::instance()->listFiles();
-
-	consolePrintf("\nAre you sure you want to\n");
-	consolePrintf("DELETE all files?\n");
-	consolePrintf("A = Yes, X = No\n");
-
-	while (true) {
-		if (keysHeld() & KEY_A) {
-			DSSaveFileManager::instance()->formatSram();
-			consolePrintf("SRAM cleared!\n");
-			return;
-		}
-
-		if (keysHeld() & KEY_X) {
-			consolePrintf("Whew, that was close!\n");
-			return;
-		}
-	}
-}
-#endif
-
 void setIndyFightState(bool st) {
 	indyFightState = st;
 	indyFightRight = true;
@@ -2886,61 +2857,6 @@ void debug_print_stub(char *string) {
 }
 #endif
 
-#ifdef USE_LIBCARTRESET
-
-struct cardTranslate {
-	int cartResetId;
-	int svmId;
-	char dldiId[5];
-};
-
-cardTranslate cardReaderTable[] = {
-	{DEVICE_TYPE_M3SD,		DEVICE_M3SD,	"M3SD"},
-	{DEVICE_TYPE_M3CF,		DEVICE_M3CF,	"M3CF"},
-	{DEVICE_TYPE_MPCF,		DEVICE_MPCF,	"MPCF"},
-	{DEVICE_TYPE_SCCF,		DEVICE_SCCF,	"SCCF"},
-	{DEVICE_TYPE_SCSD,		DEVICE_SCSD,	"SCSD"},
-	{DEVICE_TYPE_SCSD,		DEVICE_SCSD,	"SCLT"},
-	{DEVICE_TYPE_NMMC,		DEVICE_NMMC,	"NMMC"},
-};
-
-void reboot() {
-	int deviceType = -1;
-
-
-	if (disc_getDeviceId() == DEVICE_DLDI) {
-
-		char id[6];
-		disc_getDldiId(id);
-
-		consolePrintf("DLDI Device ID: %s\n", id);
-
-		for (int r = 0; r < ARRAYSIZE(cardReaderTable); r++) {
-			if (!stricmp(id, cardReaderTable[r].dldiId)) {
-				deviceType = cardReaderTable[r].cartResetId;
-			}
-		}
-	} else {
-		for (int r = 0; r < ARRAYSIZE(cardReaderTable); r++) {
-			if (disc_getDeviceId() == cardReaderTable[r].svmId) {
-				deviceType = cardReaderTable[r].cartResetId;
-			}
-		}
-	}
-
-
-	consolePrintf("Device number: %x\n", deviceType);
-
-	if (deviceType == -1) {
-		IPC->reset = true;				// Send message to ARM7 to turn power off
-	} else {
-		cartSetMenuMode(deviceType);
-		passmeloopEnter();
-	}
-
-	while (true);		// Stop the program continuing beyond this point
-}
-#endif
 
 void powerOff() {
 	while (keysHeld() != 0) {		// Wait for all keys to be released.
@@ -2955,12 +2871,10 @@ void powerOff() {
 		while (true);
 	} else {
 
-#ifdef USE_LIBCARTRESET
-		reboot();
-#else
 		IPC->reset = true;				// Send message to ARM7 to turn power off
-		while (true);		// Stop the program continuing beyond this point
-#endif
+		while (true) {
+			// Stop the program from continuing beyond this point
+		}
 	}
 }
 
@@ -2981,7 +2895,7 @@ void dsExceptionHandler() {
 
 	int offset = 8;
 
-	if ( currentMode == 0x17 ) {
+	if (currentMode == 0x17) {
 		consolePrintf("\x1b[10Cdata abort!\n\n");
 		codeAddress = exceptionRegisters[15] - offset;
 		if (	(codeAddress > 0x02000000 && codeAddress < 0x02400000) ||
@@ -3004,16 +2918,19 @@ void dsExceptionHandler() {
 
 
 	int i;
-	for ( i=0; i < 8; i++ ) {
+	for (i = 0; i < 8; i++) {
 		consolePrintf("  %s: %08X   %s: %08X\n",
 					registerNames[i], exceptionRegisters[i],
 					registerNames[i+8],exceptionRegisters[i+8]);
 	}
-	while(1);
+
+	while(1)
+		;	// endles loop
+
 	u32 *stack = (u32 *)exceptionRegisters[13];
 
 
-	for ( i=0; i<10; i++ ) {
+	for (i = 0; i < 10; i++) {
 		consolePrintf("%08X %08X %08X\n", stack[i*3], stack[i*3+1], stack[(i*3)+2] );
 	}
 
@@ -3264,12 +3181,6 @@ int main(void) {
 	g_system = new OSystem_DS();
 	assert(g_system);
 
-#ifdef GBA_SRAM_SAVE
-	if ((keysHeld() & KEY_L) && (keysHeld() & KEY_R)) {
-		formatSramOption();
-	}
-#endif
-
 	IPC->adpcm.semaphore = false;
 
 //	printf("'%s'", Common::ConfigManager::kTransientDomain.c_str());
diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h
index beda592ba2..bd627fa620 100644
--- a/backends/platform/ds/arm9/source/dsmain.h
+++ b/backends/platform/ds/arm9/source/dsmain.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -25,7 +28,6 @@
 
 #include <nds.h>
 #include "osystem_ds.h"
-#include "NDS/scummvm_ipc.h"
 
 namespace DS {
 
@@ -38,7 +40,7 @@ enum controlType {
 	CONT_FUTURE_WARS,
 	CONT_AGI,
 	CONT_GOBLINS,
-	CONT_NIPPON,
+	CONT_NIPPON
 };
 
 struct gameListType {
@@ -68,9 +70,6 @@ int 	leftHandedSwap(int keys);
 void	setGameScreenSwap(bool enable);
 void	setSensitivity(int sensitivity);
 
-// Controls options
-void	setControls(char* gameName);
-
 // Video
 void 	displayMode8Bit();											// Switch to 8-bit mode5
 void 	displayMode16Bit();										// Switch to 16-bit mode5
@@ -79,8 +78,8 @@ void 	displayMode16Bit();										// Switch to 16-bit mode5
 void 	displayMode16BitFlipBuffer();
 
 // Get address of current back buffer
-u16* 	get16BitBackBuffer();
-u16* 	get8BitBackBuffer();
+u16 *	get16BitBackBuffer();
+u16 *	get8BitBackBuffer();
 s32 	get8BitBackBufferStride();
 u16*	getScalerBuffer();
 
@@ -99,7 +98,7 @@ void 	doTimerCallback();												// Call callback function if required
 void 	doSoundCallback();
 void 	startSound(int freq, int buffer);	// Start sound hardware
 // Call function if sound buffers need more data
-void 	playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050);		// Start a sound
+void 	playSound(const void *data, u32 length, bool loop, bool adpcm = false, int rate = 22050);		// Start a sound
 void 	stopSound(int channel);
 int		getSoundFrequency();
 
@@ -109,7 +108,7 @@ void 	VBlankHandler();
 
 // Sam and Max Stuff
 void 	setGameID(int id);
-void 	setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
+void 	setCursorIcon(const u8 *icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
 void	setShowCursor(bool enable);
 void	setMouseCursorVisible(bool visible);
 
@@ -155,10 +154,10 @@ void	fastRamReset();
 void*	fastRamAlloc(int size);
 
 void 	exitGame();
-gameListType* getCurrentGame();
 
 
-}
+}	// End of namespace DS
+
 
 
 int cygprofile_getHBlanks();
diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp
index 9937e81e61..6721a4910a 100644
--- a/backends/platform/ds/arm9/source/dsoptions.cpp
+++ b/backends/platform/ds/arm9/source/dsoptions.cpp
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -31,6 +34,8 @@
 #include "touchkeyboard.h"
 #include "gui/PopUpWidget.h"
 
+#include "common/translation.h"
+
 #define ALLOW_CPU_SCALER
 
 namespace DS {
@@ -51,27 +56,27 @@ static int confGetInt(Common::String key, int defaultVal) {
 
 DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
 
-	new GUI::ButtonWidget(this, 10, 170, 72, 16, "Close", GUI::kCloseCmd, 'C');
-	new GUI::ButtonWidget(this, 320 - 10 - 130, 170, 120, 16, "ScummVM Main Menu", 0x40000000, 'M');
+	new GUI::ButtonWidget(this, 10, 170, 72, 16, _("~C~lose"), 0, GUI::kCloseCmd);
+	new GUI::ButtonWidget(this, 320 - 10 - 130, 170, 120, 16, _("ScummVM Main Menu"), 0, 0x40000000, 'M');
 
 	_tab = new GUI::TabWidget(this, 10, 5, 300, 230 - 20 - 40 - 20);
 
 	_tab->addTab("Controls");
 
-	_leftHandedCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 130, 20, "Left handed mode", 0, 'L');
-	_indyFightCheckbox = new GUI::CheckboxWidget(_tab, 5, 20, 140, 20, "Indy fight controls", 0, 'I');
-	_showCursorCheckbox = new GUI::CheckboxWidget(_tab, 150, 5, 130, 20, "Show mouse cursor", 0, 'T');
-	_snapToBorderCheckbox = new GUI::CheckboxWidget(_tab, 150, 20, 130, 20, "Snap to edges", 0, 'T');
+	_leftHandedCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 130, 20, _("~L~eft handed mode"));
+	_indyFightCheckbox = new GUI::CheckboxWidget(_tab, 5, 20, 140, 20, _("~I~ndy fight controls"));
+	_showCursorCheckbox = new GUI::CheckboxWidget(_tab, 150, 5, 130, 20, _("Show mouse cursor"), 0, 0, 'T');
+	_snapToBorderCheckbox = new GUI::CheckboxWidget(_tab, 150, 20, 130, 20, _("Snap to edges"), 0, 0, 'T');
 
-	new GUI::StaticTextWidget(_tab, 20, 35, 100, 15, "Touch X Offset", Graphics::kTextAlignLeft);
-	_touchX = new GUI::SliderWidget(_tab, 130, 35, 130, 12, 1);
+	new GUI::StaticTextWidget(_tab, 20, 35, 100, 15, _("Touch X Offset"), Graphics::kTextAlignLeft);
+	_touchX = new GUI::SliderWidget(_tab, 130, 35, 130, 12, "TODO: Add tooltip", 1);
 	_touchX->setMinValue(-8);
 	_touchX->setMaxValue(+8);
 	_touchX->setValue(0);
 	_touchX->setFlags(GUI::WIDGET_CLEARBG);
 
-	new GUI::StaticTextWidget(_tab, 20, 50, 100, 15, "Touch Y Offset", Graphics::kTextAlignLeft);
-	_touchY = new GUI::SliderWidget(_tab, 130, 50, 130, 12, 2);
+	new GUI::StaticTextWidget(_tab, 20, 50, 100, 15, _("Touch Y Offset"), Graphics::kTextAlignLeft);
+	_touchY = new GUI::SliderWidget(_tab, 130, 50, 130, 12, "TODO: Add tooltip", 2);
 	_touchY->setMinValue(-8);
 	_touchY->setMaxValue(+8);
 	_touchY->setValue(0);
@@ -82,11 +87,11 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
 	new GUI::StaticTextWidget(_tab, 130 - 20, 65, 20, 15, "-8", Graphics::kTextAlignCenter);
 
 
-	_touchPadStyle = new GUI::CheckboxWidget(_tab, 5, 80, 270, 20, "Use laptop trackpad-style cursor control", 0x20000001, 'T');
-	_screenTaps = new GUI::CheckboxWidget(_tab, 5, 95, 285, 20, "Tap for left click, double tap right click", 0x20000002, 'T');
+	_touchPadStyle = new GUI::CheckboxWidget(_tab, 5, 80, 270, 20, _("Use laptop trackpad-style cursor control"), 0, 0x20000001, 'T');
+	_screenTaps = new GUI::CheckboxWidget(_tab, 5, 95, 285, 20, _("Tap for left click, double tap right click"), 0, 0x20000002, 'T');
 
-	_sensitivityLabel = new GUI::StaticTextWidget(_tab, 20, 110, 110, 15, "Sensitivity", Graphics::kTextAlignLeft);
-	_sensitivity = new GUI::SliderWidget(_tab, 130, 110, 130, 12, 1);
+	_sensitivityLabel = new GUI::StaticTextWidget(_tab, 20, 110, 110, 15, _("Sensitivity"), Graphics::kTextAlignLeft);
+	_sensitivity = new GUI::SliderWidget(_tab, 130, 110, 130, 12, "TODO: Add tooltip", 1);
 	_sensitivity->setMinValue(4);
 	_sensitivity->setMaxValue(16);
 	_sensitivity->setValue(8);
@@ -94,20 +99,20 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
 
 	_tab->addTab("Graphics");
 
-	new GUI::StaticTextWidget(_tab, 5, 67, 180, 15, "Initial top screen scale:", Graphics::kTextAlignLeft);
+	new GUI::StaticTextWidget(_tab, 5, 67, 180, 15, _("Initial top screen scale:"), Graphics::kTextAlignLeft);
 
-	_100PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 82, 80, 20, "100%", 0x30000001, 'T');
-	_150PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 97, 80, 20, "150%", 0x30000002, 'T');
-	_200PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 112, 80, 20, "200%", 0x30000003, 'T');
+	_100PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 82, 80, 20, "100%", "TODO: Add tooltip", 0x30000001, 'T');
+	_150PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 97, 80, 20, "150%", "TODO: Add tooltip", 0x30000002, 'T');
+	_200PercentCheckbox = new GUI::CheckboxWidget(_tab, 5, 112, 80, 20, "200%", "TODO: Add tooltip", 0x30000003, 'T');
 
-	new GUI::StaticTextWidget(_tab, 5, 5, 180, 15, "Main screen scaling:", Graphics::kTextAlignLeft);
+	new GUI::StaticTextWidget(_tab, 5, 5, 180, 15, _("Main screen scaling:"), Graphics::kTextAlignLeft);
 
-	_hardScaler = new GUI::CheckboxWidget(_tab, 5, 20, 270, 20, "Hardware scale (fast, but low quality)", 0x10000001, 'T');
-	_cpuScaler = new GUI::CheckboxWidget(_tab, 5, 35, 270, 20, "Software scale (good quality, but slower)", 0x10000002, 'S');
-	_unscaledCheckbox = new GUI::CheckboxWidget(_tab, 5, 50, 270, 20, "Unscaled (you must scroll left and right)", 0x10000003, 'S');
+	_hardScaler = new GUI::CheckboxWidget(_tab, 5, 20, 270, 20, _("Hardware scale (fast, but low quality)"), 0, 0x10000001, 'T');
+	_cpuScaler = new GUI::CheckboxWidget(_tab, 5, 35, 270, 20, _("Software scale (good quality, but slower)"), 0, 0x10000002, 'S');
+	_unscaledCheckbox = new GUI::CheckboxWidget(_tab, 5, 50, 270, 20, _("Unscaled (you must scroll left and right)"), 0, 0x10000003, 'S');
 
-	new GUI::StaticTextWidget(_tab, 5, 125, 110, 15, "Brightness:", Graphics::kTextAlignLeft);
-	_gammaCorrection = new GUI::SliderWidget(_tab, 130, 120, 130, 12, 1);
+	new GUI::StaticTextWidget(_tab, 5, 125, 110, 15, _("Brightness:"), Graphics::kTextAlignLeft);
+	_gammaCorrection = new GUI::SliderWidget(_tab, 130, 120, 130, 12, "TODO: Add tooltip", 1);
 	_gammaCorrection->setMinValue(0);
 	_gammaCorrection->setMaxValue(8);
 	_gammaCorrection->setValue(0);
@@ -116,24 +121,18 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
 
 	_tab->addTab("General");
 
-	_highQualityAudioCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 250, 20, "High quality audio (slower) (reboot)", 0, 'T');
-	_disablePowerOff = new GUI::CheckboxWidget(_tab, 5, 20, 200, 20, "Disable power off", 0, 'T');
+	_highQualityAudioCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 250, 20, _("High quality audio (slower) (reboot)"), 0, 0, 'T');
+	_disablePowerOff = new GUI::CheckboxWidget(_tab, 5, 20, 200, 20, _("Disable power off"), 0, 0, 'T');
 
 	_tab->setActiveTab(0);
 
 	_radioButtonMode = false;
 
-#ifdef DS_SCUMM_BUILD
-	if (!DS::isGBAMPAvailable()) {
-//		addButton(this, 100, 140, "Delete Save", 'dels', 'D');
-	}
-#endif
-
 //	new GUI::StaticTextWidget(this, 90, 10, 130, 15, "ScummVM DS Options", Graphics::kTextAlignCenter);
 
 
 //#ifdef ALLOW_CPU_SCALER
-//	_cpuScaler = new GUI::CheckboxWidget(this, 160, 115, 90, 20, "CPU scaler", 0, 'T');
+//	_cpuScaler = new GUI::CheckboxWidget(this, 160, 115, 90, 20, "CPU scaler", 0, 0, 'T');
 //#endif
 
 
@@ -364,7 +363,7 @@ void showOptionsDialog() {
 	DS::displayMode16Bit();
 
 
-	DSOptionsDialog* d = new DSOptionsDialog();
+	DSOptionsDialog *d = new DSOptionsDialog();
 	d->runModal();
 	delete d;
 
@@ -418,7 +417,7 @@ void setOptions() {
 
 		DS::setTrackPadStyleEnable(enable);
 
-		if ((enable) and (firstLoad)) {
+		if (enable && firstLoad) {
 			// If we've just booted up, want to swap screens when trackpad mode is in use
 			// but not every time we enter the options dialog.
 			DS::setGameScreenSwap(true);
@@ -436,4 +435,5 @@ void setOptions() {
 	firstLoad = false;
 }
 
-}
+}	// End of namespace DS
+
diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h
index 4b3ac36d45..1bdc7c1f27 100644
--- a/backends/platform/ds/arm9/source/dsoptions.h
+++ b/backends/platform/ds/arm9/source/dsoptions.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -46,30 +49,30 @@ protected:
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
 	void updateConfigManager();
 
-	GUI::TabWidget* _tab;
+	GUI::TabWidget *_tab;
 
-	GUI::StaticTextWidget* _sensitivityLabel;
+	GUI::StaticTextWidget *_sensitivityLabel;
 
-	GUI::SliderWidget* _touchX;
-	GUI::SliderWidget* _touchY;
-	GUI::SliderWidget* _sensitivity;
-	GUI::SliderWidget* _gammaCorrection;
-	GUI::CheckboxWidget* _leftHandedCheckbox;
-	GUI::CheckboxWidget* _unscaledCheckbox;
-	GUI::CheckboxWidget* _100PercentCheckbox;
-	GUI::CheckboxWidget* _150PercentCheckbox;
-	GUI::CheckboxWidget* _200PercentCheckbox;
-	GUI::CheckboxWidget* _indyFightCheckbox;
-	GUI::CheckboxWidget* _highQualityAudioCheckbox;
-	GUI::CheckboxWidget* _disablePowerOff;
-	GUI::CheckboxWidget* _showCursorCheckbox;
-	GUI::CheckboxWidget* _snapToBorderCheckbox;
+	GUI::SliderWidget *_touchX;
+	GUI::SliderWidget *_touchY;
+	GUI::SliderWidget *_sensitivity;
+	GUI::SliderWidget *_gammaCorrection;
+	GUI::CheckboxWidget *_leftHandedCheckbox;
+	GUI::CheckboxWidget *_unscaledCheckbox;
+	GUI::CheckboxWidget *_100PercentCheckbox;
+	GUI::CheckboxWidget *_150PercentCheckbox;
+	GUI::CheckboxWidget *_200PercentCheckbox;
+	GUI::CheckboxWidget *_indyFightCheckbox;
+	GUI::CheckboxWidget *_highQualityAudioCheckbox;
+	GUI::CheckboxWidget *_disablePowerOff;
+	GUI::CheckboxWidget *_showCursorCheckbox;
+	GUI::CheckboxWidget *_snapToBorderCheckbox;
 
-	GUI::CheckboxWidget* _hardScaler;
-	GUI::CheckboxWidget* _cpuScaler;
+	GUI::CheckboxWidget *_hardScaler;
+	GUI::CheckboxWidget *_cpuScaler;
 
-	GUI::CheckboxWidget* _touchPadStyle;
-	GUI::CheckboxWidget* _screenTaps;
+	GUI::CheckboxWidget *_touchPadStyle;
+	GUI::CheckboxWidget *_screenTaps;
 
 	bool	_radioButtonMode;
 
@@ -78,6 +81,6 @@ protected:
 extern void showOptionsDialog();
 extern void setOptions();
 
-}
+}	// End of namespace DS
 
 #endif
diff --git a/backends/platform/ds/arm9/source/elf32.h b/backends/platform/ds/arm9/source/elf32.h
deleted file mode 100644
index d72b71664d..0000000000
--- a/backends/platform/ds/arm9/source/elf32.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_ELF_H
-#define BACKENDS_ELF_H
-
-/* ELF stuff */
-
-typedef unsigned short Elf32_Half, Elf32_Section;
-typedef unsigned int Elf32_Word, Elf32_Addr, Elf32_Off;
-typedef signed int  Elf32_Sword;
-typedef Elf32_Half Elf32_Versym;
-
-#define EI_NIDENT (16)
-#define SELFMAG         6
-
-/* ELF File format structures. Look up ELF structure for more details */
-
-// ELF header (contains info about the file)
-typedef struct {
-	unsigned char e_ident[EI_NIDENT];     /* Magic number and other info */
-	Elf32_Half    e_type;                 /* Object file type */
-	Elf32_Half    e_machine;              /* Architecture */
-	Elf32_Word    e_version;              /* Object file version */
-	Elf32_Addr    e_entry;                /* Entry point virtual address */
-	Elf32_Off     e_phoff;                /* Program header table file offset */
-	Elf32_Off     e_shoff;                /* Section header table file offset */
-	Elf32_Word    e_flags;                /* Processor-specific flags */
-	Elf32_Half    e_ehsize;               /* ELF header size in bytes */
-	Elf32_Half    e_phentsize;            /* Program header table entry size */
-	Elf32_Half    e_phnum;                /* Program header table entry count */
-	Elf32_Half    e_shentsize;            /* Section header table entry size */
-	Elf32_Half    e_shnum;                /* Section header table entry count */
-	Elf32_Half    e_shstrndx;             /* Section header string table index */
-} Elf32_Ehdr;
-
-// Should be in e_ident
-#define ELFMAG          "\177ELF\1\1"	/* ELF Magic number */
-
-// e_type values
-#define ET_NONE		0	/* no file type */
-#define ET_REL		1	/* relocatable */
-#define ET_EXEC		2	/* executable */
-#define ET_DYN		3	/* shared object */
-#define ET_CORE		4	/* core file */
-
-// e_machine values
-#define EM_ARM		40
-
-// Program header (contains info about segment)
-typedef struct {
-	Elf32_Word    p_type;                 /* Segment type */
-	Elf32_Off     p_offset;               /* Segment file offset */
-	Elf32_Addr    p_vaddr;                /* Segment virtual address */
-	Elf32_Addr    p_paddr;                /* Segment physical address */
-	Elf32_Word    p_filesz;               /* Segment size in file */
-	Elf32_Word    p_memsz;                /* Segment size in memory */
-	Elf32_Word    p_flags;                /* Segment flags */
-	Elf32_Word    p_align;                /* Segment alignment */
-} Elf32_Phdr;
-
-// p_type values
-#define PT_NULL 		0	/* ignored */
-#define PT_LOAD			1	/* loadable segment */
-#define PT_DYNAMIC		2	/* dynamic linking info */
-#define PT_INTERP		3	/* info about interpreter */
-#define PT_NOTE			4	/* note segment */
-#define PT_SHLIB		5	/* reserved */
-#define PT_PHDR			6	/* Program header table */
-#define PT_ARM_ARCHEXT 	0x70000000 /* Platform architecture compatibility information */
-#define PT_ARM_EXIDX 	0x70000001 /* Exception unwind tables */
-
-// p_flags value
-#define PF_X	1	/* execute */
-#define PF_W	2	/* write */
-#define PF_R	4	/* read */
-
-// Section header (contains info about section)
-typedef struct {
-	Elf32_Word    sh_name;                /* Section name (string tbl index) */
-	Elf32_Word    sh_type;                /* Section type */
-	Elf32_Word    sh_flags;               /* Section flags */
-	Elf32_Addr    sh_addr;                /* Section virtual addr at execution */
-	Elf32_Off     sh_offset;              /* Section file offset */
-	Elf32_Word    sh_size;                /* Section size in bytes */
-	Elf32_Word    sh_link;                /* Link to another section */
-	Elf32_Word    sh_info;                /* Additional section information */
-	Elf32_Word    sh_addralign;           /* Section alignment */
-	Elf32_Word    sh_entsize;             /* Entry size if section holds table */
-} Elf32_Shdr;
-
-// sh_type values
-#define SHT_NULL			0	/* Inactive section */
-#define SHT_PROGBITS        1	/* Proprietary */
-#define SHT_SYMTAB			2	/* Symbol table */
-#define SHT_STRTAB			3	/* String table */
-#define SHT_RELA			4	/* Relocation entries with addend */
-#define SHT_HASH			5	/* Symbol hash table */
-#define SHT_DYNAMIC			6	/* Info for dynamic linking */
-#define SHT_NOTE			7	/* Note section */
-#define SHT_NOBITS			8	/* Occupies no space */
-#define SHT_REL				9	/* Relocation entries without addend */
-#define SHT_SHLIB			10	/* Reserved */
-#define SHT_DYNSYM			11	/* Minimal set of dynamic linking symbols */
-#define SHT_ARM_EXIDX 		0x70000001	/* Exception Index table */
-#define SHT_ARM_PREEMPTMAP 	0x70000002	/* BPABI DLL dynamic linking pre-emption map */
-#define SHT_ARM_ATTRIBUTES 	0x70000003	/* Object file compatibility attributes */
-
-// sh_flags values
-#define SHF_WRITE		0	/* writable section */
-#define SHF_ALLOC		2	/* section occupies memory */
-#define SHF_EXECINSTR	        4	/* machine instructions */
-
-// Symbol entry (contain info about a symbol)
-typedef struct {
-	Elf32_Word    st_name;                /* Symbol name (string tbl index) */
-	Elf32_Addr    st_value;               /* Symbol value */
-	Elf32_Word    st_size;                /* Symbol size */
-	unsigned char st_info;                /* Symbol type and binding */
-	unsigned char st_other;               /* Symbol visibility */
-	Elf32_Section st_shndx;               /* Section index */
-} Elf32_Sym;
-
-// Extract from the st_info
-#define SYM_TYPE(x)		((x)&0xF)
-#define SYM_BIND(x)		((x)>>4)
-
-// Symbol binding values from st_info
-#define STB_LOCAL 	0	/* Symbol not visible outside object */
-#define STB_GLOBAL 	1	/* Symbol visible to all object files */
-#define STB_WEAK	2	/* Similar to STB_GLOBAL */
-
-// Symbol type values from st_info
-#define STT_NOTYPE	0	/* Not specified */
-#define STT_OBJECT	1	/* Data object e.g. variable */
-#define STT_FUNC	2	/* Function */
-#define STT_SECTION	3	/* Section */
-#define STT_FILE	4	/* Source file associated with object file */
-
-// Special section header index values from st_shndex
-#define SHN_UNDEF  		0
-#define SHN_LOPROC 		0xFF00	/* Extended values */
-#define SHN_ABS	   		0xFFF1	/* Absolute value: don't relocate */
-#define SHN_COMMON 		0xFFF2	/* Common block. Not allocated yet */
-#define SHN_HIPROC 		0xFF1F
-#define SHN_HIRESERVE 	0xFFFF
-
-// Relocation entry (info about how to relocate)
-typedef struct {
-	Elf32_Addr    r_offset;               /* Address */
-	Elf32_Word    r_info;                 /* Relocation type and symbol index */
-} Elf32_Rel;
-
-typedef struct
-{
-  Elf32_Addr    r_offset;               /* Address */
-  Elf32_Word    r_info;                 /* Relocation type and symbol index */
-  Elf32_Sword   r_addend;               /* Addend */
-} Elf32_Rela;
-
-// Access macros for the relocation info
-#define REL_TYPE(x)		((unsigned char) (x))	/* Extract relocation type */
-#define REL_INDEX(x)	((x)>>8)		/* Extract relocation index into symbol table */
-
-// ARM relocation types
-#define R_ARM_NONE			0
-#define R_ARM_ABS32			2
-#define R_ARM_THM_CALL      10
-#define R_ARM_CALL			28
-#define R_ARM_JUMP24		29
-#define R_ARM_TARGET1		38
-#define R_ARM_V4BX 			40
-
-#endif /* BACKENDS_ELF_H */
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
index b70d9e7b99..07affd8839 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
@@ -294,9 +294,9 @@ u16 getRTCtoFileTime (void)
 {
 #ifdef NDS
 	return (
-		( ( (IPC->rtc_hours > 11 ? IPC->rtc_hours - 40 : IPC->rtc_hours) & 0x1F) << 11) |
-		( (IPC->rtc_minutes & 0x3F) << 5) |
-		( (IPC->rtc_seconds >> 1) & 0x1F) );
+		( ( (IPC->rtc.hours > 11 ? IPC->rtc.hours - 40 : IPC->rtc.hours) & 0x1F) << 11) |
+		( (IPC->rtc.minutes & 0x3F) << 5) |
+		( (IPC->rtc.seconds >> 1) & 0x1F) );
 #else
 	return 0;
 #endif
@@ -306,9 +306,9 @@ u16 getRTCtoFileDate (void)
 {
 #ifdef NDS
 	return (
-		( ((IPC->rtc_year + 20) & 0x7F) <<9) |
-		( (IPC->rtc_month & 0xF) << 5) |
-		(IPC->rtc_day & 0x1F) );
+		( ((IPC->rtc.year + 20) & 0x7F) <<9) |
+		( (IPC->rtc.month & 0xF) << 5) |
+		(IPC->rtc.day & 0x1F) );
 #else
 	return 0;
 #endif
diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp
index 820e569555..d0fb8fff3b 100644
--- a/backends/platform/ds/arm9/source/gbampsave.cpp
+++ b/backends/platform/ds/arm9/source/gbampsave.cpp
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -29,7 +32,7 @@
 // GBAMP Save File
 /////////////////////////
 
-GBAMPSaveFile::GBAMPSaveFile(char* name, bool saveOrLoad) {
+GBAMPSaveFile::GBAMPSaveFile(char *name, bool saveOrLoad) {
 	handle = DS::std_fopen(name, saveOrLoad? "w": "r");
 //	consolePrintf("%s handle is %d\n", name, handle);
 //	consolePrintf("Created %s\n", name);
@@ -44,10 +47,10 @@ GBAMPSaveFile::~GBAMPSaveFile() {
 //	consolePrintf("Closed file\n");
 }
 
-uint32 GBAMPSaveFile::read(void *buf, uint32 size) {
-	saveSize += size;
-//	consolePrintf("Read %d %d ", size, saveSize);
-	return DS::std_fread(buf, 1, size, handle);
+uint32 GBAMPSaveFile::read(void *buf, uint32 length) {
+	saveSize += length;
+//	consolePrintf("Read %d %d ", length, saveSize);
+	return DS::std_fread(buf, 1, length, handle);
 }
 
 bool GBAMPSaveFile::eos() const {
@@ -74,27 +77,27 @@ int32 GBAMPSaveFile::pos() const {
 int32 GBAMPSaveFile::size() const {
 	int position = pos();
 	DS::std_fseek(handle, 0, SEEK_END);
-	int size = DS::std_ftell(handle);
+	int length = DS::std_ftell(handle);
 	DS::std_fseek(handle, position, SEEK_SET);
-	return size;
+	return length;
 }
 
-bool GBAMPSaveFile::seek(int32 pos, int whence) {
-	return DS::std_fseek(handle, pos, whence) == 0;
+bool GBAMPSaveFile::seek(int32 newPos, int whence) {
+	return DS::std_fseek(handle, newPos, whence) == 0;
 }
 
 
-uint32 GBAMPSaveFile::write(const void *buf, uint32 size) {
-	if (bufferPos + size > SAVE_BUFFER_SIZE) {
+uint32 GBAMPSaveFile::write(const void *buf, uint32 length) {
+	if (bufferPos + length > SAVE_BUFFER_SIZE) {
 		flushSaveBuffer();
-		saveSize += size;
-//		consolePrintf("Writing %d bytes from %x", size, buf);
-//		DS::std_fwrite(buf, 1, size, handle);
+		saveSize += length;
+//		consolePrintf("Writing %d bytes from %x", length, buf);
+//		DS::std_fwrite(buf, 1, length, handle);
 
-		memcpy(buffer + bufferPos, buf, size);
-		bufferPos += size;
+		memcpy(buffer + bufferPos, buf, length);
+		bufferPos += length;
 
-		saveSize += size;
+		saveSize += length;
 
 
 /*		int pos = 0;
@@ -104,31 +107,31 @@ uint32 GBAMPSaveFile::write(const void *buf, uint32 size) {
 		bufferPos = 512;
 		pos += rest;
 		flushSaveBuffer();
-		size -= rest;
+		length -= rest;
 //		consolePrintf("First section: %d\n", rest);
 
-		while (size >= 512) {
+		while (length >= 512) {
 			DS::std_fwrite(((char *) (buf)) + pos, 1, 512, handle);
-			size -= 512;
+			length -= 512;
 			pos += 512;
-//			consolePrintf("Full chunk, %d left ", size);
+//			consolePrintf("Full chunk, %d left ", length);
 		}
 
 		bufferPos = 0;
-		memcpy(buffer + bufferPos, ((char *) (buf)) + pos, size);
-		bufferPos += size;
+		memcpy(buffer + bufferPos, ((char *) (buf)) + pos, length);
+		bufferPos += length;
 //		consolePrintf("%d left in buffer ", bufferPos);*/
 
 	} else {
 
-		memcpy(buffer + bufferPos, buf, size);
-		bufferPos += size;
+		memcpy(buffer + bufferPos, buf, length);
+		bufferPos += length;
 
-		saveSize += size;
+		saveSize += length;
 	}
 
-//	if ((size > 100) || (size <= 0)) consolePrintf("Write %d bytes\n", size);
-	return size;
+//	if ((length > 100) || (length <= 0)) consolePrintf("Write %d bytes\n", length);
+	return length;
 }
 
 
@@ -196,7 +199,7 @@ Common::StringArray GBAMPSaveFileManager::listSavefiles(const Common::String &pa
 
 	//	consolePrintf("Real cwd:%d\n", realName);
 
-		char* p = realName;
+		char *p = realName;
 		while (*p) {
 			if (*p == '\\') *p = '/';
 			p++;
diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h
index bc4fdaa1a4..ad929236cd 100644
--- a/backends/platform/ds/arm9/source/gbampsave.h
+++ b/backends/platform/ds/arm9/source/gbampsave.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -24,19 +27,20 @@
 #define _GBAMPSAVE_H_
 
 #include "common/system.h"
+#include "common/savefile.h"
 #include "backends/fs/ds/ds-fs.h"
 
 #define SAVE_BUFFER_SIZE 100000
 
 class GBAMPSaveFile : public Common::InSaveFile, public Common::OutSaveFile {
-	DS::fileHandle* handle;
+	DS::fileHandle *handle;
 	char buffer[SAVE_BUFFER_SIZE];
 	int bufferPos;
 	int saveSize;
 	int flushed;
 
 public:
-	GBAMPSaveFile(char* name, bool saveOrLoad);
+	GBAMPSaveFile(char *name, bool saveOrLoad);
 	virtual ~GBAMPSaveFile();
 
 	virtual uint32 read(void *buf, uint32 size);
@@ -62,12 +66,12 @@ public:
 	GBAMPSaveFileManager();
 	~GBAMPSaveFileManager();
 
-//	static GBAMPSaveFileManager* instance() { return instancePtr; }
+//	static GBAMPSaveFileManager *instance() { return instancePtr; }
 
 	GBAMPSaveFile *openSavefile(const char *filename, bool saveOrLoad);
 
-	virtual Common::OutSaveFile* openForSaving(const Common::String &filename) { return openSavefile(filename.c_str(), true); }
-	virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); }
+	virtual Common::OutSaveFile *openForSaving(const Common::String &filename) { return openSavefile(filename.c_str(), true); }
+	virtual Common::InSaveFile *openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); }
 
 	virtual bool removeSavefile(const Common::String &filename) { return false; } // TODO: Implement this
 	virtual Common::StringArray listSavefiles(const Common::String &pattern);
diff --git a/backends/platform/ds/arm9/source/keys.cpp b/backends/platform/ds/arm9/source/keys.cpp
index 63fae866e5..2f8497ab19 100644
--- a/backends/platform/ds/arm9/source/keys.cpp
+++ b/backends/platform/ds/arm9/source/keys.cpp
@@ -74,7 +74,6 @@
 #include <nds/system.h>
 #include <nds/arm9/input.h>
 
-//------------------------------------------------------------------------------
 
 #define KEYS_CUR (( ((~REG_KEYINPUT)&0x3ff) | (((~IPC->buttons)&3)<<10) | (((~IPC->buttons)<<6) & (KEY_TOUCH|KEY_LID) ))^KEY_LID)
 
@@ -89,63 +88,50 @@ static u8 delay = 60, repeat = 30, count = 60;
 static uint16 oldx = 0;
 static uint16 oldy = 0;
 
-//------------------------------------------------------------------------------
 void scanKeys(void) {
-//------------------------------------------------------------------------------
 	keysold = keys;
 	keys = KEYS_CUR;
 
 	oldx = IPC->touchXpx;
 	oldy = IPC->touchYpx;
-    if ( delay != 0 ) {
-        if ( keys != keysold ) {
-            count = delay ;
-            keysrepeat = keysDown() ;
+    if (delay != 0) {
+        if (keys != keysold) {
+            count = delay;
+            keysrepeat = keysDown();
         }
         count--;
-        if ( count == 0 ) {
+        if (count == 0) {
             count = repeat;
             keysrepeat = keys;
         }
     }
 }
 
-//------------------------------------------------------------------------------
 uint32 keysHeld(void) {
-//------------------------------------------------------------------------------
 	return keys;
 }
 
-//------------------------------------------------------------------------------
 uint32 keysDown(void) {
-//------------------------------------------------------------------------------
 	return (keys ^ keysold) & keys;
 }
 
-//------------------------------------------------------------------------------
 uint32 keysDownRepeat(void) {
-//------------------------------------------------------------------------------
 	uint32 tmp = keysrepeat;
-
     keysrepeat = 0;
-
     return tmp;
 }
 
-//------------------------------------------------------------------------------
 void keysSetRepeat( u8 setDelay, u8 setRepeat ) {
-//------------------------------------------------------------------------------
-    delay = setDelay ;
-    repeat = setRepeat ;
-    count = delay ;
-    keysrepeat = 0 ;
+    delay = setDelay;
+    repeat = setRepeat;
+    count = delay;
+    keysrepeat = 0;
 }
 
-//------------------------------------------------------------------------------
 uint32 keysUp(void) {
-//------------------------------------------------------------------------------
 	return (keys ^ keysold) & (~keys);
 }
 
 
-} // namespace ds
+}	// End of namespace DS
+
diff --git a/backends/platform/ds/arm9/source/keys.h b/backends/platform/ds/arm9/source/keys.h
index e0f28a12cf..8d08014232 100644
--- a/backends/platform/ds/arm9/source/keys.h
+++ b/backends/platform/ds/arm9/source/keys.h
@@ -1,4 +1,27 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
 
 
 namespace DS {
@@ -7,7 +30,7 @@ void scanKeys(void);
 uint32 keysHeld(void);
 uint32 keysDown(void);
 uint32 keysDownRepeat(void);
-void keysSetRepeat( u8 setDelay, u8 setRepeat );
+void keysSetRepeat(u8 setDelay, u8 setRepeat);
 uint32 keysUp(void);
 
-}
+}	// End of namespace DS
diff --git a/backends/platform/ds/arm9/source/libcartreset/cartreset.c b/backends/platform/ds/arm9/source/libcartreset/cartreset.c
deleted file mode 100644
index 6fb906b86d..0000000000
--- a/backends/platform/ds/arm9/source/libcartreset/cartreset.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/**********************************
-  Copyright (C) Rick Wong (Lick)
-  http://licklick.wordpress.com/
-***********************************/
-#include <cartreset_nolibfat.h>
-
-
-#ifdef ARM9
-
-bool cartSetMenuMode(u32 _deviceType)
-{
-    *(vu16*)(0x04000204) &= ~0x0880;    //sysSetBusOwners(true, true);
-    u32 deviceType = _deviceType;
-
-    *((vu32*)0x027FFFF8) = 0x080000C0; // ARM7 reset address
-
-    if(deviceType == DEVICE_TYPE_EFA2)
-    {
-        *(u16 *)0x9FE0000 = 0xD200;
-        *(u16 *)0x8000000 = 0x1500;
-        *(u16 *)0x8020000 = 0xD200;
-        *(u16 *)0x8040000 = 0x1500;
-        *(u16 *)0x9880000 = 1 << 15;
-        *(u16 *)0x9FC0000 = 0x1500;
-        return true;
-    }
-    else if(deviceType == DEVICE_TYPE_MPCF)
-    {
-        return true;
-    }
-    else if(deviceType == DEVICE_TYPE_EZSD)
-    {
-        return true;
-    }
-    else if(deviceType == DEVICE_TYPE_M3CF || deviceType == DEVICE_TYPE_M3SD)
-    {
-        u32 mode = 0x00400004;
-	    vu16 tmp;
-        tmp = *(vu16*)(0x08E00002);
-        tmp = *(vu16*)(0x0800000E);
-        tmp = *(vu16*)(0x08801FFC);
-        tmp = *(vu16*)(0x0800104A);
-        tmp = *(vu16*)(0x08800612);
-        tmp = *(vu16*)(0x08000000);
-        tmp = *(vu16*)(0x08801B66);
-        tmp = *(vu16*)(0x08000000 + (mode << 1));
-        tmp = *(vu16*)(0x0800080E);
-        tmp = *(vu16*)(0x08000000);
-
-        tmp = *(vu16*)(0x080001E4);
-        tmp = *(vu16*)(0x080001E4);
-        tmp = *(vu16*)(0x08000188);
-        tmp = *(vu16*)(0x08000188);
-        return true;
-    }
-    else if(deviceType == DEVICE_TYPE_SCCF || deviceType == DEVICE_TYPE_SCSD)
-    {
-        *(vu16*)0x09FFFFFE = 0xA55A;
-        *(vu16*)0x09FFFFFE = 0xA55A;
-        *(vu16*)0x09FFFFFE = 0;
-        *(vu16*)0x09FFFFFE = 0;
-        *((vu32*)0x027FFFF8) = 0x08000000; // Special ARM7 reset address
-        return true;
-    }
-
-    return false;
-}
-
-
-
-void passmeloopEnter()
-{
-    *(vu16*)(0x04000208) = 0;           //REG_IME = IME_DISABLE;
-    *(vu16*)(0x04000204) |= 0x0880;     //sysSetBusOwners(false, false);
-    *((vu32*)0x027FFFFC) = 0;
-    *((vu32*)0x027FFE04) = (u32)0xE59FF018;
-    *((vu32*)0x027FFE24) = (u32)0x027FFE04;
-    asm("swi 0x00");                    //swiSoftReset();
-    asm("bx lr");
-}
-
-#endif
-
-
-#ifdef ARM7
-
-bool passmeloopQuery()
-{
-    if(*((vu32*)0x027FFE24) == (u32)0x027FFE04)
-        return true;
-    return false;
-}
-
-
-
-void cartExecute()
-{
-    *(vu16*)(0x04000208) = 0;       //REG_IME = IME_DISABLE;
-    *((vu32*)0x027FFE34) = *((vu32*)0x027FFFF8);
-    asm("swi 0x00");                //swiSoftReset();
-    asm("bx lr");
-}
-
-#endif
-
-
-
diff --git a/backends/platform/ds/arm9/source/libcartreset/cartreset_nolibfat.h b/backends/platform/ds/arm9/source/libcartreset/cartreset_nolibfat.h
deleted file mode 100644
index ddc4b1d4c2..0000000000
--- a/backends/platform/ds/arm9/source/libcartreset/cartreset_nolibfat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**********************************
-  Copyright (C) Rick Wong (Lick)
-  http://licklick.wordpress.com/
-***********************************/
-#ifndef CARTRESET_H
-#define CARTRESET_H
-
-//#include <fat.h>
-#include <nds.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef ARM9
-// Auto detect:
-#define DEVICE_TYPE_AUTO        0x00000000 // doesn't work in libcartreset "nolibfat" version
-
-// Not supported:
-#define DEVICE_TYPE_FCSR        0x52534346
-#define DEVICE_TYPE_MMCF        0x46434D4D
-#define DEVICE_TYPE_NJSD        0x44534A4E
-#define DEVICE_TYPE_NMMC        0x434D4D4E
-
-// Supported:
-#define DEVICE_TYPE_EFA2        0x32414645
-#define DEVICE_TYPE_MPCF        0x4643504D
-#define DEVICE_TYPE_M3CF        0x4643334D
-#define DEVICE_TYPE_M3SD        0x4453334D
-#define DEVICE_TYPE_SCCF        0x46434353
-#define DEVICE_TYPE_SCSD        0x44534353
-
-// Supported, but libfat doesn't detect the device:
-#define DEVICE_TYPE_EZSD        0x44535A45
-
-
-bool cartSetMenuMode(u32 _deviceType);
-void passmeloopEnter();
-
-#endif
-
-
-#ifdef ARM7
-
-bool passmeloopQuery();
-void cartExecute();
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 691fb2ec7a..c4ff241de0 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -66,9 +66,14 @@
 #define DEFAULT_CONFIG_FILE "scummvmj.ini"
 #elif defined(DS_BUILD_K)
 #define DEFAULT_CONFIG_FILE "scummvmk.ini"
+#else
+	// Use the "scummvm.ini" as config file if no build was specified. This
+	// currently only happens with builds made using the regular ScummVM build
+	// system (as opposed to the nds specific build system).
+#define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
-OSystem_DS* OSystem_DS::_instance = NULL;
+OSystem_DS *OSystem_DS::_instance = NULL;
 
 OSystem_DS::OSystem_DS()
 	: eventNum(0), lastPenFrame(0), queuePos(0), _mixer(NULL), _timer(NULL), _frameBufferExists(false),
@@ -128,7 +133,7 @@ bool OSystem_DS::getFeatureState(Feature f) {
 	return false;
 }
 
-const OSystem::GraphicsMode* OSystem_DS::getSupportedGraphicsModes() const {
+const OSystem::GraphicsMode *OSystem_DS::getSupportedGraphicsModes() const {
 	return s_supportedGraphicsModes;
 }
 
@@ -203,8 +208,7 @@ void OSystem_DS::setPalette(const byte *colors, uint start, uint num) {
 	}
 }
 
-void OSystem_DS::restoreHardwarePalette()
-{
+void OSystem_DS::restoreHardwarePalette() {
 	// Set the hardware palette up based on the stored palette
 
 	for (int r = 0; r < 255; r++) {
@@ -238,13 +242,13 @@ void OSystem_DS::setCursorPalette(const byte *colors, uint start, uint num) {
 	refreshCursor();
 }
 
-bool OSystem_DS::grabRawScreen(Graphics::Surface* surf) {
+bool OSystem_DS::grabRawScreen(Graphics::Surface *surf) {
 	surf->create(DS::getGameWidth(), DS::getGameHeight(), 1);
 
 	// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
 
 
-	const u16* image = (const u16 *) DS::get8BitBackBuffer();
+	const u16 *image = (const u16 *) DS::get8BitBackBuffer();
 	for (int y = 0; y <  DS::getGameHeight(); y++) {
 		DC_FlushRange(image + (y << 8), DS::getGameWidth());
 		for (int x = 0; x < DS::getGameWidth() >> 1; x++) {
@@ -277,9 +281,9 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 
 //	consolePrintf("CopyRectToScreen %d\n", w * h);
 
-	u16* bg;
+	u16 *bg;
 	s32 stride;
-	u16* bgSub = (u16 *)BG_GFX_SUB;
+	u16 *bgSub = (u16 *)BG_GFX_SUB;
 
 	// The DS video RAM doesn't support 8-bit writes because Nintendo wanted
 	// to save a few pennies/euro cents on the hardware.
@@ -304,14 +308,14 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 			// the keyboard image uses the same VRAM addresses.
 
 			for (int dy = y; dy < y + h; dy++) {
-				u8* dest = ((u8 *) (bg)) + (dy * stride) + x;
-				u8* src = (u8 *) buf + (pitch * by);
+				u8 *dest = ((u8 *) (bg)) + (dy * stride) + x;
+				const u8 *src = (const u8 *) buf + (pitch * by);
 
 				u32 dx;
 
 				u32 pixelsLeft = w;
 
-				if (MISALIGNED16(dest))	{
+				if (MISALIGNED16(dest)) {
 					// Read modify write
 
 					dest--;
@@ -326,9 +330,9 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 				}
 
 				// We can now assume dest is aligned
-				u16* dest16 = (u16 *) dest;
+				u16 *dest16 = (u16 *) dest;
 
-				for (dx = 0; dx < pixelsLeft; dx+=2)	{
+				for (dx = 0; dx < pixelsLeft; dx+=2) {
 					u16 mix;
 
 					mix = *src + (*(src + 1) << 8);
@@ -355,15 +359,15 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 			// When they keyboard is not on screen, update both vram copies
 
 			for (int dy = y; dy < y + h; dy++) {
-				u8* dest = ((u8 *) (bg)) + (dy * stride) + x;
-				u8* destSub = ((u8 *) (bgSub)) + (dy * 512) + x;
-				u8* src = (u8 *) buf + (pitch * by);
+				u8 *dest = ((u8 *) (bg)) + (dy * stride) + x;
+				u8 *destSub = ((u8 *) (bgSub)) + (dy * 512) + x;
+				const u8 *src = (const u8 *) buf + (pitch * by);
 
 				u32 dx;
 
 				u32 pixelsLeft = w;
 
-				if (MISALIGNED16(dest))	{
+				if (MISALIGNED16(dest)) {
 					// Read modify write
 
 					dest--;
@@ -380,10 +384,10 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 				}
 
 				// We can now assume dest is aligned
-				u16* dest16 = (u16 *) dest;
-				u16* destSub16 = (u16 *) destSub;
+				u16 *dest16 = (u16 *) dest;
+				u16 *destSub16 = (u16 *) destSub;
 
-				for (dx = 0; dx < pixelsLeft; dx+=2)	{
+				for (dx = 0; dx < pixelsLeft; dx+=2) {
 					u16 mix;
 
 					mix = *src + (*(src + 1) << 8);
@@ -417,12 +421,12 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 
 		// Stuff is aligned to 16-bit boundaries, so it's safe to do DMA.
 
-		u16* src = (u16 *) buf;
+		u16 *src = (u16 *) buf;
 
 		if (DS::getKeyboardEnable()) {
 
 			for (int dy = y; dy < y + h; dy++) {
-				u16* dest = bg + (dy * (stride >> 1)) + (x >> 1);
+				u16 *dest = bg + (dy * (stride >> 1)) + (x >> 1);
 
 				DC_FlushRange(src, w << 1);
 				DC_FlushRange(dest, w << 1);
@@ -435,8 +439,8 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 
 		} else {
 			for (int dy = y; dy < y + h; dy++) {
-				u16* dest1 = bg + (dy * (stride >> 1)) + (x >> 1);
-				u16* dest2 = bgSub + (dy << 8) + (x >> 1);
+				u16 *dest1 = bg + (dy * (stride >> 1)) + (x >> 1);
+				u16 *dest2 = bgSub + (dy << 8) + (x >> 1);
 
 				DC_FlushRange(src, w << 1);
 				DC_FlushRange(dest1, w << 1);
@@ -458,7 +462,7 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 }
 
 void OSystem_DS::updateScreen() {
-	static int cnt = 0;
+//	static int cnt = 0;
 //	consolePrintf("updatescr %d\n", cnt++);
 
 	if ((_frameBufferExists) && (DS::getIsDisplayMode8Bit())) {
@@ -498,13 +502,13 @@ void OSystem_DS::clearOverlay() {
 //	consolePrintf("clearovl\n");
 }
 
-void OSystem_DS::grabOverlay(OverlayColor* buf, int pitch) {
+void OSystem_DS::grabOverlay(OverlayColor *buf, int pitch) {
 //	consolePrintf("grabovl\n")
-	u16* start = DS::get16BitBackBuffer();
+	u16 *start = DS::get16BitBackBuffer();
 
 	for (int y = 0; y < 200; y++) {
-		u16* src = start + (y * 320);
-		u16* dest = ((u16 *) (buf)) + (y * pitch);
+		u16 *src = start + (y * 320);
+		u16 *dest = ((u16 *) (buf)) + (y * pitch);
 
 		for (int x = 0; x < 320; x++) {
 			*dest++ =  *src++;
@@ -514,8 +518,8 @@ void OSystem_DS::grabOverlay(OverlayColor* buf, int pitch) {
 }
 
 void OSystem_DS::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
-	u16* bg = (u16 *) DS::get16BitBackBuffer();
-	const u16* src = (const u16 *) buf;
+	u16 *bg = (u16 *) DS::get16BitBackBuffer();
+	const u16 *src = (const u16 *) buf;
 
 //	if (x + w > 256) w = 256 - x;
 	//if (x + h > 256) h = 256 - y;
@@ -586,7 +590,7 @@ void OSystem_DS::refreshCursor() {
 	DS::setCursorIcon(_cursorImage, _cursorW, _cursorH, _cursorKey, _cursorHotX, _cursorHotY);
 }
 
-void OSystem_DS::addEvent(Common::Event& e) {
+void OSystem_DS::addEvent(const Common::Event& e) {
 	eventQueue[queuePos++] = e;
 }
 
@@ -724,31 +728,15 @@ void OSystem_DS::quit() {
 	swiSoftReset();*/
 }
 
-Common::SaveFileManager* OSystem_DS::getSavefileManager() {
-	bool forceSram;
-
-	if (ConfMan.hasKey("forcesramsave", "ds")) {
-		forceSram = ConfMan.getBool("forcesramsave", "ds");
-	} else {
-		forceSram = false;
-	}
-	if (forceSram) {
-		consolePrintf("Using SRAM save method!\n");
-	}
-
-	if (DS::isGBAMPAvailable() && (!forceSram)) {
+Common::SaveFileManager *OSystem_DS::getSavefileManager() {
+	if (DS::isGBAMPAvailable()) {
 		return &mpSaveManager;
-	} else {
-#ifdef GBA_SRAM_SAVE
-		return &saveManager;
-#else
-		return NULL;
-#endif
 	}
+	return NULL;
 }
 
 
-Graphics::Surface* OSystem_DS::createTempFrameBuffer() {
+Graphics::Surface *OSystem_DS::createTempFrameBuffer() {
 
 	// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
 
@@ -773,13 +761,13 @@ Graphics::Surface* OSystem_DS::createTempFrameBuffer() {
 		s32 width = DS::getGameWidth();
 		s32 stride = DS::get8BitBackBufferStride();
 
-		u16* src = DS::get8BitBackBuffer();
-		u16* dest = DS::getScalerBuffer();
+		u16 *src = DS::get8BitBackBuffer();
+		u16 *dest = DS::getScalerBuffer();
 
 		for (int y = 0; y < height; y++) {
 
-			u16* destLine = dest + (y * (width / 2));
-			u16* srcLine = src + (y * (stride / 2));
+			u16 *destLine = dest + (y * (width / 2));
+			u16 *srcLine = src + (y * (stride / 2));
 
 			DC_FlushRange(srcLine, width);
 
@@ -800,7 +788,7 @@ Graphics::Surface* OSystem_DS::createTempFrameBuffer() {
 	size_t imageStrideInBytes = DS::get8BitBackBufferStride();
 	size_t imageStrideInWords = imageStrideInBytes / 2;
 
-	u16* image = (u16 *) DS::get8BitBackBuffer();
+	u16 *image = (u16 *) DS::get8BitBackBuffer();
 	for (int y = 0; y <  DS::getGameHeight(); y++) {
 		DC_FlushRange(image + (y * imageStrideInWords), DS::getGameWidth());
 		for (int x = 0; x < DS::getGameWidth() >> 1; x++) {
@@ -846,13 +834,13 @@ void OSystem_DS::setCharactersEntered(int count) {
 	DS::setCharactersEntered(count);
 }
 
-Common::SeekableReadStream* OSystem_DS::createConfigReadStream() {
+Common::SeekableReadStream *OSystem_DS::createConfigReadStream() {
 	Common::FSNode file(DEFAULT_CONFIG_FILE);
 //	consolePrintf("R %s", DEFAULT_CONFIG_FILE);
 	return file.createReadStream();
 }
 
-Common::WriteStream* OSystem_DS::createConfigWriteStream() {
+Common::WriteStream *OSystem_DS::createConfigWriteStream() {
 	Common::FSNode file(DEFAULT_CONFIG_FILE);
 //	consolePrintf("W %s", DEFAULT_CONFIG_FILE);
 	return file.createWriteStream();
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 10b4c87f66..65ac3f4f7e 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -27,7 +30,6 @@
 #include "backends/base-backend.h"
 #include "common/events.h"
 #include "nds.h"
-#include "ramsave.h"
 #include "gbampsave.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
@@ -44,17 +46,14 @@ protected:
 	Common::Event eventQueue[96];
 	int queuePos;
 
-#ifdef GBA_SRAM_SAVE
-	DSSaveFileManager saveManager;
-#endif
 	GBAMPSaveFileManager mpSaveManager;
-	Audio::MixerImpl* _mixer;
-	DefaultTimerManager* _timer;
+	Audio::MixerImpl *_mixer;
+	DefaultTimerManager *_timer;
 	Graphics::Surface _framebuffer;
 	bool _frameBufferExists;
 	bool _graphicsEnable;
 
-	static OSystem_DS* _instance;
+	static OSystem_DS *_instance;
 
 	u16 _palette[256];
 	u16 _cursorPalette[256];
@@ -68,7 +67,7 @@ protected:
 	int _cursorScale;
 
 
-	Graphics::Surface* createTempFrameBuffer();
+	Graphics::Surface *createTempFrameBuffer();
 	bool _disableCursorPalette;
 
 	int _gammaValue;
@@ -94,7 +93,7 @@ public:
 	virtual int16 getHeight();
 	virtual int16 getWidth();
 	virtual void setPalette(const byte *colors, uint start, uint num);
-	virtual void grabPalette(unsigned char* colors, uint start, uint num);
+	virtual void grabPalette(unsigned char *colors, uint start, uint num);
 	void restoreHardwarePalette();
 
 	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
@@ -136,10 +135,10 @@ public:
 
 	virtual Common::SaveFileManager *getSavefileManager();
 
-	void addEvent(Common::Event& e);
-	bool isEventQueueEmpty() { return queuePos == 0; }
+	void addEvent(const Common::Event& e);
+	bool isEventQueueEmpty() const { return queuePos == 0; }
 
-	virtual bool grabRawScreen(Graphics::Surface* surf);
+	virtual bool grabRawScreen(Graphics::Surface *surf);
 
 	virtual void setFocusRectangle(const Common::Rect& rect);
 
@@ -150,10 +149,10 @@ public:
 	virtual Graphics::Surface *lockScreen();
 	virtual void unlockScreen();
 
-	virtual Audio::Mixer* getMixer() { return _mixer; }
-	Audio::MixerImpl* getMixerImpl() { return _mixer; }
+	virtual Audio::Mixer *getMixer() { return _mixer; }
+	Audio::MixerImpl *getMixerImpl() { return _mixer; }
 
-	virtual Common::TimerManager* getTimerManager() { return _timer; }
+	virtual Common::TimerManager *getTimerManager() { return _timer; }
 	static int timerHandler(int t);
 
 
@@ -161,8 +160,8 @@ public:
 	virtual void clearAutoComplete();
 	virtual void setCharactersEntered(int count);
 
-	u16 getDSPaletteEntry(u32 entry) { return _palette[entry]; }
-	u16 getDSCursorPaletteEntry(u32 entry) { return !_disableCursorPalette? _cursorPalette[entry]: _palette[entry]; }
+	u16 getDSPaletteEntry(u32 entry) const { return _palette[entry]; }
+	u16 getDSCursorPaletteEntry(u32 entry) const { return !_disableCursorPalette? _cursorPalette[entry]: _palette[entry]; }
 
 	virtual void setCursorPalette(const byte *colors, uint start, uint num);
 
@@ -172,8 +171,8 @@ public:
 
 	void refreshCursor();
 
-	Common::WriteStream* createConfigWriteStream();
-	Common::SeekableReadStream* createConfigReadStream();
+	Common::WriteStream *createConfigWriteStream();
+	Common::SeekableReadStream *createConfigReadStream();
 
 	u16 applyGamma(u16 colour);
 	void setGammaValue(int gamma) { _gammaValue = gamma; }
diff --git a/backends/platform/ds/arm9/source/portdefs.cpp b/backends/platform/ds/arm9/source/portdefs.cpp
deleted file mode 100644
index 0dcdc1d5a3..0000000000
--- a/backends/platform/ds/arm9/source/portdefs.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#include <string.h>
-#include "nds/dma.h"
-#include "osystem_ds.h"
-
-/*
-extern "C" time_t __wrap_time(time_t* t) {
-	if (t) {
-		*t = OSystem_DS::instance()->getMillis() / 1000;
-	}
-
-	return OSystem_DS::instance()->getMillis() / 1000;
-}
-*/
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index 5472b711b8..cc38d66a73 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -8,39 +8,29 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
 #ifndef _PORTDEFS_H_
 #define _PORTDEFS_H_
 
-
-
-/*
-typedef unsigned char u8;
-typedef signed char s8;
-
-typedef unsigned short u16;
-typedef signed short s16;
-
-typedef unsigned int u32;
-typedef signed int s32;
-*/
-
+// Include ndstypes.h for uint16 etc. typedefs
 #include "nds/ndstypes.h"
 
-
-// Somebody removed these from scummsys.h, but they're still required, so I'm adding them here
-// in the hope that they'll stay.
+// Somebody removed these from scummsys.h, but they're still required, so I'm
+// adding them here in the hope that they'll stay.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,18 +40,21 @@ typedef signed int s32;
 
 #define double float
 
-#define CT_NO_TRANSPARENCY
-
+#ifndef DISABLE_TEXT_CONSOLE
 #define DISABLE_TEXT_CONSOLE
+#endif
+
+#ifndef DISABLE_COMMAND_LINE
 #define DISABLE_COMMAND_LINE
+#endif
 
+#ifndef STREAM_AUDIO_FROM_DISK
 #define STREAM_AUDIO_FROM_DISK
+#endif
 
-//#undef assert
-//#define assert(expr) consolePrintf("Asserted!")
+// FIXME: What is "NO_DEBUG_MSGS" good for?
 #define NO_DEBUG_MSGS
 
-
 // This is defined in dsmain.cpp
 #ifdef __cplusplus
 extern "C" {
@@ -76,14 +69,22 @@ void consolePrintf(const char *format, ...);
 #undef assert
 #endif
 
-#define assert(s) if (!(s)) consolePrintf("Assertion failed: '##s##' at file %s, line %d\n", __FILE__, __LINE__)
+#ifdef NDEBUG
 
-//#include "ds-fs.h"
+#define	assert(e)	((void)0)
 
-//#define debug(fmt, ...) consolePrintf(fmt, ##__VA_ARGS__)
-//#define debug(fmt, ...) debug(0, fmt, ##__VA_ARGS__)
+#else
 
-#define ITCM_DATA	__attribute__((section(".itcm")))
+// FIXME: Shouldn't assert() also bail out / exit / halt the program? Right now we just
+// print an error message...
+#define assert(s) \
+	do { \
+		if (!(s)) { \
+			consolePrintf("Assertion failed: '##s##' at file %s, line %d\n", __FILE__, __LINE__); \
+		} \
+	} while (0)
+
+#endif
 
 // FIXME: Since I can't change the engine at the moment (post lockdown) this define can go here.
 // This define changes the mouse-relative motion which doesn't make sense on a touch screen to
diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
deleted file mode 100644
index a0f4633988..0000000000
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-#ifdef GBA_SRAM_SAVE
-
-
-#include "ramsave.h"
-#include "nds.h"
-#include "compressor/lz.h"
-
-#define CART_RAM ((vu8 *) (0x0A000000))
-#define SRAM_SAVE_MAX (65533)
-
-DSSaveFile::DSSaveFile() {
-	ptr = 0;
-	saveCompressed = false;
-	save.isValid = false;
-	ownsData = false;
-	isOpenFlag = true;
-	isTempFile = false;
-}
-
-DSSaveFile::DSSaveFile(SCUMMSave* s, bool compressed, u8* data) {
-	save = *s;
-	saveData = data;
-	ptr = 0;
-	saveCompressed = compressed;
-	isOpenFlag = true;
-
-	if (saveCompressed) {
-		u8* uncompressed = new unsigned char[save.size];
-		if (!uncompressed) consolePrintf("Out of memory allocating %d!\n", save.size);
-		LZ_Uncompress(saveData, uncompressed, save.compressedSize);
-		saveData = uncompressed;
-		ownsData = true;
-		saveCompressed = false;
-//		consolePrintf("Decompressed. name=%s size=%d (%d)", save.name, save.size, save.compressedSize);
-
-	} else {
-		ownsData = false;
-		origHeader = s;
-	}
-
-	if (save.magic == (int) 0xBEEFCAFE) {
-		save.isValid = true;
-	} else {
-		save.isValid = false;
-	}
-
-	isTempFile = false;
-	eosReached = false;
-}
-
-DSSaveFile::~DSSaveFile() {
-	if (!ownsData) {
-		*origHeader = save;
-		DSSaveFileManager::instance()->flushToSaveRAM();
-	}
-	if (ownsData) {
-		delete[] saveData;
-	}
-}
-
-bool DSSaveFile::loadFromSaveRAM(vu8* address) {
-
-	SCUMMSave newSave;
-
-	for (int t = 0; t < (int) sizeof(newSave); t++) {
-		((char *) (&newSave))[t] = *(address + t);
-	}
-
-	if (newSave.magic == 0xBEEFCAFE) {
-		newSave.isValid = true;
-
-		*((u16 *) (0x4000204)) |= 0x3;
-
-		saveData = new unsigned char[newSave.compressedSize];
-
-		for (int t = 0; t < (int) newSave.compressedSize; t++) {
-			((char *) (saveData))[t] = *(address + t + sizeof(newSave));
-		}
-
-		if (ownsData) delete[] this->saveData;
-		save = newSave;
-		saveCompressed = true;
-		this->saveData = saveData;
-		ownsData = true;
-		ptr = 0;
-
-		return true;
-	}
-
-	return false;
-}
-
-void DSSaveFile::compress() {
-	if (!saveCompressed) {
-		unsigned char* compBuffer = new unsigned char[(save.size * 110) / 100];
-		int compSize = LZ_Compress((u8 *) saveData, compBuffer, save.size);
-		save.compressedSize = compSize;
-
-
-
-		delete[] saveData;
-
-		// Make the save smaller
-		saveData = (u8 *) realloc(compBuffer, save.compressedSize);
-		saveCompressed = true;
-	}
-}
-
-int DSSaveFile::saveToSaveRAM(vu8* address) {
-
-	unsigned char* compBuffer;
-	bool failed;
-
-
-	int compSize;
-
-	compress();
-
-	compSize = save.compressedSize;
-	compBuffer = saveData;
-
-	if (DSSaveFileManager::instance()->getBytesFree() >= getRamUsage()) {
-
-		DSSaveFileManager::instance()->addBytesFree(-getRamUsage());
-
-		// Write header
-		for (int t = 0; t < sizeof(save); t++) {
-			while (*(address + t) != ((char *) (&save))[t]) {
-				*(address + t) = ((char *) (&save))[t];
-			}
-		}
-
-		// Write compressed buffer
-		for (int t = sizeof(save); t < (int) sizeof(save) + compSize; t++) {
-			while (*(address + t) != compBuffer[t - sizeof(save)]) {
-				*(address + t) = compBuffer[t - sizeof(save)];
-			}
-		}
-
-		failed = false;
-	} else {
-		failed = true;
-	}
-
-
-	return failed? 0: compSize + sizeof(save);
-
-}
-
-void DSSaveFile::reset() {
-	ptr = 0;
-	eosReached = false;
-}
-
-uint32 DSSaveFile::read(void *buf, uint32 size) {
-	if (ptr + size > save.size) {
-		size = save.size - ptr;
-		eosReached = true;
-		if (size < 0) size = 0;
-	}
-	memcpy(buf, saveData + ptr, size);
-//	consolePrintf("byte: %d ", ((u8 *) (buf))[0]);
-
-	ptr += size;
-	return size;
-}
-
-int32 DSSaveFile::pos() const {
-	return ptr;
-}
-
-int32 DSSaveFile::size() const {
-	return save.size;
-}
-
-bool DSSaveFile::seek(int32 pos, int whence) {
-	switch (whence) {
-		case SEEK_SET: {
-			ptr = pos;
-			break;
-		}
-		case SEEK_CUR: {
-			ptr += pos;
-			break;
-		}
-		case SEEK_END: {
-			ptr = save.size + pos;
-			break;
-		}
-	}
-	eosReached = false;
-	return true;
-}
-
-bool DSSaveFile::eos() const {
-	return eosReached;
-}
-
-void DSSaveFile::clearErr() {
-	eosReached = false;
-}
-
-bool DSSaveFile::skip(uint32 bytes) {
-	ptr = ptr + bytes;
-	if (ptr > (int) save.size) ptr = save.size;
-	return true;
-}
-
-uint32 DSSaveFile::write(const void *buf, uint32 size) {
-
-	if (ptr + size > DS_MAX_SAVE_SIZE) {
-		size = DS_MAX_SAVE_SIZE - ptr;
-	}
-
-	memcpy(saveData + ptr, buf, size);
-	ptr += size;
-	save.size += size;
-	return size;
-}
-
-bool DSSaveFile::matches(const char *prefix, int num) {
-	char str[16];
-	if (isValid()) {
-		sprintf(str, "%s%02d", prefix, num);
-		if (!strcmp(str, save.name)) {
-			return true;
-		} else {
-			return false;
-		}
-	} else {
-		return false;
-	}
-}
-
-bool DSSaveFile::matches(const char *filename) {
-	if (isValid()) {
-		return !strcmp(save.name, filename);
-	} else {
-		return false;
-	}
-}
-
-void DSSaveFile::setName(char *name) {
-	save.isValid = true;
-	save.magic = 0xBEEFCAFE;
-	ownsData = true;
-	save.size = 0;
-	save.compressedSize = 0;
-	saveData = new unsigned char[DS_MAX_SAVE_SIZE];
-	strcpy(save.name, name);
-
-	if ((strstr(name, ".s99")) || (strstr(name, ".c"))) {
-		isTempFile = true;
-	} else {
-		isTempFile = false;
-	}
-}
-
-void DSSaveFile::clearData() {
-	save.size = 0;
-
-	if (saveCompressed) {
-		if (ownsData) {
-			delete[] saveData;
-			DSSaveFileManager::instance()->addBytesFree(getRamUsage());
-		}
-		saveData = new unsigned char[DS_MAX_SAVE_SIZE];
-		saveCompressed = false;
-		ownsData = true;
-	}
-
-}
-
-void DSSaveFile::deleteFile() {
-	if (isValid()) {
-		if (ownsData) {
-			DSSaveFileManager::instance()->addBytesFree(getRamUsage());
-			delete[] saveData;
-			saveData = NULL;
-		}
-		ptr = 0;
-		saveCompressed = false;
-		save.isValid = false;
-		ownsData = false;
-		isOpenFlag = true;
-	}
-}
-
-DSSaveFileManager::DSSaveFileManager() {
-	instancePtr = this;
-
-	*((u16 *) (0x4000204)) |= 0x3;
-	swiWaitForVBlank();
-
-	loadAllFromSRAM();
-}
-
-DSSaveFileManager::~DSSaveFileManager() {
-	instancePtr = NULL;
-}
-
-void DSSaveFileManager::loadAllFromSRAM() {
-	int addr = 1;
-
-	for (int r = 0; r < 8; r++) {
-		gbaSave[r].deleteFile();
-	}
-
-	sramBytesFree = SRAM_SAVE_MAX;
-
-	// Try to find saves in save RAM
-	for (int r = 0; r < 8; r++) {
-		if (gbaSave[r].loadFromSaveRAM(CART_RAM + addr)) {
-			addr += gbaSave[r].getRamUsage();
-			sramBytesFree -= gbaSave[r].getRamUsage();
-		}
-	}
-
-}
-
-void DSSaveFileManager::formatSram() {
-	for (int r = 0; r < SRAM_SAVE_MAX; r++) {
-		*(CART_RAM + r) = 0;
-	}
-
-	loadAllFromSRAM();
-}
-
-void DSSaveFileManager::listFiles() {
-	for (int r = 0; r < 8; r++) {
-		if (gbaSave[r].isValid()) {
-			consolePrintf("'%s': %d bytes\n", gbaSave[r].getName(), gbaSave[r].getRamUsage());
-		}
-	}
-	consolePrintf("SRAM free: %d bytes\n", getBytesFree());
-}
-
-DSSaveFileManager* DSSaveFileManager::instancePtr = NULL;
-
-DSSaveFile *DSSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) {
-	for (int r = 0; r < 8; r++) {
-		if (gbaSave[r].isValid() && (gbaSave[r].matches(filename))) {
-//			consolePrintf("Matched save %d (%d)\n", r, gbaSave[r].getSize());
-			gbaSave[r].reset();
-			//consolePrintf("reset ");
-			if (saveOrLoad) gbaSave[r].clearData();
-//			consolePrintf("cleared ");
-			return gbaSave[r].clone();
-		}
-	}
-
-	if (saveOrLoad) {
-		return makeSaveFile(filename, saveOrLoad);
-	} else {
-		return NULL;
-	}
-}
-
-
-
-DSSaveFile* DSSaveFile::clone() {
-//	consolePrintf("Clone %s %d\n", save.name, save.size);
-	return new DSSaveFile(&save, saveCompressed, saveData);
-}
-
-void DSSaveFileManager::deleteFile(const char* name) {
-//	consolePrintf("Deleting %s", name);
-	for (int r = 0; r < 8; r++) {
-		if (gbaSave[r].isValid() && (gbaSave[r].matches(name))) {
-			gbaSave[r].deleteFile();
-		}
-	}
-	flushToSaveRAM();
-}
-
-bool DSSaveFileManager::removeSavefile(const Common::String &filename) {
-	consolePrintf("DSSaveFileManager::removeSavefile : Not implemented yet.\n");
-	assert(false);
-	//TODO: Implement this. Most likely, you just have to use the code of deleteFile?
-	return false;
-}
-
-
-Common::StringArray DSSaveFileManager::listSavefiles(const Common::String &pattern) {
-	consolePrintf("DSSaveFileManager::listSavefiles : Not implemented yet.\n");
-	assert(false);
-	return Common::StringArray();
-	/*
-	TODO: Implement this. If you don't understand what it should do, just ask
-	(e.g. on scummvm-devel or Fingolfin). It should be pretty simple if you
-	use Common::matchString from common/util.h and read the Doxygen docs,
-	then combine this with the old code below...
-	*/
-}
-
-
-/*
-void DSSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) {
-	memset(marks, true, num * sizeof(bool));
-	return;
-
-	memset(marks, false, num*sizeof(bool));
-
-	for (int saveNum = 0; saveNum < num; saveNum++) {
-		for (int r = 0; r < 8; r++) {
-			if (gbaSave[r].isValid() && (gbaSave[r].matches(prefix, saveNum))) {
-				marks[saveNum] = true;
-			}
-		}
-	}
-
-}
-*/
-
-
-DSSaveFile *DSSaveFileManager::makeSaveFile(const char *filename, bool saveOrLoad) {
-
-	// Find a free save slot
-	int r = 0;
-
-	while ((r < 8) && (gbaSave[r].isValid())) {
-		r++;
-	}
-
-	if ((r == 8) && (gbaSave[r].isValid())) {
-		// No more saves
-		return NULL;
-	} else {
-		// Allocate this save
-//		consolePrintf("Allocated save %d\n", r);
-		gbaSave[r].setName((char *) filename);
-		gbaSave[r].reset();
-		return gbaSave[r].clone();
-	}
-}
-
-void DSSaveFileManager::flushToSaveRAM() {
-	int cartAddr = 1;
-	int s;
-	int extraData = DSSaveFileManager::getExtraData();
-
-	*((u16 *) (0x4000204)) |= 0x3;
-
-	swiWaitForVBlank();
-
-	int size = 0;
-	for (int r = 0; (r < 8); r++) {
-		if (gbaSave[r].isValid()) {
-			gbaSave[r].compress();
-			if (!gbaSave[r].isTemp()) size += gbaSave[r].getRamUsage();
-		}
-	}
-
-	if (size <= SRAM_SAVE_MAX) {
-
-		for (int r = 0; r < SRAM_SAVE_MAX; r++) {
-			*(CART_RAM + r) = 0;
-		}
-
-		sramBytesFree = SRAM_SAVE_MAX;
-
-		for (int r = 0; (r < 8); r++) {
-			if (gbaSave[r].isValid() && (!gbaSave[r].isTemp())) {
-
-				cartAddr += s = gbaSave[r].saveToSaveRAM(CART_RAM + cartAddr);
-
-	/*			if (s == 0) {
-					consolePrintf("WARNING: Save didn't fit in cart RAM and has been lost!!  Delete files and save again.", gbaSave[r].getName());
-					failed = true;
-				}*/
-			}
-		}
-	} else {
-
-		consolePrintf("WARNING: Save didn't fit in cart RAM and has been lost!!  Delete files and save again.");
-		loadAllFromSRAM();
-
-	}
-
-	DSSaveFileManager::setExtraData(extraData);
-//	consolePrintf("SRAM free: %d bytes\n", getBytesFree());
-}
-
-void DSSaveFileManager::setExtraData(int data) {
-	// Offset of extra data is 31.  This overlaps the padding and reserved bytes of the first save entry.
-	// which have not been used up until now.  So it should be safe.
-
-	vu8* sram = CART_RAM + 31;
-
-	*(sram + 0) = 0xF0;		// This is an identifier to check
-	*(sram + 1) = 0x0D;		// that extra data is present.
-
-	*(sram + 2) = (data & 0xFF000000) >> 24;		// Now write the actual data
-	*(sram + 3) = (data & 0x00FF0000) >> 16;		// taking care to use single
-	*(sram + 4) = (data & 0x0000FF00) >> 8;			// byte writes (it's an 8-bit bus)
-	*(sram + 5) = (data & 0x000000FF);
-}
-
-bool DSSaveFileManager::isExtraDataPresent() {
-	vu8* sram = CART_RAM + 31;
-
-	// Check for the identifier
-	return ((*(sram + 0) == 0xF0) && (*(sram + 1) == 0x0D));
-}
-
-int DSSaveFileManager::getExtraData() {
-	vu8* sram = CART_RAM + 31;
-
-	if (isExtraDataPresent()) {
-		int value = (*(sram + 2) << 24) | (*(sram + 3) << 16) | (*(sram + 4) << 8) | (*(sram + 5));
-		return value;
-	} else {
-		return 0;
-	}
-}
-
-#endif
diff --git a/backends/platform/ds/arm9/source/ramsave.h b/backends/platform/ds/arm9/source/ramsave.h
deleted file mode 100644
index e74df94952..0000000000
--- a/backends/platform/ds/arm9/source/ramsave.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _RAMSAVE_H_
-#define _RAMSAVE_H_
-
-#include "common/system.h"
-#include "common/savefile.h"
-
-// SaveFileManager class
-
-#define DS_MAX_SAVE_SIZE 150000
-
-class DSSaveFile : public Common::InSaveFile, public Common::OutSaveFile {
-	int address;
-	int ptr;
-	bool ownsData;
-	bool saveCompressed;
-
-	struct SCUMMSave {
-		u32 magic;		// 4
-		bool isValid;	// 5
-		bool pad;		// 6
-		char name[16];	// 22
-		u32 size;		// 26
-		u32 compressedSize; // 30
-		u16 extraMagic;	// 32
-		u32 reserved;	// 36
-	} __attribute__ ((packed));
-
-	SCUMMSave save;
-	u8* saveData;
-	SCUMMSave* origHeader;
-	bool isOpenFlag;
-	bool isTempFile;
-	bool eosReached;
-
-public:
-	DSSaveFile();
-	DSSaveFile(SCUMMSave* s, bool saveCompressed, u8* data);
-	~DSSaveFile();
-
-	void reset();
-
-	bool isOpen() const { return isOpenFlag; }
-	virtual bool eos() const;
-	virtual void clearErr();
-	virtual bool skip(uint32 size);
-
-	virtual int32 pos() const;
-	virtual int32 size() const;
-	virtual bool seek(int32 pos, int whence);
-
-	uint32 read(void *buf, uint32 size);
-	uint32 write(const void *buf, uint32 size);
-
-	void setName(char *name);
-	char* getName() { return save.name; }
-
-	bool isValid() { return save.isValid; }
-	bool isTemp() { return isTempFile; }
-	bool matches(const char *prefix, int num);
-	bool matches(const char *filename);
-
-	void clearData();
-	void compress();
-
-	int getRamUsage() { return sizeof(save) + save.compressedSize; }
-	char* getRamImage() { return (char *) &save; }
-
-	int getSize() { return save.size; }
-
-	DSSaveFile* clone();
-
-	bool loadFromSaveRAM(vu8* address);
-	int saveToSaveRAM(vu8* address);
-
-
-
-	void deleteFile();
-
-	void operator delete(void *p) {
-//		consolePrintf("Finished! size=%d\n", ((DSSaveFile *) (p))->save->size);
-	}
-
-
-
-};
-
-
-
-class DSSaveFileManager : public Common::SaveFileManager {
-
-	DSSaveFile gbaSave[8];
-	static DSSaveFileManager* instancePtr;
-	int sramBytesFree;
-
-public:
-	DSSaveFileManager();
-	~DSSaveFileManager();
-
-	static DSSaveFileManager* instance() { return instancePtr; }
-
-	DSSaveFile *openSavefile(const char *filename, bool saveOrLoad);
-
-	virtual Common::OutSaveFile* openForSaving(const Common::String &filename) { return openSavefile(filename.c_str(), true); }
-	virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); }
-
-	virtual bool removeSavefile(const Common::String &filename);
-	virtual Common::StringArray listSavefiles(const Common::String &pattern);
-
-	void flushToSaveRAM();
-
-	void addBytesFree(int size) { sramBytesFree += size; }
-	int getBytesFree() { return sramBytesFree; }
-
-	void deleteFile(char* name);
-	void listFiles();
-	void formatSram();
-
-	void loadAllFromSRAM();
-
-	static bool isExtraDataPresent();
-	static int getExtraData();
-	static void setExtraData(int data);
-
-protected:
-	DSSaveFile *makeSaveFile(const Common::String &filename, bool saveOrLoad);
-};
-
-#endif
diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp
index e1ddaecc2c..f1e8ba4fb2 100644
--- a/backends/platform/ds/arm9/source/scummhelp.cpp
+++ b/backends/platform/ds/arm9/source/scummhelp.cpp
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -91,7 +94,8 @@ void updateStrings(byte gameId, byte version, Common::Platform platform,
 
 }
 
-}
+}	// End of namespace DS
+
 
 
 #undef ADD_BIND
diff --git a/backends/platform/ds/arm9/source/scummhelp.h b/backends/platform/ds/arm9/source/scummhelp.h
index 602cb5f788..4be28dca6a 100644
--- a/backends/platform/ds/arm9/source/scummhelp.h
+++ b/backends/platform/ds/arm9/source/scummhelp.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -31,6 +34,7 @@ namespace DS {
 void updateStrings(byte gameId, byte version, Common::Platform platform,
 			int page, Common::String &title, Common::String *&key, Common::String *&dsc);
 
-}
+}	// End of namespace DS
+
 
 #endif
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp
index 2d4b6a94f4..71f4f93c27 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.cpp
+++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp
@@ -20,6 +20,7 @@
  *
  */
 #include <nds.h>
+#include "NDS/scummvm_ipc.h"
 #include "touchkeyboard.h"
 #include "keyboard_raw.h"
 #include "keyboard_pal_raw.h"
@@ -43,124 +44,124 @@ struct key_data {
 #define DS_CAPSLOCK 1
 
 
-key_data keys[DS_NUM_KEYS] = {
+static key_data keys[DS_NUM_KEYS] = {
 	// Key number		x		y		character
 
 	// Numbers
-	{28,				3,		0,		'1'},
-	{29,				5,		0,		'2'},
-	{30,				7,		0,		'3'},
-	{31,				9,		0,		'4'},
-	{32,				11,		0,		'5'},
-	{33,				13,		0,		'6'},
-	{34,				15,		0,		'7'},
-	{35,				17,		0,		'8'},
-	{36,				19,		0,		'9'},
-	{27,				21,		0,		'0'},
-	{45,				23,		0,		Common::KEYCODE_MINUS},
-	{50,				25,		0,		Common::KEYCODE_EQUALS},
-	{52,				27,		0,		Common::KEYCODE_BACKSPACE},
+	{28,				3,		0,		'1', false},
+	{29,				5,		0,		'2', false},
+	{30,				7,		0,		'3', false},
+	{31,				9,		0,		'4', false},
+	{32,				11,		0,		'5', false},
+	{33,				13,		0,		'6', false},
+	{34,				15,		0,		'7', false},
+	{35,				17,		0,		'8', false},
+	{36,				19,		0,		'9', false},
+	{27,				21,		0,		'0', false},
+	{45,				23,		0,		Common::KEYCODE_MINUS, false},
+	{50,				25,		0,		Common::KEYCODE_EQUALS, false},
+	{52,				27,		0,		Common::KEYCODE_BACKSPACE, false},
 
 	// Top row
-	{'Q'-'A' + 1,		4,		2,		'Q'},
-	{'W'-'A' + 1,		6,		2,		'W'},
-	{'E'-'A' + 1,		8,		2,		'E'},
-	{'R'-'A' + 1,		10,		2,		'R'},
-	{'T'-'A' + 1,		12,		2,		'T'},
-	{'Y'-'A' + 1,		14,		2,		'Y'},
-	{'U'-'A' + 1,		16,		2,		'U'},
-	{'I'-'A' + 1,		18,		2,		'I'},
-	{'O'-'A' + 1,		20,		2,		'O'},
-	{'P'-'A' + 1,		22,		2,		'P'},
-	{43,				24,		2,		Common::KEYCODE_LEFTBRACKET},
-	{44,				26,		2,		Common::KEYCODE_RIGHTBRACKET},
+	{'Q'-'A' + 1,		4,		2,		'Q', false},
+	{'W'-'A' + 1,		6,		2,		'W', false},
+	{'E'-'A' + 1,		8,		2,		'E', false},
+	{'R'-'A' + 1,		10,		2,		'R', false},
+	{'T'-'A' + 1,		12,		2,		'T', false},
+	{'Y'-'A' + 1,		14,		2,		'Y', false},
+	{'U'-'A' + 1,		16,		2,		'U', false},
+	{'I'-'A' + 1,		18,		2,		'I', false},
+	{'O'-'A' + 1,		20,		2,		'O', false},
+	{'P'-'A' + 1,		22,		2,		'P', false},
+	{43,				24,		2,		Common::KEYCODE_LEFTBRACKET, false},
+	{44,				26,		2,		Common::KEYCODE_RIGHTBRACKET, false},
 
 	// Middle row
-	{55,				3,		4,		DS_CAPSLOCK},
-	{'A'-'A' + 1,		5,		4,		'A'},
-	{'S'-'A' + 1,		7,		4,		'S'},
-	{'D'-'A' + 1,		9,		4,		'D'},
-	{'F'-'A' + 1,		11,		4,		'F'},
-	{'G'-'A' + 1,		13,		4,		'G'},
-	{'H'-'A' + 1,		15,		4,		'H'},
-	{'J'-'A' + 1,		17,		4,		'J'},
-	{'K'-'A' + 1,		19,		4,		'K'},
-	{'L'-'A' + 1,		21,		4,		'L'},
-	{42,				23,		4,		Common::KEYCODE_SEMICOLON},
-	{41,				25,		4,		Common::KEYCODE_QUOTE},
-	{46,				27,		4,		Common::KEYCODE_RETURN},
+	{55,				3,		4,		DS_CAPSLOCK, false},
+	{'A'-'A' + 1,		5,		4,		'A', false},
+	{'S'-'A' + 1,		7,		4,		'S', false},
+	{'D'-'A' + 1,		9,		4,		'D', false},
+	{'F'-'A' + 1,		11,		4,		'F', false},
+	{'G'-'A' + 1,		13,		4,		'G', false},
+	{'H'-'A' + 1,		15,		4,		'H', false},
+	{'J'-'A' + 1,		17,		4,		'J', false},
+	{'K'-'A' + 1,		19,		4,		'K', false},
+	{'L'-'A' + 1,		21,		4,		'L', false},
+	{42,				23,		4,		Common::KEYCODE_SEMICOLON, false},
+	{41,				25,		4,		Common::KEYCODE_QUOTE, false},
+	{46,				27,		4,		Common::KEYCODE_RETURN, false},
 
 	// Bottom row
-	{51,				4,		6,		DS_SHIFT},
-	{'Z'-'A' + 1,		6,		6,		'Z'},
-	{'X'-'A' + 1,		8,		6,		'X'},
-	{'C'-'A' + 1,		10,		6,		'C'},
-	{'V'-'A' + 1,		12,		6,		'V'},
-	{'B'-'A' + 1,		14,		6,		'B'},
-	{'N'-'A' + 1,		16,		6,		'N'},
-	{'M'-'A' + 1,		18,		6,		'M'},
-	{38,				20,		6,		Common::KEYCODE_COMMA},
-	{39,				22,		6,		Common::KEYCODE_PERIOD},
-	{40,				24,		6,		Common::KEYCODE_SLASH},
+	{51,				4,		6,		DS_SHIFT, false},
+	{'Z'-'A' + 1,		6,		6,		'Z', false},
+	{'X'-'A' + 1,		8,		6,		'X', false},
+	{'C'-'A' + 1,		10,		6,		'C', false},
+	{'V'-'A' + 1,		12,		6,		'V', false},
+	{'B'-'A' + 1,		14,		6,		'B', false},
+	{'N'-'A' + 1,		16,		6,		'N', false},
+	{'M'-'A' + 1,		18,		6,		'M', false},
+	{38,				20,		6,		Common::KEYCODE_COMMA, false},
+	{39,				22,		6,		Common::KEYCODE_PERIOD, false},
+	{40,				24,		6,		Common::KEYCODE_SLASH, false},
 
 	// Space bar
-	{47,				9,		8,		Common::KEYCODE_SPACE},
-	{48,				11,		8,		Common::KEYCODE_SPACE},
-	{48,				13,		8,		Common::KEYCODE_SPACE},
-	{48,				15,		8,		Common::KEYCODE_SPACE},
-	{48,				17,		8,		Common::KEYCODE_SPACE},
-	{49,				19,		8,		Common::KEYCODE_SPACE},
+	{47,				9,		8,		Common::KEYCODE_SPACE, false},
+	{48,				11,		8,		Common::KEYCODE_SPACE, false},
+	{48,				13,		8,		Common::KEYCODE_SPACE, false},
+	{48,				15,		8,		Common::KEYCODE_SPACE, false},
+	{48,				17,		8,		Common::KEYCODE_SPACE, false},
+	{49,				19,		8,		Common::KEYCODE_SPACE, false},
 
 	// Cursor arrows
-	{52,				27,		8,		Common::KEYCODE_LEFT},
-	{54,				29,		8,		Common::KEYCODE_DOWN},
-	{53,				31,		8,		Common::KEYCODE_RIGHT},
-	{51,				29,		6,		Common::KEYCODE_UP},
+	{52,				27,		8,		Common::KEYCODE_LEFT, false},
+	{54,				29,		8,		Common::KEYCODE_DOWN, false},
+	{53,				31,		8,		Common::KEYCODE_RIGHT, false},
+	{51,				29,		6,		Common::KEYCODE_UP, false},
 
 	// Close button
-	{56,				30,		0,		Common::KEYCODE_INVALID},
+	{56,				30,		0,		Common::KEYCODE_INVALID, false},
 
 	// Function keys (needed for AGI)
-	{57,				4,		-2,		Common::KEYCODE_F1},
-	{58,				6,		-2,		Common::KEYCODE_F2},
-	{59,				8,		-2,		Common::KEYCODE_F3},
-	{60,				10,		-2,		Common::KEYCODE_F4},
-	{61,				14,		-2,		Common::KEYCODE_F5},
-	{62,				16,		-2,		Common::KEYCODE_F6},
-	{63,				18,		-2,		Common::KEYCODE_F7},
-	{64,				20,		-2,		Common::KEYCODE_F8},
-	{65,				24,		-2,		Common::KEYCODE_F9},
-	{66,				26,		-2,		Common::KEYCODE_F10},
-	{67,				28,		-2,		Common::KEYCODE_F11},
-	{68,				30,		-2,		Common::KEYCODE_F12},
+	{57,				4,		-2,		Common::KEYCODE_F1, false},
+	{58,				6,		-2,		Common::KEYCODE_F2, false},
+	{59,				8,		-2,		Common::KEYCODE_F3, false},
+	{60,				10,		-2,		Common::KEYCODE_F4, false},
+	{61,				14,		-2,		Common::KEYCODE_F5, false},
+	{62,				16,		-2,		Common::KEYCODE_F6, false},
+	{63,				18,		-2,		Common::KEYCODE_F7, false},
+	{64,				20,		-2,		Common::KEYCODE_F8, false},
+	{65,				24,		-2,		Common::KEYCODE_F9, false},
+	{66,				26,		-2,		Common::KEYCODE_F10, false},
+	{67,				28,		-2,		Common::KEYCODE_F11, false},
+	{68,				30,		-2,		Common::KEYCODE_F12, false},
 
 };
 
-int keyboardX;
-int keyboardY;
+static int keyboardX;
+static int keyboardY;
 
-int mapBase;
-int tileBase;
+static int s_mapBase;
+static int s_tileBase;
 
-u16* baseAddress;
+static u16 *baseAddress;
 
-bool shiftState;
-bool capsLockState;
+static bool shiftState;
+static bool capsLockState;
 
-bool closed;
+static bool closed;
 
-char autoCompleteWord[NUM_WORDS][32];
-int autoCompleteCount;
+static char autoCompleteWord[NUM_WORDS][32];
+static int autoCompleteCount;
 
-char autoCompleteBuffer[128];
+static char autoCompleteBuffer[128];
 
-int selectedCompletion = -1;
-int charactersEntered = 0;
-int typingTimeout = 0;
+static int selectedCompletion = -1;
+static int charactersEntered = 0;
+static int typingTimeout = 0;
 
 // Render text onto the tiled screen
 
-void drawText(int tx, int ty, char* string, bool highlight) {
+void drawText(int tx, int ty, const char *string, bool highlight) {
 
 	u16 baseValue = 0;
 
@@ -181,7 +182,7 @@ void drawText(int tx, int ty, char* string, bool highlight) {
 
 
 
-void restoreVRAM(int tileBase, int mapBase, u16* saveSpace) {
+void restoreVRAM(int tileBase, int mapBase, u16 *saveSpace) {
 /*	for (int r = 0; r < 32 * 32; r++) {
 		((u16 *) SCREEN_BASE_BLOCK_SUB(mapBase))[r] = *saveSpace++;
 	}
@@ -191,7 +192,7 @@ void restoreVRAM(int tileBase, int mapBase, u16* saveSpace) {
 	}*/
 }
 
-void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) {
+void drawKeyboard(int tileBase, int mapBase, u16 *saveSpace) {
  	/* int keyboardDataSize = 4736 * 2; */
 
 	for (int r = 0; r < 32 * 32; r++) {
@@ -211,8 +212,8 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) {
 	// this is the font
 	for (int tile = 0; tile < 94; tile++) {
 
-		u16* tileAddr = (u16 *) (CHAR_BASE_BLOCK_SUB(tileBase) + ((KEYBOARD_DATA_SIZE) + (tile * 32)));
-		u8* src = ((u8 *) (::_8x8font_tga_raw)) + 18 + tile * 8;
+		u16 *tileAddr = (u16 *) (CHAR_BASE_BLOCK_SUB(tileBase) + ((KEYBOARD_DATA_SIZE) + (tile * 32)));
+		const u8 *src = ((const u8 *) (::_8x8font_tga_raw)) + 18 + tile * 8;
 
 		for (int y = 0 ; y < 8; y++) {
 			for (int x = 0; x < 2; x++) {
@@ -247,8 +248,8 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) {
 	keyboardX = -2;
 	keyboardY = 2;
 
-	DS::mapBase = mapBase;
-	DS::tileBase = tileBase;
+	DS::s_mapBase = mapBase;
+	DS::s_tileBase = tileBase;
 
 	shiftState = false;
 	capsLockState = false;
@@ -256,7 +257,7 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) {
 	int x = keyboardX;
 	int y = keyboardY;
 
-	u16* base = ((u16 *) SCREEN_BASE_BLOCK_SUB(mapBase));
+	u16 *base = ((u16 *) SCREEN_BASE_BLOCK_SUB(mapBase));
 	baseAddress = base;
 
 	for (int r = 0; r < DS_NUM_KEYS; r++) {
@@ -314,7 +315,7 @@ bool getKeyboardClosed() {
 }
 
 void setKeyHighlight(int key, bool highlight) {
-	u16* base = ((u16 *) SCREEN_BASE_BLOCK_SUB(DS::mapBase));
+	u16 *base = ((u16 *) SCREEN_BASE_BLOCK_SUB(DS::s_mapBase));
 
 	if (highlight) {
 		base[(keyboardY + keys[key].y) * 32 + keyboardX + keys[key].x] |= 0x1000;
@@ -329,7 +330,7 @@ void setKeyHighlight(int key, bool highlight) {
 	}
 }
 
-void addAutoComplete(const char* word) {
+void addAutoComplete(const char *word) {
 	if (autoCompleteCount == NUM_WORDS) return;
 	strcpy(&autoCompleteWord[autoCompleteCount++][0], word);
 	drawAutoComplete();
@@ -353,7 +354,7 @@ void clearAutoComplete() {
 
 void typeCompletion(int current) {
 	Common::Event event;
-   	/* OSystem_DS* system = OSystem_DS::instance(); */
+	/* OSystem_DS *system = OSystem_DS::instance(); */
 
 	strcat(autoCompleteBuffer, &autoCompleteWord[current][charactersEntered]);
 	strcat(autoCompleteBuffer, " ");
@@ -384,7 +385,7 @@ void typeCompletion(int current) {
 void updateTypeEvents() {
 	if (autoCompleteBuffer[0] != '\0') {
 		Common::Event event;
-   		OSystem_DS* system = OSystem_DS::instance();
+		OSystem_DS *system = OSystem_DS::instance();
 
 		event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0];
 		event.kbd.ascii = autoCompleteBuffer[0];
@@ -395,8 +396,7 @@ void updateTypeEvents() {
 		event.type = Common::EVENT_KEYUP;
 		system->addEvent(event);
 
-		for (int r = 0; r < (int)strlen(autoCompleteBuffer); r++)
-		{
+		for (int r = 0; r < (int)strlen(autoCompleteBuffer); r++) {
 			autoCompleteBuffer[r] = autoCompleteBuffer[r + 1];
 		}
 
@@ -404,8 +404,7 @@ void updateTypeEvents() {
 	}
 }
 
-void createKeyEvent(int keyNum, Common::Event& event)
-{
+void createKeyEvent(int keyNum, Common::Event& event) {
 	event.kbd.flags = 0;
 
 	if ((keys[keyNum].character >= '0') && (keys[keyNum].character <= '9')) {
@@ -443,7 +442,7 @@ void releaseAllKeys() {
 		if (keys[r].pressed) {
 			DS::setKeyHighlight(r, false);
 
-			OSystem_DS* system = OSystem_DS::instance();
+			OSystem_DS *system = OSystem_DS::instance();
 
 			Common::Event event;
 			createKeyEvent(r, event);
@@ -502,7 +501,7 @@ void addKeyboardEvents() {
 		for (int r = 0; r < DS_NUM_KEYS; r++) {
 			if (( (tx >= keys[r].x) && (tx <= keys[r].x + 1)) &&
 				   (ty >= keys[r].y) && (ty <= keys[r].y + 1)) {
-			   	OSystem_DS* system = OSystem_DS::instance();
+				OSystem_DS *system = OSystem_DS::instance();
 				Common::Event event;
 
 //				consolePrintf("Key: %d\n", r);
@@ -551,7 +550,7 @@ void addKeyboardEvents() {
 			if (keys[r].pressed) {
 				DS::setKeyHighlight(r, false);
 
-			   	OSystem_DS* system = OSystem_DS::instance();
+				OSystem_DS *system = OSystem_DS::instance();
 
 				Common::Event event;
 				if ((keys[r].character == Common::KEYCODE_INVALID)) {
@@ -586,5 +585,4 @@ void addKeyboardEvents() {
 
 }
 
-}
-
+}	// End of namespace DS
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.h b/backends/platform/ds/arm9/source/touchkeyboard.h
index 6ceb83bfc7..7644e48bff 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.h
+++ b/backends/platform/ds/arm9/source/touchkeyboard.h
@@ -8,15 +8,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
@@ -27,23 +30,25 @@
 
 namespace DS {
 
-static const int NUM_WORDS = 12;
-static const int KEYBOARD_DATA_SIZE = 4736 * 2;
-static const int KEYBOARD_BOTTOM_Y = 105;
+enum {
+	NUM_WORDS = 12,
+	KEYBOARD_DATA_SIZE = 4736 * 2,
+	KEYBOARD_BOTTOM_Y = 105
+};
 
 void createKeyEvent(int keyNum, Common::Event& event);
 
-void drawKeyboard(int tileBase, int mapBase, u16* saveSpace);
-void restoreVRAM(int tileBase, int mapBase, u16* saveSpace);
+void drawKeyboard(int tileBase, int mapBase, u16 *saveSpace);
+void restoreVRAM(int tileBase, int mapBase, u16 *saveSpace);
 void addKeyboardEvents();
 bool getKeyboardClosed();
 bool isInsideKeyboard(int x, int y);
 
-void addAutoComplete(const char* word);
+void addAutoComplete(const char *word);
 void clearAutoComplete();
 void setCharactersEntered(int count);
 void releaseAllKeys();
 
-}
+}	// End of namespace DS
 
 #endif
diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp
index 035f6a631d..43a16486c5 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.cpp
+++ b/backends/platform/ds/arm9/source/wordcompletion.cpp
@@ -1,3 +1,28 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
 #include "wordcompletion.h"
 #include "osystem_ds.h"
 #include "engines/agi/agi.h"	// Caution for #define for NUM_CHANNELS, causes problems in mixer_intern.h
@@ -14,7 +39,7 @@ namespace DS {
 char wordBuffer[WORD_BUFFER_SIZE];
 int wordBufferPos = 0;
 
-char* wordBufferPtr[MAX_WORD_COUNT];
+char *wordBufferPtr[MAX_WORD_COUNT];
 int wordBufferPtrPos = 0;
 
 void addAutoCompleteLine(const char *line) {
@@ -53,7 +78,7 @@ void addAutoCompleteLine(const char *line) {
 	}
 }
 
-int stringCompare(const void* a, const void* b) {
+int stringCompare(const void *a, const void *b) {
 	const char** as = (const char **) a;
 	const char** bs = (const char **) b;
 
@@ -71,7 +96,7 @@ void sortAutoCompleteWordList() {
 }
 
 // Sends the current available words to the virtual keyboard code for display
-bool findWordCompletions(const char* input) {
+bool findWordCompletions(const char *input) {
 	int min = 0;
 	int max = wordBufferPtrPos - 1;
 	char *word;
@@ -82,7 +107,7 @@ bool findWordCompletions(const char* input) {
 	if (wordBufferPtrPos == 0)
 		return false;
 
-	OSystem_DS* system = (OSystem_DS *) g_system;
+	OSystem_DS *system = (OSystem_DS *) g_system;
 	system->clearAutoComplete();
 
 	int start = 0;
@@ -176,5 +201,6 @@ bool findWordCompletions(const char* input) {
 
 }
 
-}
+}	// End of namespace DS
+
 #endif
diff --git a/backends/platform/ds/arm9/source/wordcompletion.h b/backends/platform/ds/arm9/source/wordcompletion.h
index e50bade37b..55a0bc8b5a 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.h
+++ b/backends/platform/ds/arm9/source/wordcompletion.h
@@ -1,3 +1,28 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
 namespace DS {
 
 extern void clearAutoCompleteWordList();
@@ -5,4 +30,4 @@ extern bool findWordCompletions(const char *input);
 extern void addAutoCompleteLine(const char *line);
 extern void sortAutoCompleteWordList();
 
-}
+}	// End of namespace DS
diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp
index fd6da4e9b9..d4f055ee82 100644
--- a/backends/platform/ds/arm9/source/zipreader.cpp
+++ b/backends/platform/ds/arm9/source/zipreader.cpp
@@ -8,19 +8,23 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
 
+#include "common/scummsys.h"
 #include "zipreader.h"
 
 ZipFile::ZipFile() {
@@ -28,7 +32,7 @@ ZipFile::ZipFile() {
 
 //	consolePrintf("ZIP file check...");
 
-	char* p = (char *) ZF_SEARCH_START;
+	char *p = (char *) ZF_SEARCH_START;
 	bool found = false;
 
 	_zipFile = NULL;
@@ -75,7 +79,6 @@ bool ZipFile::restartFile() {
 	bool more = true;
 
 	while (!currentFileInFolder() && more) {
-		char name[128];
 		getFileName(name);
 		more = skipFile();
 	}
@@ -112,7 +115,7 @@ bool ZipFile::currentFileInFolder() {
 	return false;
 }
 
-void ZipFile::getFileName(char* name) {
+void ZipFile::getFileName(char *name) {
 	strncpy(name, (char *) (_currentFile + 1), _currentFile->nameLength);
 
 	for (int r = 0; name[r] != 0; r++) {
@@ -207,7 +210,7 @@ void ZipFile::changeToRoot() {
 	_directory[0] = 0;
 }
 
-void ZipFile::changeDirectory(const char* dir) {
+void ZipFile::changeDirectory(const char *dir) {
 //	consolePrintf("Current dir now '%s'\n", dir);
 
 	assert(dir && *dir);
diff --git a/backends/platform/ds/arm9/source/zipreader.h b/backends/platform/ds/arm9/source/zipreader.h
index d1f70942ce..5429954088 100644
--- a/backends/platform/ds/arm9/source/zipreader.h
+++ b/backends/platform/ds/arm9/source/zipreader.h
@@ -8,21 +8,26 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
 #ifndef _ZIPREADER_H_
 #define _ZIPREADER_H_
-#include "portdefs.h"
+
+#include <nds/ndstypes.h>
+
 #define ZF_SEARCH_START 0x08000000
 #define ZF_SEARCH_END 0x09000000
 #define ZF_SEARCH_STRIDE 16
@@ -43,12 +48,12 @@ class ZipFile {
 		u16 extraLength;	// Length of any extra data
 	} __attribute__ ((packed));
 
-	char* _zipFile;
+	char *_zipFile;
 	char _directory[128];
 
 	bool _allFilesVisible;
 
-	FileHeader* _currentFile;
+	FileHeader *_currentFile;
 
 public:
 	ZipFile();
@@ -61,13 +66,13 @@ public:
 	bool findFile(const char *search);
 
 	// These return the file's data and information
-	char* getFile();
+	char *getFile();
 	int getFileSize();
-	void getFileName(char* name);
+	void getFileName(char *name);
 	bool isDirectory();
 
 	// These set the current directory
-	void changeDirectory(const char* name);
+	void changeDirectory(const char *name);
 	void changeToRoot();
 	void setAllFilesVisible(bool state) { _allFilesVisible = state; }
 
diff --git a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
index f41548f400..cf6436634a 100644
--- a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
+++ b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
@@ -33,34 +33,32 @@
 //////////////////////////////////////////////////////////////////////
 
 
-typedef struct sTransferSoundData {
-//---------------------------------------------------------------------------------
-        const void *data;
-        u32 len;
-        u32 rate;
-        u8 vol;
-        u8 pan;
-        u8 format;
-        u8 PADDING;
-} TransferSoundData, * pTransferSoundData;
+typedef struct {
+	const void *data;
+	u32 len;
+	u32 rate;
+	u8 vol;
+	u8 pan;
+	u8 format;
+	u8 PADDING;
+} TransferSoundData;
 
 
 
 
 //---------------------------------------------------------------------------------
-typedef struct sTransferSound {
-//---------------------------------------------------------------------------------
-  TransferSoundData data[16];
-  u8 count;
-  u8 PADDING[3];
-} TransferSound, * pTransferSound;
+typedef struct {
+	TransferSoundData data[16];
+	u8 count;
+	u8 PADDING[3];
+} TransferSound;
 
 
 
-typedef struct _adpcmBuffer {
-	u8* buffer[8];
+typedef struct {
+	u8 *buffer[8];
 	bool filled[8];
-	u8* arm7Buffer[8];
+	u8 *arm7Buffer[8];
 	bool arm7Dirty[8];
 	bool semaphore;
 } adpcmBuffer;
@@ -82,22 +80,22 @@ typedef struct scummvmTransferRegion {
     uint8 curtime[8];        // current time response from RTC
 
     struct {
-      u8 rtc_command;
-      u8 rtc_year;           //add 2000 to get 4 digit year
-      u8 rtc_month;          //1 to 12
-      u8 rtc_day;            //1 to (days in month)
-
-      u8 rtc_incr;
-      u8 rtc_hours;          //0 to 11 for AM, 52 to 63 for PM
-      u8 rtc_minutes;        //0 to 59
-      u8 rtc_seconds;        //0 to 59
-    };
+      u8 command;
+      u8 year;           //add 2000 to get 4 digit year
+      u8 month;          //1 to 12
+      u8 day;            //1 to (days in month)
+
+      u8 incr;
+      u8 hours;          //0 to 11 for AM, 52 to 63 for PM
+      u8 minutes;        //0 to 59
+      u8 seconds;        //0 to 59
+    } rtc;
   };
 
   uint16 battery;            // battery life ??  hopefully.  :)
   uint16 aux;                // i have no idea...
 
-  pTransferSound soundData;
+  TransferSound *soundData;
 
   adpcmBuffer adpcm;
 
@@ -127,7 +125,7 @@ typedef struct scummvmTransferRegion {
   // Streaming sound
   bool streamFillNeeded[4];
   int streamPlayingSection;
-} scummTransferRegion, * pscummTransferRegion;
+} scummTransferRegion;
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index aeba1820c6..a9ed3e0096 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -1,44 +1,165 @@
-# Repeat "all" target here, to make sure it is the first target
-# Currently disabled, so only arm7.bin gets build
-#all:
+# To approximate the DS builds A, B, C, ... run our configure like this
+#   configure --host=ds --disable-translation --disable-all-engines OPTIONS
+# where OPTIONS is...
+# build A:  --enable-scumm
+# build B:  --enable-sky --enable-queen
+# build C:  --enable-agos
+# build D:  --enable-gob --enable-cine --enable-agi
+# build E:  --enable-saga --disable-mad
+# build F:  --enable-kyra --disable-mad
+# build G:  --enable-lure
+# build H:  --enable-parallaction
+# build I:  --enable-made --disable-mad
+# build K:  --enable-cruise --disable-mad
+#
+# However, this could be automated using a simple script, which generates
+# subdirs for each build, and runs configure in those subdirs with the right
+# parameters (all builds would still share the same set of source code files,
+# thanks to our "out of tree" building support).
+#
+# This does not currently take care of some things:
+# * It does not #define DS_BUILD_A etc. -- most uses of that should be
+#   eliminated, though. Only usage should be for selecting the default config
+#   file (and for that we should really rather allow overriding the value of
+#   DEFAULT_CONFIG_FILE).
+#   There are a few game specific hacks which are currently controlled by this,
+#   too; we need to investigate those.
+# * It does not currently adjust the logo. Ideally, if we ever get real plugin
+#   support, that should be necessary anymore anyway.
+# * No support for USE_DEBUGGER and USE_PROFILER yet. I envision that we would
+#  integrate them with the --enable-debug and --enable-profiling configure options,
+#  I simply haven't gotten around to do that yet.
+# * ...
+
+# Set location of ndsdir so that we can easily refer to files in it
+ndsdir = backends/platform/ds
+
+
+# Until we fix logo support, always use the A logo
+LOGO = logoa.bmp
+
+# Uncomment the following line to enable support for the
+# ace DS Debugger (remembering to make the same change in the arm7 makefile):
+#USE_DEBUGGER = 1
+# TODO: Need to reimplement this (for arm9 and arm7).
+#ifdef USE_DEBUGGER
+#	DEFINES += -DUSE_DEBUGGER
+#	CFLAGS += -g
+#endif
+
+# Uncomment the following line to enable the profiler
+#USE_PROFILER = 1
+# TODO: Need to reimplement this; and maybe replace it by the --enable-profiling
+#       configure directive. Below is USE_PROFILER related code from the old NDS
+#       build system:
+#ifdef USE_PROFILER
+#	CFLAGS += -mpoke-function-name -finstrument-functions -g
+#	DEFINES += -DUSE_PROFILER
+#endif
+# And this for module.mk:
+#ifdef USE_PROFILER
+#	PORT_OBJS += arm9/source/profiler/cyg-profile.o
+#endif
+
+
+
+# NOTE: The header and libs for the debugger is assumed to be in the libnds
+# folder.
+
 
+ifdef WRAP_MALLOC
+	LDFLAGS += -Wl,--wrap,malloc
+	DEFINES += -DWRAP_MALLOC
+endif
 
 
-# Files in this list will be optimisied for speed, otherwise they will be optimised for space
-OPTLIST := actor.cpp ds_main.cpp osystem_ds.cpp blitters.cpp fmopl.cpp rate.cpp isomap.cpp image.cpp gfx.cpp sprite.cpp actor_path.cpp actor_walk.cpp
-#OPTLIST :=
 
 # Compiler options for files which should be optimised for speed
-OPT_SPEED := -O3
+OPT_SPEED := -O3 -mno-thumb
 
 # Compiler options for files which should be optimised for space
 OPT_SIZE := -Os -mthumb
 
+# By default optimize for size
+CXXFLAGS += $(OPT_SIZE)
+
+# Files listed below will be optimisied for speed, otherwise they will be optimised for space.
+# TODO: Several of these files probably should not be optimized for speed, but for now
+# we replicate the *precise* list from the old DS makefile, to ensure full compatibility.
+# Eventually, we should tune this list.
+$(ndsdir)/arm9/source/blitters.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+$(ndsdir)/arm9/source/dsmain.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+$(ndsdir)/arm9/source/osystem_ds.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+base/main.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+sound/rate.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+sound/softsynth/opl/mame.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/agi/sprite.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/agos/gfx.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/agos/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/cine/gfx.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/cruise/actor.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/cruise/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/draci/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/draci/sprite.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/gob/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/groovie/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/kyra/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/m4/actor.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/m4/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/m4/sprite.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/made/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/actor_path.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/actor_walk.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/actor.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/gfx.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/image.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/isomap.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/saga/sprite.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/sci/engine/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/scumm/actor.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/scumm/gfx.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/scumm/script.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/sword2/sprite.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+engines/teenagent/actor.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
+# TODO: Fingolfin says: optimizing kyra/staticres.o for size would
+# save about 30k, so maybe consider that?
+#engines/kyra/staticres.o: CXXFLAGS:=$(CXXFLAGS) $(OPT_SPEED)
 
-#-mthumb -fno-gcse -fno-schedule-insns2
 
 
-OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
+#############################################################################
+#
+# ARM9 rules.
+#
+#############################################################################
+
+all: scummvm.nds scummvm.ds.gba
 
+clean: dsclean
 
-# TODO: Handle files in OPTLIST.
-#   For this, the list should be made explicit. So, replace actor.cpp by path/to/actor.cpp --
-#   in fact, there are several actor.cpp files, and right now all are "optimized", but
-#   I think Neil only had the SAGA one in mind. Same for gfx.cpp
+dsclean:
+	$(RM) $(addprefix $(ndsdir)/, $(ARM7_MODULE_OBJS)) scummvm.nds scummvm.ds.gba
 
+.PHONY: dsclean
 
+# TODO: Add a 'dsdist' target ?
 
+%.bin: %.elf
+	$(OBJCOPY) -S -O binary $< $@
 
+%.nds: %.bin $(ndsdir)/arm7/arm7.bin
+	ndstool -c $@ -9 $< -7 $(ndsdir)/arm7/arm7.bin -b $(srcdir)/$(ndsdir)/$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"
 
+%.ds.gba: %.nds
+	dsbuild $< -o $@ -l $(srcdir)/$(ndsdir)/arm9/ndsloader.bin
+	padbin 16 $@
 
 #############################################################################
 #############################################################################
 #############################################################################
 
 
-#ndsdir = $(srcdir)/backends/platform/ds
-ndsdir = backends/platform/ds
-
 #############################################################################
 #
 # ARM7 rules.
@@ -47,12 +168,6 @@ ndsdir = backends/platform/ds
 #
 #############################################################################
 
-$(ndsdir)/arm7/arm7.bin: $(ndsdir)/arm7/arm7.elf
-
-$(ndsdir)/arm7/arm7.elf: \
-	$(ndsdir)/arm7/source/libcartreset/cartreset.o \
-	$(ndsdir)/arm7/source/main.o
-
 # HACK/FIXME: C compiler, for cartreset.c -- we should switch this to use CXX
 # as soon as possible.
 CC := $(DEVKITARM)/bin/arm-eabi-gcc
@@ -65,7 +180,7 @@ OBJCOPY := $(DEVKITARM)/bin/arm-eabi-objcopy
 #
 ARM7_ARCH	:=	-mthumb-interwork
 
-# note: arm9tdmi isn't the correct CPU arch, but anything newer and LD
+# note: arm7tdmi isn't the correct CPU arch, but anything newer and LD
 # *insists* it has a FPU or VFP, and it won't take no for an answer!
 ARM7_CFLAGS	:=	-g -Wall -O2\
 		-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
@@ -89,7 +204,6 @@ ARM7_LDFLAGS	:= -g $(ARM7_ARCH) -mno-fpu
 	$(MKDIR) $(*D)/$(DEPDIR)
 	$(CC) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
-
 # Set custom build flags for cartreset.o
 $(ndsdir)/arm7/source/libcartreset/cartreset.o: CXXFLAGS=$(ARM7_CFLAGS)
 $(ndsdir)/arm7/source/libcartreset/cartreset.o: CPPFLAGS=
@@ -98,14 +212,28 @@ $(ndsdir)/arm7/source/libcartreset/cartreset.o: CPPFLAGS=
 $(ndsdir)/arm7/source/main.o: CXXFLAGS=$(ARM7_CXXFLAGS)
 $(ndsdir)/arm7/source/main.o: CPPFLAGS=
 
+# Rule for creating ARM7 .elf files by linking .o files together with a special linker script
+$(ndsdir)/arm7/arm7.elf: \
+	$(ndsdir)/arm7/source/libcartreset/cartreset.o \
+	$(ndsdir)/arm7/source/main.o
+	$(CXX) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7  -o $@
+
 # Rule for creating ARM7 .bin files from .elf files
-%.bin: %.elf
-	@echo ------
-	@echo Building $@...
+$(ndsdir)/arm7/arm7.bin: $(ndsdir)/arm7/arm7.elf
 	$(OBJCOPY) -O binary  $< $@
 
-# Rule for creating ARM7 .elf files by linking .o files together with a special linker script
-%.elf:
-	@echo ------
-	@echo Building $@...
-	$(CXX)  $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L/opt/devkitPro/libnds/lib -lnds7  -o $@
+
+
+
+
+
+
+# Command to build libmad is:
+# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork'
+#
+# I actually had to use
+# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' LDFLAGS='C:/Progra~1/devkitpro/libnds/lib/libnds9.a' --disable-shared --disable-debugging
+#
+# Fingolfin used
+# CXX=arm-eabi-g++ CC=arm-eabi-gcc ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' --disable-shared --disable-debugging LDFLAGS=$DEVKITPRO/libnds/lib/libnds9.a
+
diff --git a/backends/platform/ds/makefile b/backends/platform/ds/makefile
index f6f9033161..58d6fd4c02 100644
--- a/backends/platform/ds/makefile
+++ b/backends/platform/ds/makefile
@@ -1,6 +1,8 @@
 #SUBDIRS:= `ls | egrep -v '^(CVS|tools)$$'`
 
 
+
+
 export PATH	:=	$(DEVKITARM)/bin:$(PATH)
 
 export portdir = $(CURDIR)/arm9
@@ -22,25 +24,43 @@ export:
 allbuilds:
 	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=a
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=b
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=c
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=d
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=e
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=f
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=g
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=h
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=i
+	$(MAKE) semiclean
 	$(MAKE) all       SCUMM_BUILD=k
 
 allbuildssafe:
 	$(MAKE) clean     SCUMM_BUILD=a
 	$(MAKE) all       SCUMM_BUILD=a
+	$(MAKE) clean     SCUMM_BUILD=b
 	$(MAKE) all       SCUMM_BUILD=b
+	$(MAKE) clean     SCUMM_BUILD=c
 	$(MAKE) all       SCUMM_BUILD=c
+	$(MAKE) clean     SCUMM_BUILD=d
 	$(MAKE) all       SCUMM_BUILD=d
+	$(MAKE) clean     SCUMM_BUILD=e
 	$(MAKE) all       SCUMM_BUILD=e
+	$(MAKE) clean     SCUMM_BUILD=f
 	$(MAKE) all       SCUMM_BUILD=f
+	$(MAKE) clean     SCUMM_BUILD=g
 	$(MAKE) all       SCUMM_BUILD=g
+	$(MAKE) clean     SCUMM_BUILD=h
 	$(MAKE) all       SCUMM_BUILD=h
+	$(MAKE) clean     SCUMM_BUILD=i
 	$(MAKE) all       SCUMM_BUILD=i
+	$(MAKE) clean     SCUMM_BUILD=k
 	$(MAKE) all       SCUMM_BUILD=k
diff --git a/backends/platform/ds/module.mk b/backends/platform/ds/module.mk
index f2640c49e3..7298267db4 100644
--- a/backends/platform/ds/module.mk
+++ b/backends/platform/ds/module.mk
@@ -8,18 +8,15 @@ PORT_OBJS := \
 	arm9/source/blitters_arm.o \
 	arm9/source/cdaudio.o \
 	arm9/source/dsmain.o \
-	../../fs/ds/ds-fs.o \
 	arm9/source/gbampsave.o \
 	arm9/source/scummhelp.o \
 	arm9/source/osystem_ds.o \
-	arm9/source/ramsave.o \
 	arm9/source/touchkeyboard.o \
 	arm9/source/zipreader.o \
 	arm9/source/dsoptions.o \
 	arm9/source/keys.o \
 	arm9/source/wordcompletion.o \
-	arm9/source/interrupt.o \
-	arm9/source/dsloader.o
+	arm9/source/interrupt.o
 
 DATA_OBJS := \
 	arm9/data/icons.o \
@@ -28,9 +25,9 @@ DATA_OBJS := \
 	arm9/data/default_font.o \
 	arm9/data/8x8font_tga.o
 
-COMPRESSOR_OBJS := #arm9/source/compressor/lz.o
-
-FAT_OBJS :=  arm9/source/fat/disc_io.o arm9/source/fat/gba_nds_fat.o\
+FAT_OBJS := \
+	arm9/source/fat/disc_io.o \
+	arm9/source/fat/gba_nds_fat.o \
 	arm9/source/fat/io_fcsr.o \
 	arm9/source/fat/io_m3cf.o \
 	arm9/source/fat/io_mpcf.o \
@@ -47,16 +44,7 @@ FAT_OBJS :=  arm9/source/fat/disc_io.o arm9/source/fat/gba_nds_fat.o\
 	arm9/source/fat/m3sd.o
 
 
-#	arm9/source/fat/io_cf_common.o arm9/source/fat/io_m3_common.o\
-#	arm9/source/fat/io_sd_common.o arm9/source/fat/io_scsd_s.o \
-#	arm9/source/fat/io_sc_common.o arm9/source/fat/io_sd_common.o
-
-LIBCARTRESET_OBJS := \
-#	arm9/source/libcartreset/cartreset.o
-
-
-#MODULE_OBJS := $(PORT_OBJS) $(DATA_OBJS) $(FAT_OBJS)
-MODULE_OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
+MODULE_OBJS := $(DATA_OBJS) $(PORT_OBJS) $(FAT_OBJS)
 
 
 #---------------------------------------------------------------------------------
@@ -110,12 +98,10 @@ $(MODULE)/arm9/source/touchkeyboard.o: \
 
 
 MODULE_DIRS += \
-	backends/platform/ds/ \
 	backends/platform/ds/arm7/source/ \
 	backends/platform/ds/arm7/source/libcartreset/ \
-	backends/platform/ds/arm9/source/ \
-	backends/platform/ds/arm9/source/fat/ \
-	backends/platform/ds/arm9/source/libcartreset/
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/ds/setup-builddirs.sh b/backends/platform/ds/setup-builddirs.sh
new file mode 100755
index 0000000000..11aacc1233
--- /dev/null
+++ b/backends/platform/ds/setup-builddirs.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# TODO: Allow specifying (a list of) build ids (a, b, ...) on the command line.
+# TODO: Allow overriding the LOGO variable
+
+# TODO: Computer srcdir in a better way
+srcdir=../../../`dirname $0`/..
+
+BASE_PARAM="--host=ds --disable-translation --disable-debug --disable-all-engines"
+
+for build in a b c d e f g h i k; do
+	echo "--- Setting up build $build ---"
+	mkdir -p build-$build && cd build-$build
+	case $build in
+	a)
+		EXTRA_PARAM="--enable-scumm"
+		;;
+	b)
+		EXTRA_PARAM="--enable-sky --enable-queen"
+		;;
+	c)
+		EXTRA_PARAM="--enable-agos"
+		;;
+	d)
+		EXTRA_PARAM="--enable-gob --enable-cine --enable-agi"
+		;;
+	e)
+		EXTRA_PARAM="--enable-saga --disable-mad"
+		;;
+	f)
+		EXTRA_PARAM="--enable-kyra --disable-mad"
+		;;
+	g)
+		EXTRA_PARAM="--enable-lure"
+		;;
+	h)
+		EXTRA_PARAM="--enable-parallaction"
+		;;
+	i)
+		EXTRA_PARAM="--enable-made --disable-mad"
+		;;
+	k)
+		EXTRA_PARAM="--enable-cruise --disable-mad"
+		;;
+	*)
+		echo "Invalid build $build selected"
+		exit 1
+		;;
+	esac
+
+	defname="DS_BUILD_`echo $build | tr '[a-z]' '[A-Z]'`"
+	CPPFLAGS="$CPPFLAGS -D$defname"
+	$srcdir/configure $BASE_PARAM $EXTRA_PARAM
+	cd ..
+	echo DONE
+	echo
+done
diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index c68c62191b..d17f8bd831 100755
--- a/backends/platform/gp2x/build/bundle.sh
+++ b/backends/platform/gp2x/build/bundle.sh
@@ -1,52 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 echo Quick script to make building a distribution of the GP2X port more consistent.
 
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
-export CXX=arm-open2x-linux-g++
-export CXXFLAGS=-march=armv4t
-export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
-export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+cd ../../../..
 
-echo Collecting files.
-mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`"
-mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/saves"
-mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/plugins"
-mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data"
+echo Building ScummVM for GP2X Wiz.
 
-echo "Please put your save games in this dir" >> "scummvm-gp2x-`date '+%Y-%m-%d'`/saves/PUT_SAVES_IN_THIS_DIR"
+make gp2x-bundle
 
-cp ./scummvm.gpe ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ./scummvm.png ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ./README-GP2X ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ./mmuhack.o ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../scummvm.gp2x ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../AUTHORS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../README ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../COPYING ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../COPYRIGHT ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../NEWS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../gui/themes/scummmodern.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../dists/pred.dic ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../dists/engine-data/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data
-cp ../../../../plugins/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/plugins
-
-echo Making Stripped GPE.
-arm-open2x-linux-strip ./scummvm-gp2x-`date '+%Y-%m-%d'`/scummvm.gp2x
-
-echo Building ZIP bundle.
-if [ -f /usr/bin/zip ]
-	then
-		rm ./"scummvm-gp2x-`date '+%Y-%m-%d'`.zip"
-		cd "scummvm-gp2x-`date '+%Y-%m-%d'`"
-		zip -r -9 "../scummvm-gp2x-`date '+%Y-%m-%d'`.zip" *
-		echo You should have a "scummvm-gp2x-`date '+%Y-%m-%d'`.zip" for the GP2X port ready to go.
-		cd ..
-		rm -R ./"scummvm-gp2x-`date '+%Y-%m-%d'`"
-	else
-		echo - /usr/bin/zip not found, ZIP bundle not created.
-		echo All included files can also be found in ./"scummvm-gp2x-`date '+%Y-%m-%d'`"
-		echo - Please use you preferred archive tool to bundle these files.
-fi
diff --git a/backends/platform/gp2x/events.cpp b/backends/platform/gp2x/events.cpp
index 496e045ab0..a40967743c 100644
--- a/backends/platform/gp2x/events.cpp
+++ b/backends/platform/gp2x/events.cpp
@@ -229,6 +229,7 @@ int GP2X_BUTTON_STATE_L					=	false;
 
 bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	SDL_Event ev;
+	ev.type = SDL_NOEVENT;
 	int axis;
 	byte b = 0;
 
diff --git a/backends/platform/gp2x/gp2x-bundle.mk b/backends/platform/gp2x/gp2x-bundle.mk
new file mode 100755
index 0000000000..c6fb72c1c3
--- /dev/null
+++ b/backends/platform/gp2x/gp2x-bundle.mk
@@ -0,0 +1,60 @@
+# Special target to create bundles for the GP2X.
+
+bundle_name = release/scummvm-gp2x
+
+gp2x-bundle: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/saves"
+	$(MKDIR) "$(bundle_name)/engine-data"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/plugins"
+	$(STRIP) $(bundle_name)/plugins/*
+endif
+
+	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+gp2x-bundle-debug: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/saves"
+	$(MKDIR) "$(bundle_name)/engine-data"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+	
+	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+	
+	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+.PHONY: gp2x-bundle gp2x-bundle-debug
diff --git a/backends/platform/gp2x/module.mk b/backends/platform/gp2x/module.mk
index 50a771219a..d4f145c64f 100644
--- a/backends/platform/gp2x/module.mk
+++ b/backends/platform/gp2x/module.mk
@@ -7,8 +7,7 @@ MODULE_OBJS := \
 	graphics.o \
 	gp2x.o \
 
-MODULE_DIRS += \
-	backends/platform/gp2x/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/gp2xwiz/build/bundle-debug.sh b/backends/platform/gp2xwiz/build/bundle-debug.sh
index d275f681ea..cd5145b31d 100755
--- a/backends/platform/gp2xwiz/build/bundle-debug.sh
+++ b/backends/platform/gp2xwiz/build/bundle-debug.sh
@@ -2,53 +2,8 @@
 
 echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
 
-echo Collecting files.
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib"
+cd ../../../..
 
+echo Building ScummVM for GP2X Wiz.
 
-echo "Please put your save games in this dir" >> "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
-
-cp ./scummvm-gdb.gpe ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/scummvm.gpe
-cp ./scummvm.png ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./README-GP2XWIZ ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.ini ./scummvm-wiz-`date '+%Y-%m-%d'`/
-cp ../../../../scummvm.wiz ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../AUTHORS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../README ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYING ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
-cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
-
-# Copy over dynamic libs needed by the app (as the ones in the default filesystem are broken).
-f=`which arm-open2x-linux-g++`
-loc=`dirname "$f"`
-cp $loc/../lib/libz.so.1.2.3 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libz.so.1
-cp $loc/../lib/libvorbisidec.so.1.0.2 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libvorbisidec.so.1
-
-echo Building ZIP bundle.
-if [ -f /usr/bin/zip ]
-	then
-		rm ./"scummvm-wiz-`date '+%Y-%m-%d'`.zip"
-		cd "scummvm-wiz-`date '+%Y-%m-%d'`"
-		zip -r -9 "../scummvm-wiz-`date '+%Y-%m-%d'`.zip" *
-		echo You should have a "scummvm-wiz-`date '+%Y-%m-%d'`.zip" for the GP2X Wiz backend ready to go.
-		cd ..
-		rm -R ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-	else
-		echo - /usr/bin/zip not found, ZIP bundle not created.
-		echo All included files can also be found in ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-		echo - Please use you preferred archive tool to bundle these files.
-fi
-
-echo Please ensure GDB is installed somewhere in the path on your Wiz.
-
+make gp2xwiz-bundle-debug
diff --git a/backends/platform/gp2xwiz/build/bundle.sh b/backends/platform/gp2xwiz/build/bundle.sh
index 065bd7a685..579e2dc77b 100755
--- a/backends/platform/gp2xwiz/build/bundle.sh
+++ b/backends/platform/gp2xwiz/build/bundle.sh
@@ -2,56 +2,8 @@
 
 echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
 
-echo Collecting files.
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib"
+cd ../../../..
 
+echo Building ScummVM for GP2X Wiz.
 
-echo "Please put your save games in this dir" >> "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
-
-cp ./scummvm.gpe ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.png ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./README-GP2XWIZ ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.ini ./scummvm-wiz-`date '+%Y-%m-%d'`/
-cp ../../../../scummvm.wiz ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../AUTHORS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../README ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYING ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
-cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
-
-# Copy over dynamic libs needed by the app (as the ones in the default filesystem are broken).
-f=`which arm-open2x-linux-g++`
-loc=`dirname "$f"`
-cp $loc/../lib/libz.so.1.2.3 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libz.so.1
-cp $loc/../lib/libvorbisidec.so.1.0.2 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libvorbisidec.so.1
-
-echo Making Stripped Binary.
-arm-open2x-linux-strip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/scummvm.wiz
-
-echo Making Stripped Plugins.
-arm-open2x-linux-strip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins/*
-
-echo Building ZIP bundle.
-if [ -f /usr/bin/zip ]
-	then
-		rm ./"scummvm-wiz-`date '+%Y-%m-%d'`.zip"
-		cd "scummvm-wiz-`date '+%Y-%m-%d'`"
-		zip -r -9 "../scummvm-wiz-`date '+%Y-%m-%d'`.zip" *
-		echo You should have a "scummvm-wiz-`date '+%Y-%m-%d'`.zip" for the GP2X Wiz backend ready to go.
-		cd ..
-		rm -R ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-	else
-		echo - /usr/bin/zip not found, ZIP bundle not created.
-		echo All included files can also be found in ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-		echo - Please use you preferred archive tool to bundle these files.
-fi
+make gp2xwiz-bundle
diff --git a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk b/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
new file mode 100755
index 0000000000..fa5a247865
--- /dev/null
+++ b/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
@@ -0,0 +1,73 @@
+# Special target to create bundles for the GP2X Wiz.
+
+#bundle_name = release/scummvm-wiz-`date '+%Y-%m-%d'`
+bundle_name = release/scummvm-gp2xwiz
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
+
+gp2xwiz-bundle: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+	$(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+	
+	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
+	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
+
+	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+gp2xwiz-bundle-debug: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+	
+	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
+	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
+
+	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+.PHONY: gp2xwiz-bundle gp2xwiz-bundle-debug
diff --git a/backends/platform/gp2xwiz/gp2xwiz-events.cpp b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
index a69aa42967..19ef24ef58 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-events.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
@@ -165,6 +165,7 @@ int GP2X_BUTTON_STATE_L					=	false;
 /* Override the SDL pollEvent with the Wiz's own event code. */
 bool OSystem_GP2XWIZ::pollEvent(Common::Event &event) {
 	SDL_Event ev;
+	ev.type = SDL_NOEVENT;
 	int axis;
 	byte b = 0;
 
diff --git a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp b/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
index ff3bd725be..921558131a 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
@@ -138,7 +138,7 @@ bool OSystem_GP2XWIZ::loadGFXMode() {
 	if (_videoMode.screenHeight != 200 && _videoMode.screenHeight != 400)
 		_videoMode.aspectRatioCorrection = false;
 
-	OSystem_SDL::loadGFXMode();
+	return OSystem_SDL::loadGFXMode();
 }
 
 void OSystem_GP2XWIZ::drawMouse() {
diff --git a/backends/platform/gp2xwiz/module.mk b/backends/platform/gp2xwiz/module.mk
index e162555493..c76238f679 100644
--- a/backends/platform/gp2xwiz/module.mk
+++ b/backends/platform/gp2xwiz/module.mk
@@ -7,11 +7,10 @@ MODULE_OBJS := \
 	gp2xwiz-main.o \
 	gp2xwiz-loader.o
 
-MODULE_DIRS += \
-	backends/platform/gp2xwiz/ 
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
 # Hack to ensure the SDL backend is built so we can use OSystem_SDL.
 -include $(srcdir)/backends/platform/sdl/module.mk
\ No newline at end of file
diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m
index faa0719b6c..cd8b38acb3 100644
--- a/backends/platform/iphone/iphone_video.m
+++ b/backends/platform/iphone/iphone_video.m
@@ -276,7 +276,7 @@ uint getSizeNextPOT(uint size) {
 
 	glGenTextures(1, &_screenTexture);
 	glBindTexture(GL_TEXTURE_2D, _screenTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
 	if (_textureBuffer) {
 		free(_textureBuffer);
diff --git a/backends/platform/iphone/module.mk b/backends/platform/iphone/module.mk
index 28bc8d3ac7..9768e6ded4 100644
--- a/backends/platform/iphone/module.mk
+++ b/backends/platform/iphone/module.mk
@@ -10,8 +10,7 @@ MODULE_OBJS := \
 	iphone_keyboard.o \
 	blit_arm.o
 
-MODULE_DIRS += \
-	backends/platform/iphone/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index 72408be89a..c1c7ffdc0c 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "gui/message.h"
+#include "common/translation.h"
 
 #include "osys_main.h"
 
@@ -335,9 +336,9 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 			_touchpadModeEnabled = !_touchpadModeEnabled;
 			const char *dialogMsg;
 			if (_touchpadModeEnabled)
-				dialogMsg = "Touchpad mode enabled.";
+				dialogMsg = _("Touchpad mode enabled.");
 			else
-				dialogMsg = "Touchpad mode disabled.";
+				dialogMsg = _("Touchpad mode disabled.");
 			GUI::TimedMessageDialog dialog(dialogMsg, 1500);
 			dialog.runModal();
 			return false;
diff --git a/backends/platform/linuxmoto/module.mk b/backends/platform/linuxmoto/module.mk
index 8123d6e2ac..316ecbf78e 100644
--- a/backends/platform/linuxmoto/module.mk
+++ b/backends/platform/linuxmoto/module.mk
@@ -7,11 +7,10 @@ MODULE_OBJS := \
 	linuxmoto-sdl.o \
 	hardwarekeys.o
 
-MODULE_DIRS += \
-	backends/platform/linuxmoto/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
 # HACK: The linuxmoto backend is based on the SDL one, so we load that, too.
 include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile
index 914e6e9c9e..b8b2e61f77 100644
--- a/backends/platform/n64/Makefile
+++ b/backends/platform/n64/Makefile
@@ -64,6 +64,8 @@ ENABLE_SCUMM = $(ENABLED)
 
 OBJS :=	nintendo64.o osys_n64_base.o osys_n64_events.o osys_n64_utilities.o pakfs_save_manager.o framfs_save_manager.o
 
+BACKEND := n64
+
 include $(srcdir)/Makefile.common
 
 MODULE_DIRS += ./
diff --git a/backends/platform/n64/README.N64 b/backends/platform/n64/README.N64
index 1cdd82e1e9..276436b676 100644
--- a/backends/platform/n64/README.N64
+++ b/backends/platform/n64/README.N64
@@ -13,6 +13,8 @@ Requirements
 
 Build cart images from sources
 ==============================
+You can download hkz-libn64 sources from here: http://hkzlab.ipv7.net/consoles.html
+hkz-libn64 is a library to control Nintendo64 hardware (es, video, audio, input, etc.).
 * TODO *
 
 Build cart images from binaries
diff --git a/backends/platform/n64/module.mk b/backends/platform/n64/module.mk
index 34a7badb44..429b63802e 100644
--- a/backends/platform/n64/module.mk
+++ b/backends/platform/n64/module.mk
@@ -1,10 +1,14 @@
 MODULE := backends/platform/n64
 
 MODULE_OBJS := \
-	nintendo64.o
+	nintendo64.o \
+	osys_n64_base.o \
+	osys_n64_events.o \
+	osys_n64_utilities.o \
+	pakfs_save_manager.o \
+	framfs_save_manager.o 
 
-MODULE_DIRS += \
-	backends/platform/n64/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/null/module.mk b/backends/platform/null/module.mk
index 12a2cbc510..30345d7ac2 100644
--- a/backends/platform/null/module.mk
+++ b/backends/platform/null/module.mk
@@ -3,8 +3,7 @@ MODULE := backends/platform/null
 MODULE_OBJS := \
 	null.o
 
-MODULE_DIRS += \
-	backends/platform/null/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/ps2/Makefile.gdb b/backends/platform/ps2/Makefile.gdb
index 41ac58d629..53646a9546 100644
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@ -75,6 +75,8 @@ OBJS := backends/platform/ps2/DmaPipe.o \
     
 MODULE_DIRS += .
 
+BACKEND := ps2
+
 include $(srcdir)/Makefile.common
 
 LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile 
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index 717bc94379..f836bd3eaa 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -92,6 +92,11 @@ PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/plugin.syms elf/scummvm.elf
 PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o
 PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,elf/scummvm.elf,-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc
 
+
+BACKEND := ps2
+
+include $(srcdir)/Makefile.common
+
 LDFLAGS = -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(srcdir)/backends/plugins/ps2/main_prog.ld
 LDFLAGS += -L $(PS2SDK)/ee/lib -L .
 LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
diff --git a/backends/platform/ps2/module.mk b/backends/platform/ps2/module.mk
index 69a28b93c4..a12d10771f 100644
--- a/backends/platform/ps2/module.mk
+++ b/backends/platform/ps2/module.mk
@@ -19,8 +19,7 @@ MODULE_OBJS := \
 	ps2debug.o \
 	ps2loader.o
 
-MODULE_DIRS += \
-	backends/platform/ps2/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 754bc775f0..9c011220b8 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -64,7 +64,6 @@ ifeq ($(PSPSDK),)
 $(error $$(PSPSDK) cannot be obtained.)
 endif
 
-
 # Variables for common Scummvm makefile
 CXX      = psp-g++
 CXXFLAGS = -O3 -Wall -Wno-multichar -fno-exceptions -fno-rtti
@@ -124,16 +123,12 @@ CXXFLAGS += -pg -g
 LDFLAGS += -pg
 endif
 
-# SDL Libs and Flags
-SDLFLAGS := $(shell $(PSPBIN)/sdl-config --cflags)
-SDLLIBS  := $(shell $(PSPBIN)/sdl-config --libs)
 # PSP LIBS
 PSPLIBS =  -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
 	-lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lpspkernel
 
 # Add in PSPSDK includes and libraries.
-CXXFLAGS += $(SDLFLAGS)
-LIBS     += -lpng -lSDL -lz $(findstring -lGL,$(SDLLIBS)) -lstdc++ -lc -lm $(filter -L%,$(SDLLIBS)) $(PSPLIBS)
+LIBS     += -lpng -lz -lstdc++ -lc -lm $(PSPLIBS)
 
 OBJS := powerman.o \
 	psp_main.o \
@@ -147,8 +142,15 @@ OBJS := powerman.o \
 	cursor.o \
 	trace.o \
 	psploader.o \
-	pspkeyboard.o
+	pspkeyboard.o \
+	audio.o \
+	thread.o \
+	rtc.o \
+	mp3.o \
+	tests.o
+
 
+BACKEND := psp
 
 # Include common Scummvm makefile
 include $(srcdir)/Makefile.common
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index 45f31483f7..f4d5bae6d6 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -99,8 +99,6 @@ To build ScummVM for PSP you need:
 		Note: This usually gets installed by the PSP toolchain,
 		so you don't have to do it manually.
 
-- SDL		(svn co svn://svn.pspdev.org/psp/trunk/SDL)
-
 - zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
 
 - libPNG	(svn co svn://svn.pspdev.org/psp/trunk/libpng)
diff --git a/backends/platform/psp/README.PSP.in b/backends/platform/psp/README.PSP.in
index d9f75974f1..2d53fd3b47 100644
--- a/backends/platform/psp/README.PSP.in
+++ b/backends/platform/psp/README.PSP.in
@@ -99,8 +99,6 @@ To build ScummVM for PSP you need:
 		Note: This usually gets installed by the PSP toolchain,
 		so you don't have to do it manually.
 
-- SDL		(svn co svn://svn.pspdev.org/psp/trunk/SDL)
-
 - zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
 
 - libPNG	(svn co svn://svn.pspdev.org/psp/trunk/libpng)
diff --git a/backends/platform/psp/audio.cpp b/backends/platform/psp/audio.cpp
new file mode 100644
index 0000000000..14691befee
--- /dev/null
+++ b/backends/platform/psp/audio.cpp
@@ -0,0 +1,150 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include <pspthreadman.h> 
+#include <pspaudio.h>
+ 
+#include "common/scummsys.h" 
+#include "backends/platform/psp/audio.h"
+
+//#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
+//#define __PSP_DEBUG_PRINT__	/* For debug printouts */
+
+#include "backends/platform/psp/trace.h"
+
+bool PspAudio::open(uint32 freq, uint32 numOfChannels, uint32 numOfSamples, callbackFunc callback, void *userData) {
+	DEBUG_ENTER_FUNC();
+	if (_init) {
+		PSP_ERROR("audio device already initialized\n");
+		return true;
+	}		
+
+	PSP_DEBUG_PRINT("freq[%d], numOfChannels[%d], numOfSamples[%d], callback[%p], userData[%x]\n", 
+			freq, numOfChannels, numOfSamples, callback, (uint32)userData);
+	
+	numOfSamples = PSP_AUDIO_SAMPLE_ALIGN(numOfSamples);
+	uint32 bufLen = numOfSamples * numOfChannels * NUM_BUFFERS * sizeof(uint16);
+	
+	PSP_DEBUG_PRINT("total buffer size[%d]\n", bufLen);
+		
+	_buffers[0] = (byte *)memalign(64, bufLen);
+	if (!_buffers[0]) {
+		PSP_ERROR("failed to allocate memory for audio buffers\n");
+		return false;
+	}
+	memset(_buffers[0], 0, bufLen);	// clean the buffer
+	
+	// Fill in the rest of the buffer pointers
+	byte *pBuffer = _buffers[0];
+	for (int i = 1; i < NUM_BUFFERS; i++) {
+		pBuffer += numOfSamples * numOfChannels * sizeof(uint16);
+		_buffers[i] = pBuffer;
+	}
+	
+	// Reserve a HW channel for our audio
+	_pspChannel = sceAudioChReserve(PSP_AUDIO_NEXT_CHANNEL, numOfSamples, numOfChannels == 2 ? PSP_AUDIO_FORMAT_STEREO : PSP_AUDIO_FORMAT_MONO);
+	if (_pspChannel < 0) {
+		PSP_ERROR("failed to reserve audio channel\n");
+		return false;
+	}
+	
+	PSP_DEBUG_PRINT("reserved channel[%d] for audio\n", _pspChannel);
+
+	// Save our data
+	_numOfChannels = numOfChannels;
+	_numOfSamples = numOfSamples;
+	_bufferSize = numOfSamples * numOfChannels * sizeof(uint16);	// should be the right size to send the app
+	_callback = callback;
+	_userData = userData;
+	_bufferToFill = 0;
+	_bufferToPlay = 0;
+	
+	_init = true;
+	_paused = true;	// start in paused mode
+	
+	threadCreateAndStart("audioThread", PRIORITY_AUDIO_THREAD, STACK_AUDIO_THREAD);	// start the consumer thread
+	
+	return true;
+}
+
+// The real thread function
+void PspAudio::threadFunction() {	
+	assert(_callback);
+	PSP_DEBUG_PRINT_FUNC("audio thread started\n");
+
+	while (_init) {		// Keep looping so long as we haven't been told to stop
+		if (_paused)
+			PSP_DEBUG_PRINT("audio thread paused\n");
+		while (_paused) {	// delay until we stop pausing
+			PspThread::delayMicros(100000);	// 100ms
+			if (!_paused)
+				PSP_DEBUG_PRINT("audio thread unpaused\n");
+		}
+
+		PSP_DEBUG_PRINT("remaining samples[%d]\n", _remainingSamples);
+
+		PSP_DEBUG_PRINT("filling buffer[%d]\n", _bufferToFill);
+		_callback(_userData, _buffers[_bufferToFill], _bufferSize); // ask mixer to fill in data
+		nextBuffer(_bufferToFill);
+		
+		PSP_DEBUG_PRINT("playing buffer[%d].\n", _bufferToPlay);
+		playBuffer();
+		nextBuffer(_bufferToPlay);
+	} // while _init
+	
+	// destroy everything
+	free(_buffers[0]);
+	sceAudioChRelease(_pspChannel);
+	PSP_DEBUG_PRINT("audio thread exiting. ****************************\n");
+}
+
+// Much faster than using %, especially with conditional moves (MIPS)
+inline void PspAudio::nextBuffer(int &bufferIdx) {
+	DEBUG_ENTER_FUNC();
+	bufferIdx++;
+	if (bufferIdx >= NUM_BUFFERS)
+		bufferIdx = 0;
+}
+
+// Don't do it with blocking
+inline bool PspAudio::playBuffer() {
+	DEBUG_ENTER_FUNC();
+	int ret;
+	if (_numOfChannels == 1)
+		ret = sceAudioOutputBlocking(_pspChannel, PSP_AUDIO_VOLUME_MAX, _buffers[_bufferToPlay]);
+	else
+		ret = sceAudioOutputPannedBlocking(_pspChannel, PSP_AUDIO_VOLUME_MAX, PSP_AUDIO_VOLUME_MAX, _buffers[_bufferToPlay]);
+	
+	if (ret < 0) {
+		PSP_ERROR("failed to output audio. Error[%d]\n", ret);
+		return false;
+	}
+	return true;
+}
+
+void PspAudio::close() {
+	PSP_DEBUG_PRINT("close has been called ***************\n");
+	_init = false; 
+}
diff --git a/backends/platform/psp/audio.h b/backends/platform/psp/audio.h
new file mode 100644
index 0000000000..07f70cec7d
--- /dev/null
+++ b/backends/platform/psp/audio.h
@@ -0,0 +1,69 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef PSP_AUDIO_H
+#define PSP_AUDIO_H
+
+#include "backends/platform/psp/thread.h"
+
+class PspAudio : public PspThreadable {
+public:
+	enum {
+		NUM_BUFFERS = 2,
+		FREQUENCY = 44100	/* only frequency we allow */
+	};
+	typedef void (* callbackFunc)(void *userData, byte *samples, int len);	// audio callback to call
+	PspAudio() : _pspChannel(0), 
+			_numOfChannels(0), _numOfSamples(0), _callback(0), 
+			_bufferToPlay(0), _bufferToFill(0), 
+			_init(false), _paused(true) {
+		for (int i=0; i<NUM_BUFFERS; i++)
+			_buffers[i] = 0;
+	}
+	~PspAudio() { close(); }
+	bool playBuffer();
+	void nextBuffer(int &bufferIdx);
+	bool open(uint32 freq, uint32 numOfChannels, uint32 numOfSamples, callbackFunc callback, void *userData);
+	void close();
+	uint32 getFrequency() { return FREQUENCY; }
+	void pause() { _paused = true; }
+	void unpause() { _paused = false; }
+	virtual void threadFunction();	// actual audio thread
+	
+private:
+	int _pspChannel;				// chosen hardware output channel
+	uint32 _numOfChannels;			// 1 for mono; 2 for stereo
+	uint32 _numOfSamples;
+	callbackFunc _callback;			// the callback to call between outputting audio
+	void *_userData;				// userData to send with callback
+	byte *_buffers[NUM_BUFFERS];
+	int _bufferToPlay;				// the next buffer to output
+	int _bufferToFill;
+	int _bufferSize;
+	bool _init;						// flag for initialization
+	bool _paused;
+};
+
+#endif /* PSP_AUDIO_H */
diff --git a/backends/platform/psp/cursor.cpp b/backends/platform/psp/cursor.cpp
index ae3b8f0050..cf879e095a 100644
--- a/backends/platform/psp/cursor.cpp
+++ b/backends/platform/psp/cursor.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.h $
- * $Id: osys_psp.h 46120 2009-11-24 10:33:30Z Bluddy $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/psp/default_display_client.h b/backends/platform/psp/default_display_client.h
index 716e6fcc35..2e33632eb1 100644
--- a/backends/platform/psp/default_display_client.h
+++ b/backends/platform/psp/default_display_client.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/trace.h $
- * $Id: trace.h 44276 2009-09-23 16:11:23Z joostp $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/psp/display_client.cpp b/backends/platform/psp/display_client.cpp
index 90c41e796d..6360772c96 100644
--- a/backends/platform/psp/display_client.cpp
+++ b/backends/platform/psp/display_client.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
@@ -340,11 +340,17 @@ void Buffer::copyFromRect(const byte *buf, uint32 pitch, int destX, int destY, u
 
 	if (pitch == realWidthInBytes && pitch == recWidthInBytes) {
 		//memcpy(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth));
-		Copier::copy(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth), &_pixelFormat);
+		if (_pixelFormat.swapRB)
+			PspMemory::fastSwap(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth), _pixelFormat);
+		else
+			PspMemory::fastCopy(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth));
 	} else {
 		do {
 			//memcpy(dst, buf, recWidthInBytes);
-			Copier::copy(dst, buf, recWidthInBytes, &_pixelFormat);
+			if (_pixelFormat.swapRB)
+				PspMemory::fastSwap(dst, buf, recWidthInBytes, _pixelFormat);
+			else
+				PspMemory::fastCopy(dst, buf, recWidthInBytes);
 			buf += pitch;
 			dst += realWidthInBytes;
 		} while (--recHeight);
@@ -363,7 +369,10 @@ void Buffer::copyToArray(byte *dst, int pitch) {
 
 	do {
 		//memcpy(dst, src, sourceWidthInBytes);
-		Copier::copy(dst, src, sourceWidthInBytes, &_pixelFormat);
+		if (_pixelFormat.swapRB)
+			PspMemory::fastSwap(dst, src, sourceWidthInBytes, _pixelFormat);
+		else
+			PspMemory::fastCopy(dst, src, sourceWidthInBytes);
 		src += realWidthInBytes;
 		dst += pitch;
 	} while (--h);
@@ -686,17 +695,18 @@ void GuRenderer::fillVertices(Vertex *vertices) {
 	uint32 gapX = _useGlobalScaler ? (PSP_SCREEN_WIDTH - outputWidth) >> 1 : 0;
 	uint32 gapY = _useGlobalScaler ? (PSP_SCREEN_HEIGHT - outputHeight) >> 1 : 0;
 
+	// Save scaled offset on screen
+	float scaledOffsetOnScreenX = scaleSourceToOutputX(_offsetOnScreen.x);
+	float scaledOffsetOnScreenY = scaleSourceToOutputY(_offsetOnScreen.y);
+	
 	float imageStartX, imageStartY, imageEndX, imageEndY;
 
-	imageStartX = gapX + (scaleSourceToOutputX(_maxTextureOffset.x));
-	imageStartY = gapY;
-
-	imageStartX += scaleSourceToOutputX(_offsetOnScreen.x);
-	imageStartY += scaleSourceToOutputY(_offsetOnScreen.y);
+	imageStartX = gapX + scaledOffsetOnScreenX + (scaleSourceToOutputX(_maxTextureOffset.x));
+	imageStartY = gapY + scaledOffsetOnScreenY;
 
 	if (_fullScreen) { // shortcut
-		imageEndX = PSP_SCREEN_WIDTH - gapX;
-		imageEndY = PSP_SCREEN_HEIGHT - gapY;
+		imageEndX = PSP_SCREEN_WIDTH - gapX + scaledOffsetOnScreenX; 
+		imageEndY = PSP_SCREEN_HEIGHT - gapY + scaledOffsetOnScreenY; // needed for screen shake
 	} else { /* !fullScreen */
 		imageEndX = imageStartX + scaleSourceToOutputX(_drawSize.width);
 		imageEndY = imageStartY + scaleSourceToOutputY(_drawSize.height);
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index 0982512a86..544e5a1b25 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 47541 2010-01-25 01:39:44Z lordhoto $
+ * $URL$
+ * $Id$
  *
  */
 
@@ -64,37 +64,24 @@ const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
 
 void MasterGuRenderer::setupCallbackThread() {
 	DEBUG_ENTER_FUNC();
-	int thid = sceKernelCreateThread("displayCbThread", guCallbackThread, 0x11, 4*1024, THREAD_ATTR_USER, 0);
 	
-	PSP_DEBUG_PRINT("Display CB thread id is %x\n", thid);
-	
-	// We want to pass the pointer to this, but we'll have to take address of this so use a little trick
-	MasterGuRenderer *_this = this;
-	
-	if (thid >= 0) {
-		sceKernelStartThread(thid, sizeof(uint32 *), &_this);
-	} else 
-		PSP_ERROR("failed to create display callback thread\n");
+	// start the thread that updates the display
+	threadCreateAndStart("DisplayCbThread", PRIORITY_DISPLAY_THREAD, STACK_DISPLAY_THREAD);		
 }
 
-// thread that reacts to the callback
-int MasterGuRenderer::guCallbackThread(SceSize, void *__this) {
+// this function gets called by PspThread when starting the new thread
+void MasterGuRenderer::threadFunction() {
 	DEBUG_ENTER_FUNC();
 	
-	// Dereferenced the copied value which was this
-	MasterGuRenderer *_this = *(MasterGuRenderer **)__this;
-	
 	// Create the callback. It should always get the pointer to MasterGuRenderer
-	_this->_callbackId = sceKernelCreateCallback("Display Callback", guCallback, _this);
-	if (_this->_callbackId < 0) {
-		PSP_ERROR("failed to create display callback\n");
-		return -1;
+	_callbackId = sceKernelCreateCallback("Display Callback", guCallback, this);
+	if (_callbackId < 0) {
+		PSP_ERROR("failed to create display callback\n");		
 	}
 	
 	PSP_DEBUG_PRINT("created callback. Going to sleep\n");
 
-	sceKernelSleepThreadCB();	// sleep until we get a callback
-	return 0;
+	sceKernelSleepThreadCB();	// sleep until we get a callback	
 }
 
 // This callback is called when the render is finished. It swaps the buffers
@@ -310,27 +297,29 @@ void DisplayManager::calculateScaleParams() {
 	}
 }
 
-void DisplayManager::renderAll() {
+// return true if we really rendered or no dirty. False otherwise
+bool DisplayManager::renderAll() {
 	DEBUG_ENTER_FUNC();
 
 #ifdef USE_DISPLAY_CALLBACK
 	if (!_masterGuRenderer.isRenderFinished()) {
 		PSP_DEBUG_PRINT("Callback render not finished.\n");
-		return;
+		return false;	// didn't render
 	}	
 #endif /* USE_DISPLAY_CALLBACK */
 	
-	if (!isTimeToUpdate()) 
-		return;
-
+	// This is cheaper than checking time, so we do it first
 	if (!_screen->isDirty() &&
 	        (!_overlay->isDirty()) &&
 	        (!_cursor->isDirty()) &&
 	        (!_keyboard->isDirty())) {
 		PSP_DEBUG_PRINT("Nothing dirty\n");
-		return;
+		return true;	// nothing to render
 	}
 
+	if (!isTimeToUpdate()) 
+		return false;	// didn't render
+
 	PSP_DEBUG_PRINT("screen[%s], overlay[%s], cursor[%s], keyboard[%s]\n",
 	                _screen->isDirty() ? "true" : "false",
 	                _overlay->isDirty() ? "true" : "false",
@@ -360,6 +349,8 @@ void DisplayManager::renderAll() {
 	_keyboard->setClean();
 
 	_masterGuRenderer.guPostRender();
+	
+	return true;	// rendered successfully
 }
 
 inline bool DisplayManager::isTimeToUpdate() {
@@ -374,7 +365,7 @@ inline bool DisplayManager::isTimeToUpdate() {
 	return true;
 }
 
-Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() {
+Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() const {
 	Common::List<Graphics::PixelFormat> list;
 
 	// In order of preference
diff --git a/backends/platform/psp/display_manager.h b/backends/platform/psp/display_manager.h
index 5864f39b36..72f252faae 100644
--- a/backends/platform/psp/display_manager.h
+++ b/backends/platform/psp/display_manager.h
@@ -18,18 +18,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 47541 2010-01-25 01:39:44Z lordhoto $
+ * $URL$
+ * $Id$
  *
  */
 
 #ifndef PSP_DISPLAY_MAN_H
 #define PSP_DISPLAY_MAN_H
 
+#include "backends/platform/psp/thread.h"
+
 /**
  *	Class used only by DisplayManager to start/stop GU rendering
  */
-class MasterGuRenderer {
+class MasterGuRenderer : public PspThreadable {
 public:
 	MasterGuRenderer() : _lastRenderTime(0), _renderFinished(true), _callbackId(-1) {}
 	void guInit();
@@ -37,15 +39,15 @@ public:
 	void guPostRender();
 	void guShutDown();
 	bool isRenderFinished() { return _renderFinished; }
-	void setupCallbackThread();
+	void setupCallbackThread();	
 private:
+	virtual void threadFunction();			// for the display callback thread
 	static uint32 _displayList[];
-	uint32 _lastRenderTime;					// For measuring rendering
+	uint32 _lastRenderTime;					// For measuring rendering time
 	void guProgramDisplayBufferSizes();
-	static int guCallbackThread(SceSize, void *);	// for the graphics callbacks
-	static int guCallback(int, int, void *__this);
-	bool _renderFinished;
-	int _callbackId;
+	static int guCallback(int, int, void *__this);	// for the display callback
+	bool _renderFinished;					// for sync with render callback
+	int _callbackId;						// to keep track of render callback	
 };
 
 class Screen;
@@ -68,7 +70,7 @@ public:
 	~DisplayManager();
 
 	void init();
-	void renderAll();
+	bool renderAll();	// return true if rendered or nothing dirty. False otherwise
 	bool setGraphicsMode(int mode);
 	bool setGraphicsMode(const char *name);
 	int getGraphicsMode() const { return _graphicsMode; }
@@ -83,12 +85,12 @@ public:
 	void setSizeAndPixelFormat(uint width, uint height, const Graphics::PixelFormat *format);
 
 	// Getters
-	float getScaleX() { return _displayParams.scaleX; }
-	float getScaleY() { return _displayParams.scaleY; }
-	uint32 getOutputWidth() { return _displayParams.screenOutput.width; }
-	uint32 getOutputHeight() { return _displayParams.screenOutput.height; }
-	uint32 getOutputBitsPerPixel() { return _displayParams.outputBitsPerPixel; }
-	Common::List<Graphics::PixelFormat> getSupportedPixelFormats();
+	float getScaleX() const { return _displayParams.scaleX; }
+	float getScaleY() const { return _displayParams.scaleY; }
+	uint32 getOutputWidth() const { return _displayParams.screenOutput.width; }
+	uint32 getOutputHeight() const { return _displayParams.screenOutput.height; }
+	uint32 getOutputBitsPerPixel() const { return _displayParams.outputBitsPerPixel; }
+	Common::List<Graphics::PixelFormat> getSupportedPixelFormats() const;
 
 private:
 	struct GlobalDisplayParams {
diff --git a/backends/platform/psp/input.cpp b/backends/platform/psp/input.cpp
index 4fe7cb3f92..2a91ce455a 100644
--- a/backends/platform/psp/input.cpp
+++ b/backends/platform/psp/input.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 43618 2009-08-21 22:44:49Z joostp $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/psp/memory.cpp b/backends/platform/psp/memory.cpp
index e134a7d0f4..29d0482d9a 100644
--- a/backends/platform/psp/memory.cpp
+++ b/backends/platform/psp/memory.cpp
@@ -35,129 +35,408 @@
 
 #include "backends/platform/psp/trace.h"
 
-void Copier::copy(byte *dst, const byte *src, uint32 bytes, PSPPixelFormat *format /* = NULL */) {
+//#define TEST_MEMORY_COPY
+
+extern "C" {
+
+#ifdef TEST_MEMORY_COPY		/* we won't be able to run in this case b/c of printouts */
+extern void *__real_memcpy(void *dst, void *src, size_t bytes);
+#endif
+
+void *__wrap_memcpy(void *dst, void *src, size_t bytes) {
+#ifdef TEST_MEMORY_COPY		/* we won't be able to run in this case */
+	return __real_memcpy(dst, src, bytes);
+#else
+	PspMemory::fastCopy((byte *)dst, (byte *)src, bytes);
+	return dst;
+#endif
+}
+
+}
+
+void PspMemory::copy(byte *dst, const byte *src, uint32 bytes) {
 	DEBUG_ENTER_FUNC();
 
-	uint32 prefixDst = (((uint32)dst) & 0x3);
-	prefixDst = prefixDst ? 4 - prefixDst : 0;	// prefix only if we have address % 4 != 0
-	uint32 prefixSrc = (((uint32)src) & 0x3);
-	prefixSrc = prefixSrc ? 4 - prefixSrc : 0;  // prefix only if we have address % 4 != 0
-	uint32 *dst32, *src32;
-	bool swapRB = format ? format->swapRB : false;	// take swap value from pixelformat if it's given
-#ifdef __PSP_DEBUG_PRINT__
+#ifdef TEST_MEMORY_COPY
 	uint32 debugBytes = bytes;
 	const byte *debugDst = dst, *debugSrc = src;
 #endif
-	uint32 words, remainingBytes;
 
-	//PSP_DEBUG_PRINT("dst[%p], src[%p], bytes[%d], swap[%s], prefixDst[%u], prefixSrc[%u]\n", dst, src, bytes, swapRB ? "true" : "false", prefixDst, prefixSrc);
+	PSP_DEBUG_PRINT("copy(): dst[%p], src[%p], bytes[%d]\n", dst, src, bytes);
 
-	if (prefixDst || prefixSrc) { 			// we're not aligned to word boundaries
-		if (prefixDst != prefixSrc) {		// worst case: we can never be aligned. this mode is highly inefficient. try to get engines not to use this mode too much
-			PSP_DEBUG_PRINT("misaligned copy of %u bytes from %p to %p\n", bytes, src, dst);
-			if ((prefixDst & 1) || (prefixSrc & 1))
-				copy8(dst, src, bytes);	// no swap is possible on 8 bit
-			else
-				copy16((uint16 *)dst, (uint16 *)src, bytes, format);
-
-			goto test;
-		}
-
-		// Do the prefix: the part to get us aligned
-		if (prefixDst & 1) { 			// byte
-			copy8(dst, src, prefixDst);	// no swap available
-		} else {						// short
-			copy16((uint16 *)dst, (uint16 *)src, prefixDst, format);
-		}
-		if (bytes > prefixDst)	// check that we can afford to subtract from bytes
-			bytes -= prefixDst;
-		else {
+	// align the destination pointer first
+	uint32 prefixDst = (((uint32)dst) & 0x3);
+	
+	if (prefixDst) {
+		prefixDst = 4 - prefixDst;				// prefix only if we have address % 4 != 0	
+		PSP_DEBUG_PRINT("prefixDst[%d]\n", prefixDst);
+
+		bytes -= prefixDst;						// remember we assume bytes >= 4
+		
+		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) {	// check if it's worthwhile to continue
+			copy8(dst, src, bytes + prefixDst);
+#ifdef TEST_MEMORY_COPY
+			testCopy(debugDst, debugSrc, debugBytes);
+#endif		
 			return;
 		}
-		dst32 = (uint32 *)(dst + prefixDst);
-		src32 = (uint32 *)(src + prefixSrc);
-	} else { // We're aligned to word boundaries
-		dst32 = (uint32 *)dst;
-		src32 = (uint32 *)src;
+		
+		while (prefixDst--) {
+			*dst++ = *src++;
+		}		
 	}
-
-	words = bytes >> 2;
-	remainingBytes = bytes & 0x3;
-
-	if (swapRB) {	// need to swap
-		for (; words > 0; words--) {
-			*dst32 = format->swapRedBlue32(*src32);
-			dst32++;
-			src32++;
-		}
-	} else { // no swapping
-		for (; words > 0; words--) {
-			*dst32 = *src32;
-			dst32++;
-			src32++;
-		}
+	
+	// check the source pointer alignment now
+	uint32 alignSrc = (((uint32)src) & 0x3);
+	
+	if (alignSrc) {						// we'll need to realign our reads
+		copy32Misaligned((uint32 *)dst, src, bytes, alignSrc);
+	} else {
+		copy32Aligned((uint32 *)dst, (uint32 *)src, bytes);
 	}
 
-	// Do any remaining bytes
-	if (remainingBytes) {
-		if (remainingBytes & 1)	// we have bytes left
-			copy8((byte *)dst32, (byte *)src32, remainingBytes);
-		else // 16bits left
-			copy16((uint16*)dst32, (uint16 *)src32, remainingBytes, format);
-	}
+#ifdef TEST_MEMORY_COPY
+	testCopy(debugDst, debugSrc, debugBytes);
+#endif		
+}
 
-test:
-	// debug
-#ifdef __PSP_DEBUG_PRINT__
+void PspMemory::testCopy(const byte *debugDst, const byte *debugSrc, uint32 debugBytes) {
+	
 	bool mismatch = false;
+	PSP_INFO_PRINT("testing fastCopy...");
 
 	for (uint32 i = 0; i < debugBytes; i++) {
 		if (debugDst[i] != debugSrc[i]) {
-			if (mismatch == false) {
-				PSP_DEBUG_PRINT_SAMELN("mismatch in copy:\n");
-				PSP_DEBUG_PRINT("dst[%p], src[%p], bytes[%u], swap[%s], prefixDst[%u], prefixSrc[%u]\n", debugDst, debugSrc, debugBytes, swapRB ? "true" : "false", prefixDst, prefixSrc);
+			if (!mismatch) {
+				PSP_INFO_PRINT("**** mismatch in copy! ****\n");
+				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
 				mismatch = true;
 			}
-			PSP_DEBUG_PRINT_SAMELN("%x!=%x ", debugSrc[i], debugDst[i]);
+			PSP_INFO_PRINT("[%d]%x!=%x ", i, debugSrc[i], debugDst[i]);
 		}
 	}
-	if (mismatch)
-		PSP_DEBUG_PRINT("\n");
+	if (mismatch) {
+		PSP_INFO_PRINT("\n");
+	} else {
+		PSP_INFO_PRINT("ok\n");
+	}	
+}
+
+// 
+// used to swap red and blue
+void PspMemory::swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+	DEBUG_ENTER_FUNC();
+
+#ifdef TEST_MEMORY_COPY
+	uint32 debugBytes = bytes;
+	const uint16 *debugDst = dst16, *debugSrc = src16;
 #endif
+	
+	// align the destination pointer first
+	uint32 prefixDst = (((uint32)dst16) & 0x3);	// for swap, we can only have 2 or 0 as our prefix
+	
+	if (prefixDst) {
+		bytes -= prefixDst;						// remember we assume bytes > 4
+		*dst16++ = format.swapRedBlue16(*src16++);
+		
+		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) { // check if it's worthwhile to continue
+			swap16(dst16, src16, bytes, format);
+
+#ifdef TEST_MEMORY_COPY
+			testSwap(debugDst, debugSrc, debugBytes, format);
+#endif		
+			return;
+		}
+	}
+	
+	// check the source pointer alignment now
+	uint32 alignSrc = (((uint32)src16) & 0x3);
+	
+	if (alignSrc) {						// we'll need to realign our reads
+		PSP_DEBUG_PRINT("misaligned copy of %u bytes from %p to %p\n", bytes, src16, dst16);
+		swap32Misaligned((uint32 *)dst16, src16, bytes, format);
+	} else {
+		swap32Aligned((uint32 *)dst16, (const uint32 *)src16, bytes, format);
+	}
+	
+#ifdef TEST_MEMORY_COPY
+	testSwap(debugDst, debugSrc, debugBytes, format);
+#endif		
+	
+}
+
+void PspMemory::testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format) {
+	
+	bool mismatch = false;
+	PSP_INFO_PRINT("testing fastSwap...");
+	
+	uint32 shorts = debugBytes >> 1;
+
+	for (uint32 i = 0; i < shorts; i++) {
+		if (debugDst[i] != format.swapRedBlue16(debugSrc[i])) {
+			if (!mismatch) {
+				PSP_INFO_PRINT("**** mismatch in swap! ****\n");
+				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
+				mismatch = true;
+			}
+			PSP_INFO_PRINT("[%d]%x!=%x ", i<<1, format.swapRedBlue16(debugSrc[i]), debugDst[i]);
+		}
+	}
+	if (mismatch) {
+		PSP_INFO_PRINT("\n");
+	} else {
+		PSP_INFO_PRINT("ok\n");
+	}	
+}
+
+
+void PspMemory::copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes) {
+	PSP_DEBUG_PRINT("copy32Aligned(): dst32[%p], src32[%p], bytes[%d]\n", dst32, src32, bytes);
+
+	int words8 = bytes >> 5;
+	
+	// try blocks of 8 words at a time
+	if (words8) {
+		while (words8--) {
+			uint32 a, b, c, d;
+			a = src32[0];
+			b = src32[1];
+			c = src32[2];
+			d = src32[3];
+			dst32[0] = a;
+			dst32[1] = b;
+			dst32[2] = c;
+			dst32[3] = d;
+			a = src32[4];
+			b = src32[5];
+			c = src32[6];
+			d = src32[7];
+			dst32[4] = a;
+			dst32[5] = b;
+			dst32[6] = c;
+			dst32[7] = d;
+			dst32 += 8;
+			src32 += 8;
+		}				
+	}
+	
+	int words4 = (bytes & 0x1F) >> 4;
+	
+	// try blocks of 4 words at a time
+	if (words4) {
+		uint32 a, b, c, d;
+		a = src32[0];
+		b = src32[1];
+		c = src32[2];
+		d = src32[3];
+		dst32[0] = a;
+		dst32[1] = b;
+		dst32[2] = c;
+		dst32[3] = d;
+		dst32 += 4;
+		src32 += 4;
+	}
+	
+	int bytesLeft = (bytes & 0xF);	// only look at bytes left after we did the above
+	int wordsLeft = bytesLeft >> 2;
+	
+	// now just do single words
+	while (wordsLeft) {
+		*dst32++ = *src32++;
+		wordsLeft--;
+	}
 
-	return;		// So we have something to jump to with the label
+	bytesLeft = bytes & 0x3;	// get remaining bytes
+
+	PSP_DEBUG_PRINT("bytesLeft[%d]\n", bytesLeft);
+
+	byte *dst = (byte *)dst32;
+	byte *src = (byte *)src32;
+	
+	while (bytesLeft--) {
+		*dst++ = *src++;
+	}
 }
 
-inline void Copier::copy8(byte *dst, const byte *src, uint32 bytes) {
-	for (; bytes > 0; bytes--) {
-		*dst = *src;
-		dst++;
-		src++;
+void PspMemory::swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format) {
+	DEBUG_ENTER_FUNC();
+	int words4 = bytes >> 4;
+	
+	// try blocks of 4 words at a time
+	while (words4--) {
+		uint32 a, b, c, d;
+		a = format.swapRedBlue32(src32[0]);
+		b = format.swapRedBlue32(src32[1]);
+		c = format.swapRedBlue32(src32[2]);
+		d = format.swapRedBlue32(src32[3]);
+		dst32[0] = a;
+		dst32[1] = b;
+		dst32[2] = c;
+		dst32[3] = d;
+		dst32 += 4;
+		src32 += 4;
+	}
+
+	uint32 bytesLeft = bytes & 0xF;
+	uint32 words = bytesLeft >> 2;
+	
+	// now just do words
+	while (words--) {
+		*dst32++ = format.swapRedBlue32(*src32++);
+	}	
+
+	bytesLeft = bytes & 0x3;
+	
+	if (bytesLeft) {	// for swap, can only be 1 short left
+		*((uint16 *)dst32) = format.swapRedBlue16(*((uint16 *)src32));
 	}
 }
 
-inline void Copier::copy16(uint16 *dst, const uint16 *src, uint32 bytes, PSPPixelFormat *format /* = NULL */) {
-	uint32 shorts = bytes >> 1;
-	uint32 remainingBytes = bytes & 1;
-	bool swapRB = format ? format->swapRB : false;
 
-	if (swapRB) {
-		for (; shorts > 0 ; shorts--) {
-			*dst = format->swapRedBlue16(*src);
-			dst++;
-			src++;
+// More challenging -- need to shift
+// Assume dst is aligned
+void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, uint32 alignSrc) {
+	PSP_DEBUG_PRINT("copy32Misaligned: dst32[%p], src[%p], bytes[%d], alignSrc[%d]\n", dst32, src, bytes, alignSrc);
+	
+	uint32 *src32 = (uint32 *)(((uint32)src) & 0xFFFFFFFC);	// remove misalignment
+	uint32 shiftValue, lastShiftValue;
+	
+	switch (alignSrc) {
+	case 1:
+		shiftValue = 8;
+		lastShiftValue = 24;
+		break;
+	case 2:
+		shiftValue = 16;
+		lastShiftValue = 16;
+		break;
+	default: /* 3 */
+		shiftValue = 24;
+		lastShiftValue = 8;
+		break;
+	}
+
+	uint32 dstWord, srcWord;
+
+	// Try to do groups of 4 words
+	uint32 words4 = bytes >> 4;
+	
+	srcWord = *src32;		// preload 1st word so we read ahead
+	
+	for (; words4; words4--) {
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[1];
+		dstWord |= srcWord << lastShiftValue;
+		dst32[0] = dstWord;
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[2];
+		dstWord |= srcWord << lastShiftValue;
+		dst32[1] = dstWord;
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[3];
+		dstWord |= srcWord << lastShiftValue;
+		dst32[2] = dstWord;
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[4];
+		dstWord |= srcWord << lastShiftValue;
+		dst32[3] = dstWord;
+		src32 += 4;
+		dst32 += 4;
+	}
+	
+	uint32 words = (bytes & 0xF) >> 2;	// now get remaining words
+	
+	// we read one word ahead of what we write
+	// setup the first read
+	
+	for (; words ;words--) {
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[1];				// we still go one ahead
+		src32++;
+		dstWord |= srcWord << lastShiftValue;
+		*dst32++ = dstWord;
+	}
+	
+	uint32 bytesLeft = bytes & 3;	// and remaining bytes
+		
+	if (bytesLeft) {
+		byte *dst8 = (byte *)dst32;
+		byte *src8 = ((byte *)src32) + ((uint32)src & 0x3);	// get exact location we should be at
+
+		for(; bytesLeft; bytesLeft--) {
+			*dst8++ = *src8++;
 		}
-	} else {
-		for (; shorts > 0 ; shorts--) {
-			*dst = *src;
-			dst++;
-			src++;
+	}
+}
+
+// More challenging -- need to shift
+// We assume dst is aligned
+void PspMemory::swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+	DEBUG_ENTER_FUNC();
+
+	const uint32 shiftValue = 16;
+	uint32 *src32 = (uint32 *)(((uint32)src16) & 0xFFFFFFFC);	// remove misalignment
+	
+	// Try to do groups of 4 words
+	uint32 words4 = bytes >> 4;
+	uint32 srcWord = src32[0];	// preload
+
+	while (words4--) {
+		uint32 dstWord = srcWord >> shiftValue;
+		srcWord = src32[1];
+		dstWord |= srcWord << shiftValue;
+		dst32[0] = format.swapRedBlue32(dstWord);
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[2];
+		dstWord |= srcWord << shiftValue;
+		dst32[1] = format.swapRedBlue32(dstWord);
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[3];
+		dstWord |= srcWord << shiftValue;
+		dst32[2] = format.swapRedBlue32(dstWord);
+		dstWord = srcWord >> shiftValue;
+		srcWord = src32[4];
+		dstWord |= srcWord << shiftValue;
+		dst32[3] = format.swapRedBlue32(dstWord);
+		src32 += 4;
+		dst32 += 4;
+	}
+	
+	uint32 words = (bytes & 0xF) >> 2;
+	
+	// we read one word ahead of what we write
+	// setup the first read
+	if (words) {
+		//srcWord = *src32++;	// don't need this. already loaded
+		src32++;	// we already have the value loaded in
+		
+		while (words--) {
+			uint32 dstWord = srcWord >> shiftValue;
+			srcWord = *src32++;
+			dstWord |= srcWord << shiftValue;
+			*dst32++ = format.swapRedBlue32(dstWord);
 		}
 	}
-	if (remainingBytes)
-		*(byte *)dst = *(byte *)src;
+	
+	uint32 bytesLeft = bytes & 3;
+	
+	if (bytesLeft) {	// for swap, can only be 1 short left
+		*((uint16 *)dst32) = format.swapRedBlue16((uint16)(srcWord >> shiftValue));
+	}
 }
 
+inline void PspMemory::copy16(uint16 *dst16, const uint16 *src16, uint32 bytes) {
+	PSP_DEBUG_PRINT("copy16(): dst16[%p], src16[%p], bytes[%d]\n", dst16, src16, bytes);
+	
+	uint32 shorts = bytes >> 1;
+	uint32 remainingBytes = bytes & 1;
+
+	for (; shorts > 0 ; shorts--) {
+		*dst16++ = *src16++;
+	}
+	if (remainingBytes)
+		*(byte *)dst16 = *(byte *)src16;
+}
 
 // Class VramAllocator -----------------------------------
 
diff --git a/backends/platform/psp/memory.h b/backends/platform/psp/memory.h
index a198095090..793bc94888 100644
--- a/backends/platform/psp/memory.h
+++ b/backends/platform/psp/memory.h
@@ -27,17 +27,68 @@
 #ifndef PSP_MEMORY_H
 #define PSP_MEMORY_H
 
+#include "backends/platform/psp/psppixelformat.h"
+#include "common/list.h"
+
 #define UNCACHED(x)		((byte *)(((uint32)(x)) | 0x40000000))	/* make an uncached access */
 #define CACHED(x)		((byte *)(((uint32)(x)) & 0xBFFFFFFF))	/* make an uncached access into a cached one */
 
+#define MIN_AMOUNT_FOR_COMPLEX_COPY  8
+#define MIN_AMOUNT_FOR_MISALIGNED_COPY 8
+
+//#define __PSP_DEBUG_PRINT__
+
+#include "backends/platform/psp/trace.h"
+
 /**
  *	Class that does memory copying and swapping if needed
  */
-class Copier {
-public:
-	static void copy(byte *dst, const byte *src, uint32 bytes, PSPPixelFormat *format = NULL);
-	static void copy8(byte *dst, const byte *src, uint32 bytes);
-	static void copy16(uint16 *dst, const uint16 *src, uint32 bytes, PSPPixelFormat *format = NULL);
+class PspMemory {
+private:
+	static void testCopy(const byte *debugDst, const byte *debugSrc, uint32 debugBytes);
+	static void testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format);
+	static void copy(byte *dst, const byte *src, uint32 bytes);
+	static void swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
+	static void copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes);
+	static void swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format);
+	static void copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, uint32 alignSrc);
+	static void swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
+	static void copy16(uint16 *dst, const uint16 *src, uint32 bytes);
+
+	// For swapping, we know that we have multiples of 16 bits
+	static void swap16(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+		PSP_DEBUG_PRINT("swap16 called with dst16[%p], src16[%p], bytes[%d]\n", dst16, src16, bytes);
+		uint32 shorts = bytes >> 1;
+
+		while (shorts--) {
+			*dst16++ = format.swapRedBlue16(*src16++);
+		}
+	}
+	
+	static void copy8(byte *dst, const byte *src, uint32 bytes) {
+		PSP_DEBUG_PRINT("copy8 called with dst[%p], src[%p], bytes[%d]\n", dst, src, bytes);
+		while (bytes--) {
+			*dst++ = *src++;
+		}
+	}
+
+public:	
+	// This is the interface to the outside world
+	static void fastCopy(byte *dst, const byte *src, uint32 bytes) {
+		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) {
+			copy8(dst, src, bytes);
+		} else {	// go to more powerful copy
+			copy(dst, src, bytes);
+		}
+	}
+
+	static void fastSwap(byte *dst, const byte *src, uint32 bytes, PSPPixelFormat &format) {
+		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY * 2) {
+			swap16((uint16 *)dst, (uint16 *)src, bytes, format);
+		} else {	// go to more powerful copy
+			swap((uint16 *)dst, (uint16 *)src, bytes, format);
+		}
+	}
 };
 
 /**
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index f7191fe14f..4652189ab4 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -12,10 +12,14 @@ MODULE_OBJS := powerman.o \
 	cursor.o \
 	trace.o \
 	psploader.o \
-	pspkeyboard.o
+	pspkeyboard.o \
+	audio.o \
+	thread.o \
+	rtc.o \
+	mp3.o \
+	tests.o
 
-MODULE_DIRS += \
-	backends/platform/psp/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
new file mode 100644
index 0000000000..e25891396b
--- /dev/null
+++ b/backends/platform/psp/mp3.cpp
@@ -0,0 +1,487 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+#include "common/debug.h"
+#include "common/stream.h"
+#include "common/util.h"
+#include "common/singleton.h"
+#include "common/mutex.h"
+
+#include "sound/audiostream.h"
+
+#include <pspaudiocodec.h>
+#include <psputility_modules.h>
+#include <pspthreadman.h>
+#include <pspsysmem.h>
+#include <pspmodulemgr.h>
+#include <psputility_avmodules.h>
+#include <mad.h> 
+#include "backends/platform/psp/mp3.h"
+
+//#define DISABLE_PSP_MP3		// to make us use the regular MAD decoder instead
+
+//#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
+//#define __PSP_DEBUG_PRINT__ 
+#include "backends/platform/psp/trace.h"
+
+//#define PRINT_BUFFERS	/* to debug MP3 buffers */
+
+namespace Audio {
+
+class Mp3PspStream;
+
+bool Mp3PspStream::_decoderInit = false;	// has the decoder been initialized
+#ifdef DISABLE_PSP_MP3
+bool Mp3PspStream::_decoderFail = true;		// pretend the decoder failed
+#else
+bool Mp3PspStream::_decoderFail = false;	// has the decoder failed to load
+#endif
+
+bool Mp3PspStream::initDecoder() {
+	DEBUG_ENTER_FUNC();
+	
+	if (_decoderInit) {
+		PSP_ERROR("Already initialized!");
+		return true;
+	}
+
+	// Based on PSP firmware version, we need to do different things to do Media Engine processing
+	uint32 firmware = sceKernelDevkitVersion();
+	PSP_DEBUG_PRINT("Firmware version 0x%x\n", firmware);
+    if (firmware == 0x01050001){
+		if (!loadStartAudioModule((char *)(void *)"flash0:/kd/me_for_vsh.prx",
+			PSP_MEMORY_PARTITION_KERNEL)) {
+			PSP_ERROR("failed to load me_for_vsh.prx. ME cannot start.\n");
+			_decoderFail = true;
+			return false;
+		}
+        if (!loadStartAudioModule((char *)(void *)"flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL)) {
+			PSP_ERROR("failed to load audiocodec.prx. ME cannot start.\n");
+			_decoderFail = true;
+			return false;
+		}	
+    } else {		
+        if (sceUtilityLoadAvModule(PSP_AV_MODULE_AVCODEC) < 0) {
+			PSP_ERROR("failed to load AVCODEC module. ME cannot start.\n");
+			_decoderFail = true;
+			return false;
+		}
+	}
+	
+	PSP_DEBUG_PRINT("Using PSP's ME for MP3\n");	// important to know this is happening
+
+	_decoderInit = true;
+	return true;
+}
+
+bool Mp3PspStream::stopDecoder() {
+	DEBUG_ENTER_FUNC();
+	
+	if (!_decoderInit)
+		return true;
+		
+	// Based on PSP firmware version, we need to do different things to do Media Engine processing
+    if (sceKernelDevkitVersion() == 0x01050001){
+/*      if (!unloadAudioModule("flash0:/kd/me_for_vsh.prx", PSP_MEMORY_PARTITION_KERNEL) ||
+			!unloadAudioModule("flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL) {
+			PSP_ERROR("failed to unload audio module\n");
+			return false;
+		}
+*/
+    }else{
+        if (sceUtilityUnloadModule(PSP_MODULE_AV_AVCODEC) < 0) {
+			PSP_ERROR("failed to unload avcodec module\n");
+			return false;
+		}	
+	}
+		
+	_decoderInit = false;	
+	return true;
+}
+
+//Load a PSP audio module
+bool Mp3PspStream::loadStartAudioModule(const char *modname, int partition){
+	DEBUG_ENTER_FUNC();
+
+    SceKernelLMOption option;
+    SceUID modid;
+
+    memset(&option, 0, sizeof(option));
+    option.size = sizeof(option);
+    option.mpidtext = partition;
+    option.mpiddata = partition;
+    option.position = 0;
+    option.access = 1;
+
+    modid = sceKernelLoadModule(modname, 0, &option);
+    if (modid < 0) {
+		PSP_ERROR("Failed to load module %s. Got error 0x%x\n", modname, modid);
+        return false;
+	}
+
+    int ret = sceKernelStartModule(modid, 0, NULL, NULL, NULL);
+	if (ret < 0) {
+		PSP_ERROR("Failed to start module %s. Got error 0x%x\n", modname, ret);
+        return false;
+	}
+	return true;
+}
+
+// TODO: make parallel function for unloading the 1.50 modules
+
+Mp3PspStream::Mp3PspStream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose) :
+	_inStream(inStream),
+	_disposeAfterUse(dispose),
+	_pcmLength(0),
+	_posInFrame(0),
+	_state(MP3_STATE_INIT),
+	_length(0, 1000),
+	_sampleRate(0),
+	_totalTime(mad_timer_zero) {
+	
+	DEBUG_ENTER_FUNC();
+
+	assert(_decoderInit);	// must be initialized by now
+	
+	// let's leave the buffer guard -- who knows, it may be good?
+	memset(_buf, 0, sizeof(_buf));
+	memset(_codecInBuffer, 0, sizeof(_codecInBuffer));
+	
+	initStream();	// init needed stuff for the stream
+
+	while (_state != MP3_STATE_EOS)
+		findValidHeader();	// get a first header so we can read basic stuff
+	
+	_sampleRate = _header.samplerate;	// copy it before it gets destroyed
+	
+	_length = Timestamp(mad_timer_count(_totalTime, MAD_UNITS_MILLISECONDS), getRate());
+	
+	//initStreamME();		// init the stuff needed for the ME to work
+	
+	deinitStream();
+	//releaseStreamME();
+
+	_state = MP3_STATE_INIT;
+}
+
+int Mp3PspStream::initStream() {
+	DEBUG_ENTER_FUNC();
+
+	if (_state != MP3_STATE_INIT)
+		deinitStream();
+
+	// Init MAD
+	mad_stream_init(&_stream);
+	mad_header_init(&_header);
+
+	// Reset the stream data
+	_inStream->seek(0, SEEK_SET);
+	_totalTime = mad_timer_zero;
+	_posInFrame = 0;
+
+	// Update state
+	_state = MP3_STATE_READY;
+
+	// Read the first few sample bytes into the buffer
+	readMP3DataIntoBuffer();
+	
+	return true;
+}
+
+bool Mp3PspStream::initStreamME() {
+	// The following will eventually go into the thread
+	sceAudiocodecReleaseEDRAM(_codecParams);	// do we need this?
+
+	memset(_codecParams, 0, sizeof(_codecParams));
+	
+	// Init the MP3 hardware
+	int ret = 0;
+	ret = sceAudiocodecCheckNeedMem(_codecParams, 0x1002);
+	if (ret < 0) {
+		PSP_ERROR("failed to init MP3 ME module. sceAudiocodecCheckNeedMem returned 0x%x.\n", ret);
+		return false;
+	}
+	PSP_DEBUG_PRINT("sceAudiocodecCheckNeedMem returned %d\n", ret);
+	ret = sceAudiocodecGetEDRAM(_codecParams, 0x1002);
+	if (ret < 0) {
+		PSP_ERROR("failed to init MP3 ME module. sceAudiocodecGetEDRAM returned 0x%x.\n", ret);
+		return false;
+	}
+	PSP_DEBUG_PRINT("sceAudioCodecGetEDRAM returned %d\n", ret);
+	
+	PSP_DEBUG_PRINT("samplerate[%d]\n", _sampleRate);
+	_codecParams[10] = _sampleRate;
+	
+	ret = sceAudiocodecInit(_codecParams, 0x1002);
+	if (ret < 0) {
+		PSP_ERROR("failed to init MP3 ME module. sceAudiocodecInit returned 0x%x.\n", ret);
+		return false;
+	}
+	
+	return true;
+}
+
+Mp3PspStream::~Mp3PspStream() {
+	DEBUG_ENTER_FUNC();
+	
+	deinitStream();
+	releaseStreamME(); 	// free the memory used for this stream
+
+	if (_disposeAfterUse == DisposeAfterUse::YES)
+		delete _inStream;
+}
+
+void Mp3PspStream::deinitStream() {
+	DEBUG_ENTER_FUNC();
+
+	if (_state == MP3_STATE_INIT)
+		return;
+
+	// Deinit MAD
+	mad_header_finish(&_header);
+	mad_stream_finish(&_stream);
+	
+	_state = MP3_STATE_EOS;
+}
+
+void Mp3PspStream::releaseStreamME() {
+	sceAudiocodecReleaseEDRAM(_codecParams);
+}	
+
+void Mp3PspStream::decodeMP3Data() {
+	DEBUG_ENTER_FUNC();
+	
+	do {
+		if (_state == MP3_STATE_INIT) {
+			initStream();
+			initStreamME();
+		}
+
+		if (_state == MP3_STATE_EOS)
+			return;
+			
+		findValidHeader();	// seach for next valid header
+
+		while (_state == MP3_STATE_READY) {
+			_stream.error = MAD_ERROR_NONE;
+
+			uint32 frame_size = _stream.next_frame - _stream.this_frame;
+			uint32 samplesPerFrame = _header.layer == MAD_LAYER_III ? 576 : 1152; 	// Varies by layer
+			// calculate frame size -- try
+			//uint32 calc_frame_size = ((144 * _header.bitrate) / 22050) + (_header.flags & MAD_FLAG_PADDING ? 1 : 0);
+			
+			// Get stereo/mono
+			uint32 multFactor = 1;
+			if (_header.mode != MAD_MODE_SINGLE_CHANNEL)	// mono	- x2 for 16bit
+				multFactor *= 2;							// stereo - x4 for 16bit
+			
+			PSP_DEBUG_PRINT("MP3 frame size[%d]. Samples[%d]. Multfactor[%d] pad[%d]\n", frame_size, samplesPerFrame, multFactor, _header.flags & MAD_FLAG_PADDING);
+			memcpy(_codecInBuffer, _stream.this_frame, frame_size);	// we need it aligned
+
+			// set up parameters for ME
+			_codecParams[6] = (unsigned long)_codecInBuffer;
+			_codecParams[8] = (unsigned long)_pcmSamples;
+			_codecParams[7] = frame_size;
+			_codecParams[9] = samplesPerFrame * multFactor;	// x2 for stereo
+			
+			// debug
+#ifdef PRINT_BUFFERS
+			PSP_DEBUG_PRINT("mp3 frame:\n");
+			for (int i=0; i < (int)frame_size; i++) {
+				PSP_DEBUG_PRINT_SAMELN("%x ", _codecInBuffer[i]);
+			}
+			PSP_DEBUG_PRINT("\n");
+#endif
+			// Decode the next frame
+			// This function blocks. We'll want to put it in a thread
+			int ret = sceAudiocodecDecode(_codecParams, 0x1002);
+			if (ret < 0) {
+				PSP_INFO_PRINT("failed to decode MP3 data in ME. sceAudiocodecDecode returned 0x%x\n", ret);
+				// handle error here
+			}
+
+#ifdef PRINT_BUFFERS
+			PSP_DEBUG_PRINT("PCM frame:\n");
+			for (int i=0; i < (int)_codecParams[9]; i+=2) {	// changed from i+=2
+				PSP_DEBUG_PRINT_SAMELN("%d ", (int16)_pcmSamples[i]);
+			}
+			PSP_DEBUG_PRINT("\n");
+#endif
+			_pcmLength = samplesPerFrame;
+			_posInFrame = 0;
+			break;
+		}
+	} while (_state != MP3_STATE_EOS && _stream.error == MAD_ERROR_BUFLEN);
+
+	if (_stream.error != MAD_ERROR_NONE)	// catch EOS
+		_state = MP3_STATE_EOS;
+}
+
+void Mp3PspStream::readMP3DataIntoBuffer() {
+	DEBUG_ENTER_FUNC();
+
+	uint32 remaining = 0;
+
+	// Give up immediately if we already used up all data in the stream
+	if (_inStream->eos()) {
+		_state = MP3_STATE_EOS;
+		return;
+	}
+
+	if (_stream.next_frame) {
+		// If there is still data in the MAD stream, we need to preserve it.
+		// Note that we use memmove, as we are reusing the same buffer,
+		// and hence the data regions we copy from and to may overlap.
+		remaining = _stream.bufend - _stream.next_frame;
+		assert(remaining < BUFFER_SIZE);	// Paranoia check
+		memmove(_buf, _stream.next_frame, remaining);	// TODO: may want another buffer
+	}
+
+	// Try to read the next block
+	uint32 size = _inStream->read(_buf + remaining, BUFFER_SIZE - remaining);
+	if (size <= 0) {
+		_state = MP3_STATE_EOS;
+		return;
+	}
+
+	// Feed the data we just read into the stream decoder
+	_stream.error = MAD_ERROR_NONE;
+	mad_stream_buffer(&_stream, _buf, size + remaining);	// just setup the pointers
+}
+
+bool Mp3PspStream::seek(const Timestamp &where) {
+	DEBUG_ENTER_FUNC();
+
+	if (where == _length) {
+		_state = MP3_STATE_EOS;
+		return true;
+	} else if (where > _length) {
+		return false;
+	}
+
+	const uint32 time = where.msecs();
+
+	mad_timer_t destination;
+	mad_timer_set(&destination, time / 1000, time % 1000, 1000);
+
+	// Check if we need to rewind
+	if (_state != MP3_STATE_READY || mad_timer_compare(destination, _totalTime) < 0) {
+		initStream();
+		initStreamME();
+	}
+
+	// The ME will need clear data no matter what once we seek?
+	//if (mad_timer_compare(destination, _totalTime) > 0 && _state != MP3_STATE_EOS)
+	//	initStreamME();
+
+	// Skip ahead
+	while (mad_timer_compare(destination, _totalTime) > 0 && _state != MP3_STATE_EOS)
+		findValidHeader();
+
+	return (_state != MP3_STATE_EOS);
+}
+
+// Seek in the stream, finding the next valid header
+void Mp3PspStream::findValidHeader() {
+	DEBUG_ENTER_FUNC();
+
+	if (_state != MP3_STATE_READY)
+		return;
+
+	// If necessary, load more data into the stream decoder
+	if (_stream.error == MAD_ERROR_BUFLEN)
+		readMP3DataIntoBuffer();
+
+	while (_state != MP3_STATE_EOS) {
+		_stream.error = MAD_ERROR_NONE;
+
+		// Decode the next header.
+		if (mad_header_decode(&_header, &_stream) == -1) {
+			if (_stream.error == MAD_ERROR_BUFLEN) {
+				readMP3DataIntoBuffer();  // Read more data
+				continue;
+			} else if (MAD_RECOVERABLE(_stream.error)) {
+				debug(6, "MP3PSPStream: Recoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream));
+				continue;
+			} else {
+				warning("MP3PSPStream: Unrecoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream));
+				break;
+			}
+		}
+
+		// Sum up the total playback time so far
+		mad_timer_add(&_totalTime, _header.duration);
+		break;
+	}
+
+	if (_stream.error != MAD_ERROR_NONE)
+		_state = MP3_STATE_EOS;
+}
+
+int Mp3PspStream::readBuffer(int16 *buffer, const int numSamples) {
+	DEBUG_ENTER_FUNC();
+
+	int samples = 0;
+#ifdef PRINT_BUFFERS	
+	int16 *debugBuffer = buffer;
+#endif	
+	
+	// Keep going as long as we have input available
+	while (samples < numSamples && _state != MP3_STATE_EOS) {
+		const int len = MIN(numSamples, samples + (int)(_pcmLength - _posInFrame) * MAD_NCHANNELS(&_header));
+		
+		while (samples < len) {
+			*buffer++ = _pcmSamples[_posInFrame << 1];
+			samples++;
+			if (MAD_NCHANNELS(&_header) == 2) {
+				*buffer++ = _pcmSamples[(_posInFrame << 1) + 1];
+				samples++;
+			} 
+			_posInFrame++;	// always skip an extra sample since ME always outputs stereo
+		}
+		
+		//memcpy(buffer, &_pcmSamples[_posInFrame], len << 1);	   // 16 bits
+		//_posInFrame += len;		// next time we start from the middle
+
+		if (_posInFrame >= _pcmLength) {
+			// We used up all PCM data in the current frame -- read & decode more
+			decodeMP3Data();
+		}
+	}
+	
+#ifdef PRINT_BUFFERS
+		PSP_INFO_PRINT("buffer:\n");
+		for (int i = 0; i<numSamples; i++)
+			PSP_INFO_PRINT("%d ", debugBuffer[i]);
+		PSP_INFO_PRINT("\n\n");
+#endif		
+	
+	return samples;
+}
+
+} // End of namespace Audio
+
+
diff --git a/backends/platform/psp/mp3.h b/backends/platform/psp/mp3.h
new file mode 100644
index 0000000000..029b3e498c
--- /dev/null
+++ b/backends/platform/psp/mp3.h
@@ -0,0 +1,121 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef SOUND_MP3_PSP_H
+#define SOUND_MP3_PSP_H
+
+#include "common/types.h"
+#include "common/scummsys.h"
+
+namespace Common {
+	class SeekableReadStream;
+}
+
+namespace Audio {
+
+class AudioStream;
+class SeekableAudioStream;
+
+class Mp3PspStream : public SeekableAudioStream {
+protected:
+	enum State {
+		MP3_STATE_INIT,		// Need to init the decoder
+		MP3_STATE_READY,	// ready for processing data
+		MP3_STATE_EOS		// end of data reached (may need to loop)
+	};
+
+	#define MAX_SAMPLES_PER_FRAME	2048 * 2
+	int16 _pcmSamples[MAX_SAMPLES_PER_FRAME] __attribute__((aligned(64)));	// samples to output PCM data into
+	byte _codecInBuffer[3072] __attribute__((aligned(64))); // the codec always needs alignment
+	unsigned long _codecParams[65]__attribute__((aligned(64)));		// TODO: change to struct
+
+	Common::SeekableReadStream *_inStream;
+	DisposeAfterUse::Flag _disposeAfterUse;
+	
+	uint32 _pcmLength;		// how many pcm samples we have (/2 for mono)
+	
+	uint _posInFrame;		// position in frame
+	State _state;			// what state the stream is in
+
+	Timestamp _length;
+	uint32 _sampleRate;
+
+	mad_timer_t _totalTime;
+	mad_stream _stream;		//
+	mad_header _header;		// This is all we need from libmad
+	
+	static bool _decoderInit;	// has the decoder been initialized
+	static bool _decoderFail;	// has the decoder failed to load
+	
+	enum {
+		BUFFER_SIZE = 5 * 8192
+	};
+
+	// This buffer contains a slab of input data
+	byte _buf[BUFFER_SIZE + MAD_BUFFER_GUARD];
+	
+	void decodeMP3Data();
+	void readMP3DataIntoBuffer();
+
+	static bool loadStartAudioModule(const char *modname, int partition);
+	int initStream();
+	void findValidHeader();
+	void deinitStream();
+
+	// to init and uninit ME decoder
+	static bool initDecoder();
+	static bool stopDecoder();
+	
+	// ME functions for stream
+	bool initStreamME();
+	void releaseStreamME();
+	
+public:
+	Mp3PspStream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose);
+	~Mp3PspStream();
+	
+	// This function avoids having to create streams when it's not possible
+	static inline bool isOkToCreateStream() {
+		if (_decoderFail)			// fatal failure
+			return false;
+		if (!_decoderInit)			// if we're not initialized
+			if (!initDecoder())		// check if we failed init
+				return false;
+		return true;	
+	}
+
+	int readBuffer(int16 *buffer, const int numSamples);
+
+	bool endOfData() const		{ return _state == MP3_STATE_EOS; }
+	bool isStereo() const		{ return MAD_NCHANNELS(&_header) == 2; }
+	int getRate() const			{ return _sampleRate; }
+
+	bool seek(const Timestamp &where);
+	Timestamp getLength() const { return _length; }
+};
+
+} // End of namespace Audio
+
+#endif // #ifndef SOUND_MP3_PSP_H
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 58d98bc219..b09d9c0c00 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -37,6 +37,7 @@
 #include "backends/platform/psp/psppixelformat.h"
 #include "backends/platform/psp/osys_psp.h"
 #include "backends/platform/psp/powerman.h"
+#include "backends/platform/psp/rtc.h"
 
 #include "backends/saves/psp/psp-saves.h"
 #include "backends/timer/default/default-timer.h"
@@ -48,7 +49,6 @@
 
 #include "backends/platform/psp/trace.h"
 
-
 #define	SAMPLES_PER_SEC	44100
 
 static int timer_handler(int t) {
@@ -57,10 +57,6 @@ static int timer_handler(int t) {
 	return t;
 }
 
-void OSystem_PSP::initSDL() {
-	SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER);
-}
-
 OSystem_PSP::~OSystem_PSP() {}
 
 #define PSP_SCREEN_WIDTH 480
@@ -69,6 +65,9 @@ OSystem_PSP::~OSystem_PSP() {}
 void OSystem_PSP::initBackend() {
 	DEBUG_ENTER_FUNC();
 
+	// Instantiate real time clock
+	PspRtc::instance();
+	
 	_cursor.enableCursorPalette(false);
 	_cursor.setXY(PSP_SCREEN_WIDTH >> 1, PSP_SCREEN_HEIGHT >> 1);	// Mouse in the middle of the screen
 
@@ -84,8 +83,6 @@ void OSystem_PSP::initBackend() {
 	_inputHandler.setKeyboard(&_keyboard);
 	_inputHandler.init();
 
-	initSDL();
-
 	_savefile = new PSPSaveFileManager;
 
 	_timer = new DefaultTimerManager();
@@ -122,11 +119,13 @@ int OSystem_PSP::getDefaultGraphicsMode() const {
 
 bool OSystem_PSP::setGraphicsMode(int mode) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;
 	return _displayManager.setGraphicsMode(mode);
 }
 
 bool OSystem_PSP::setGraphicsMode(const char *name) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;
 	return _displayManager.setGraphicsMode(name);
 }
 
@@ -141,7 +140,7 @@ Graphics::PixelFormat OSystem_PSP::getScreenFormat() const {
 	return _screen.getScummvmPixelFormat();
 }
 
-Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() {
+Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() const {
 	return _displayManager.getSupportedPixelFormats();
 }
 
@@ -149,6 +148,7 @@ Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() {
 
 void OSystem_PSP::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_displayManager.setSizeAndPixelFormat(width, height, format);
 
 	_cursor.setVisible(false);
@@ -167,6 +167,7 @@ int16 OSystem_PSP::getHeight() {
 
 void OSystem_PSP::setPalette(const byte *colors, uint start, uint num) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_screen.setPartialPalette(colors, start, num);
 	_cursor.setScreenPalette(colors, start, num);
 	_cursor.clearKeyColor();
@@ -174,6 +175,7 @@ void OSystem_PSP::setPalette(const byte *colors, uint start, uint num) {
 
 void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_cursor.setCursorPalette(colors, start, num);
 	_cursor.enableCursorPalette(true);
 	_cursor.clearKeyColor();	// Do we need this?
@@ -181,37 +183,43 @@ void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) {
 
 void OSystem_PSP::disableCursorPalette(bool disable) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_cursor.enableCursorPalette(!disable);
 }
 
 void OSystem_PSP::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_screen.copyFromRect(buf, pitch, x, y, w, h);
 }
 
 Graphics::Surface *OSystem_PSP::lockScreen() {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	return _screen.lockAndGetForEditing();
 }
 
 void OSystem_PSP::unlockScreen() {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	// The screen is always completely updated anyway, so we don't have to force a full update here.
 	_screen.unlock();
 }
 
 void OSystem_PSP::updateScreen() {
 	DEBUG_ENTER_FUNC();
-	_displayManager.renderAll();
+	_pendingUpdate = !_displayManager.renderAll();	// if we didn't update, we have a pending update
 }
 
 void OSystem_PSP::setShakePos(int shakeOffset) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;
 	_screen.setShakePos(shakeOffset);
 }
 
 void OSystem_PSP::showOverlay() {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_overlay.setVisible(true);
 	_cursor.setLimits(_overlay.getWidth(), _overlay.getHeight());
 	_cursor.useGlobalScaler(false);	// mouse with overlay is 1:1
@@ -219,6 +227,7 @@ void OSystem_PSP::showOverlay() {
 
 void OSystem_PSP::hideOverlay() {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_overlay.setVisible(false);
 	_cursor.setLimits(_screen.getWidth(), _screen.getHeight());
 	_cursor.useGlobalScaler(true);	// mouse needs to be scaled with screen
@@ -226,6 +235,7 @@ void OSystem_PSP::hideOverlay() {
 
 void OSystem_PSP::clearOverlay() {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_overlay.clearBuffer();
 }
 
@@ -236,6 +246,7 @@ void OSystem_PSP::grabOverlay(OverlayColor *buf, int pitch) {
 
 void OSystem_PSP::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_overlay.copyFromRect(buf, pitch, x, y, w, h);
 }
 
@@ -254,6 +265,8 @@ void OSystem_PSP::grabPalette(byte *colors, uint start, uint num) {
 
 bool OSystem_PSP::showMouse(bool v) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;
+	
 	PSP_DEBUG_PRINT("%s\n", v ? "true" : "false");
 	bool last = _cursor.isVisible();
 	_cursor.setVisible(v);
@@ -263,11 +276,14 @@ bool OSystem_PSP::showMouse(bool v) {
 
 void OSystem_PSP::warpMouse(int x, int y) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
 	_cursor.setXY(x, y);
 }
 
 void OSystem_PSP::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	DEBUG_ENTER_FUNC();
+	_pendingUpdate = false;	
+	
 	PSP_DEBUG_PRINT("pbuf[%p], w[%u], h[%u], hotspot:X[%d], Y[%d], keycolor[%d], scale[%d], pformat[%p]\n", buf, w, h, hotspotX, hotspotY, keycolor, cursorTargetScale, format);
 	if (format) {
 		PSP_DEBUG_PRINT("format: bpp[%d], rLoss[%d], gLoss[%d], bLoss[%d], aLoss[%d], rShift[%d], gShift[%d], bShift[%d], aShift[%d]\n", format->bytesPerPixel, format->rLoss, format->gLoss, format->bLoss, format->aLoss, format->rShift, format->gShift, format->bShift, format->aShift);
@@ -287,39 +303,54 @@ bool OSystem_PSP::pollEvent(Common::Event &event) {
 	// Pausing the engine is a necessary fix for games that use the timer for music synchronization
 	// 	recovering many hours later causes the game to crash. We're polling without mutexes since it's not critical to
 	//  get it right now.
-
 	PowerMan.pollPauseEngine();
 
+	// A hack:
+	// Check if we have a pending update that we missed for some reason (FPS throttling for example)
+	// Time between event polls is usually 5-10ms, so waiting for 4 calls before checking to update the screen should be fine
+	if (_pendingUpdate) {
+		_pendingUpdateCounter++;
+		
+		if (_pendingUpdateCounter >= 4) {
+			PSP_DEBUG_PRINT("servicing pending update\n");
+			updateScreen();
+			if (!_pendingUpdate) 	// we handled the update
+				_pendingUpdateCounter = 0;				
+		}
+	} else 
+		_pendingUpdateCounter = 0;	// reset the counter, no pending
+		
 	return _inputHandler.getAllInputs(event);
 }
 
-
 uint32 OSystem_PSP::getMillis() {
-	return SDL_GetTicks();
+	return PspRtc::instance().getMillis();
 }
 
 void OSystem_PSP::delayMillis(uint msecs) {
-	SDL_Delay(msecs);
+	PspThread::delayMillis(msecs);
 }
 
 void OSystem_PSP::setTimerCallback(TimerProc callback, int interval) {
-	SDL_SetTimer(interval, (SDL_TimerCallback)callback);
+	_pspTimer.setCallback((PspTimer::CallbackFunc)callback);
+	_pspTimer.setIntervalMs(interval);
+	_pspTimer.start();
 }
 
 OSystem::MutexRef OSystem_PSP::createMutex(void) {
-	return (MutexRef)SDL_CreateMutex();
+	return (MutexRef) new PspMutex(true);	// start with a full mutex
 }
 
 void OSystem_PSP::lockMutex(MutexRef mutex) {
-	SDL_mutexP((SDL_mutex *)mutex);
+	((PspMutex *)mutex)->lock();
 }
 
 void OSystem_PSP::unlockMutex(MutexRef mutex) {
-	SDL_mutexV((SDL_mutex *)mutex);
+	((PspMutex *)mutex)->unlock();
 }
 
 void OSystem_PSP::deleteMutex(MutexRef mutex) {
-	SDL_DestroyMutex((SDL_mutex *)mutex);
+	delete (PspMutex *)mutex;
 }
 
 void OSystem_PSP::mixCallback(void *sys, byte *samples, int len) {
@@ -331,8 +362,6 @@ void OSystem_PSP::mixCallback(void *sys, byte *samples, int len) {
 }
 
 void OSystem_PSP::setupMixer(void) {
-	SDL_AudioSpec desired;
-	SDL_AudioSpec obtained;
 
 	// Determine the desired output sampling frequency.
 	uint32 samplesPerSec = 0;
@@ -349,38 +378,21 @@ void OSystem_PSP::setupMixer(void) {
 	while (samples * 16 > samplesPerSec * 2)
 		samples >>= 1;
 
-	memset(&desired, 0, sizeof(desired));
-	desired.freq = samplesPerSec;
-	desired.format = AUDIO_S16SYS;
-	desired.channels = 2;
-	desired.samples = samples;
-	desired.callback = mixCallback;
-	desired.userdata = this;
-
 	assert(!_mixer);
-	if (SDL_OpenAudio(&desired, &obtained) != 0) {
-		warning("Could not open audio: %s", SDL_GetError());
-		_mixer = new Audio::MixerImpl(this, samplesPerSec);
-		assert(_mixer);
-		_mixer->setReady(false);
-	} else {
-		// Note: This should be the obtained output rate, but it seems that at
-		// least on some platforms SDL will lie and claim it did get the rate
-		// even if it didn't. Probably only happens for "weird" rates, though.
-		samplesPerSec = obtained.freq;
-
-		// Create the mixer instance and start the sound processing
-		_mixer = new Audio::MixerImpl(this, samplesPerSec);
-		assert(_mixer);
-		_mixer->setReady(true);
-
-		SDL_PauseAudio(0);
+
+	if (!_audio.open(samplesPerSec, 2, samples, mixCallback, this)) {
+		PSP_ERROR("failed to open audio\n");
+		return;
 	}
+	samplesPerSec = _audio.getFrequency();	// may have been changed by audio system
+	_mixer = new Audio::MixerImpl(this, samplesPerSec);
+	assert(_mixer);
+	_mixer->setReady(true);
+	_audio.unpause();
 }
 
 void OSystem_PSP::quit() {
-	SDL_CloseAudio();
-	SDL_Quit();
+	_audio.close();
 	sceKernelExitGame();
 }
 
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 8c5b40dcdf..5721296c94 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -38,8 +38,9 @@
 #include "backends/platform/psp/pspkeyboard.h"
 #include "backends/platform/psp/display_manager.h"
 #include "backends/platform/psp/input.h"
-
-#include <SDL.h>
+#include "backends/platform/psp/audio.h"
+#include "backends/timer/psp/timer.h"
+#include "backends/platform/psp/thread.h"
 
 class OSystem_PSP : public BaseBackend {
 private:
@@ -47,6 +48,8 @@ private:
 	Common::SaveFileManager *_savefile;
 	Audio::MixerImpl *_mixer;
 	Common::TimerManager *_timer;
+	bool _pendingUpdate;  			// save an update we couldn't perform
+	uint32 _pendingUpdateCounter;	// prevent checking for pending update too often, in a cheap way
 
 	// All needed sub-members
 	Screen _screen;
@@ -55,11 +58,11 @@ private:
 	DisplayManager _displayManager;
 	PSPKeyboard _keyboard;
 	InputHandler _inputHandler;
-
-	void initSDL();
+	PspAudio _audio;
+	PspTimer _pspTimer;
 
 public:
-	OSystem_PSP() : _savefile(0), _mixer(0), _timer(0) {}
+	OSystem_PSP() : _savefile(0), _mixer(0), _timer(0), _pendingUpdate(false), _pendingUpdateCounter(0) {}
 	~OSystem_PSP();
 
 	static OSystem *instance();
@@ -79,7 +82,7 @@ public:
 	int getGraphicsMode() const;
 #ifdef USE_RGB_COLOR
 	virtual Graphics::PixelFormat getScreenFormat() const;
-	virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+	virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
 #endif
 
 	// Screen size
diff --git a/backends/platform/psp/powerman.cpp b/backends/platform/psp/powerman.cpp
index df8da12f6d..eaadad16c5 100644
--- a/backends/platform/psp/powerman.cpp
+++ b/backends/platform/psp/powerman.cpp
@@ -23,16 +23,16 @@
  *
  */
 
-//#define __PSP_DEBUG_FUNCS__	/* can put this locally too */
-//#define __PSP_DEBUG_PRINT__
-#include "backends/platform/psp/trace.h"
-
 #include <psppower.h>
 #include <pspthreadman.h>
 
 #include "backends/platform/psp/powerman.h"
 #include "engine.h"
 
+//#define __PSP_DEBUG_FUNCS__	/* can put this locally too */
+//#define __PSP_DEBUG_PRINT__
+#include "backends/platform/psp/trace.h"
+
 DECLARE_SINGLETON(PowerManager)
 
 // Function to debug the Power Manager (we have no output to screen)
@@ -47,68 +47,30 @@ inline void PowerManager::debugPM() {
 *	Constructor
 *
 ********************************************/
-PowerManager::PowerManager() {
-	DEBUG_ENTER_FUNC();
-
-	_flagMutex = NULL;					/* Init mutex handle */
-	_listMutex = NULL;					/* Init mutex handle */
-	_condSuspendable = NULL;			/* Init condition variable */
-	_condPM = NULL;
-
-	_condSuspendable = SDL_CreateCond();
-	if (_condSuspendable <= 0) {
-		PSP_ERROR("Couldn't create Suspendable condition variable\n");
-	}
-
-	_condPM = SDL_CreateCond();
-	if (_condPM <= 0) {
-		PSP_ERROR("Couldn't create PM condition variable\n");
-	}
-
-	_flagMutex = SDL_CreateMutex();
-	if (_flagMutex <= 0) {
-		PSP_ERROR("Couldn't create flag Mutex\n");
-	}
-
-	_listMutex = SDL_CreateMutex();
-	if (_listMutex <= 0) {
-		PSP_ERROR("Couldn't create list Mutex\n");
-	}
-
-	_suspendFlag = false;
-	_criticalCounter = 0;	// How many are in the critical section
-	_pauseFlag = 0;
-	_pauseFlagOld = 0;
-	_pauseClientState = 0;
-	_listCounter = 0;
-	PMStatusSet(kInitDone);
-	_error = 0;
-}
+PowerManager::PowerManager() : _pauseFlag(false), _pauseFlagOld(false), _pauseClientState(UNPAUSED),
+								_suspendFlag(false), _flagMutex(true), _listMutex(true),
+								_criticalCounter(0), _listCounter(0), _error(0), _PMStatus(kInitDone) {}
 
 /*******************************************
 *
 *	Function to register to be notified when suspend/resume time comes
 *
 ********************************************/
-int PowerManager::registerSuspend(Suspendable *item) {
+bool PowerManager::registerForSuspend(Suspendable *item) {
 	DEBUG_ENTER_FUNC();
 	// Register in list
 	debugPM();
 
-	if (SDL_mutexP(_listMutex) != 0) {
-		PSP_ERROR("Couldn't lock _listMutex[%p]\n", _listMutex);
-	}
+	_listMutex.lock();
 
 	_suspendList.push_front(item);
 	_listCounter++;
 
-	if (SDL_mutexV(_listMutex) != 0) {
-		PSP_ERROR("Couldn't unlock _listMutex[%p]\n", _listMutex);
-	}
+	_listMutex.unlock();
 
 	debugPM();
 
-	return 0;
+	return true;
 }
 
 /*******************************************
@@ -116,26 +78,20 @@ int PowerManager::registerSuspend(Suspendable *item) {
 *	Function to unregister to be notified when suspend/resume time comes
 *
 ********************************************/
-int PowerManager::unregisterSuspend(Suspendable *item) {
+bool PowerManager::unregisterForSuspend(Suspendable *item) {
 	DEBUG_ENTER_FUNC();
 	debugPM();
 
 	// Unregister from stream list
-	if (SDL_mutexP(_listMutex) != 0) {
-		PSP_ERROR("Couldn't unlock _listMutex[%p]\n", _listMutex);
-	}
-
+	_listMutex.lock();
+	
 	_suspendList.remove(item);
 	_listCounter--;
 
-	if (SDL_mutexV(_listMutex) != 0) {
-		PSP_ERROR("Couldn't unlock _listMutex[%p]\n", _listMutex);
-	}
+	_listMutex.unlock();
 
-	PSP_DEBUG_PRINT("Out of unregisterSuspend\n");
 	debugPM();
-
-	return 0;
+	return true;
 }
 
 /*******************************************
@@ -144,21 +100,7 @@ int PowerManager::unregisterSuspend(Suspendable *item) {
 *
 ********************************************/
 PowerManager::~PowerManager() {
-	DEBUG_ENTER_FUNC();
-
-	PMStatusSet(kDestroyPM);
-
-	SDL_DestroyCond(_condSuspendable);
-	_condSuspendable = 0;
-
-	SDL_DestroyCond(_condPM);
-	_condPM = 0;
-
-	SDL_DestroyMutex(_flagMutex);
-	_flagMutex = 0;
-
-	SDL_DestroyMutex(_listMutex);
-	_listMutex = 0;
+	_PMStatus = kDestroyPM;
 }
 
 /*******************************************
@@ -171,114 +113,92 @@ PowerManager::~PowerManager() {
 *
 ********************************************/
 void PowerManager::pollPauseEngine() {
-
+	DEBUG_ENTER_FUNC();
+	
+	
 	bool pause = _pauseFlag;		// We copy so as not to have multiple values
 
-	if ((pause != _pauseFlagOld) && g_engine) { // Check to see if we have an engine
-		if (pause && _pauseClientState == PowerManager::Unpaused) {
-			_pauseClientState = PowerManager::Pausing;		// Tell PM we're in the middle of pausing
-			g_engine->pauseEngine(true);
-			PSP_DEBUG_PRINT_FUNC("Pausing engine\n");
-			_pauseClientState = PowerManager::Paused;		// Tell PM we're done pausing
-		} else if (!pause && _pauseClientState == PowerManager::Paused) {
-			g_engine->pauseEngine(false);
-			PSP_DEBUG_PRINT_FUNC("Unpausing for resume\n");
-			_pauseClientState = PowerManager::Unpaused;	// Tell PM we're in the middle of pausing
+	if (pause != _pauseFlagOld) { 
+		if (g_engine) { // Check to see if we have an engine
+			if (pause && _pauseClientState == UNPAUSED) {
+				_pauseClientState = PAUSING;		// Tell PM we're in the middle of pausing
+				g_engine->pauseEngine(true);
+				PSP_DEBUG_PRINT_FUNC("Pausing engine\n");
+				_pauseClientState = PAUSED;			// Tell PM we're done pausing
+			} else if (!pause && _pauseClientState == PAUSED) {
+				g_engine->pauseEngine(false);
+				PSP_DEBUG_PRINT_FUNC("Unpausing for resume\n");
+				_pauseClientState = UNPAUSED;		// Tell PM we're unpaused
+			}
 		}
-
 		_pauseFlagOld = pause;
 	}
 }
 
 /*******************************************
 *
-*	Function to be called by threads wanting to block on the PSP entering suspend
-*   Use this for small critical sections where you can easily restore the previous state.
-*
-********************************************/
-int PowerManager::blockOnSuspend()  {
-	return beginCriticalSection(true);
-}
-
-/*******************************************
-*
 *	Function to block on a suspend, then start a non-suspendable critical section
 *   Use this for large or REALLY critical critical-sections.
 *	Make sure to call endCriticalSection or the PSP won't suspend.
+*   returns true if blocked, false if not blocked
 ********************************************/
 
-int PowerManager::beginCriticalSection(bool justBlock) {
+bool PowerManager::beginCriticalSection() {
 	DEBUG_ENTER_FUNC();
 
-	int ret = NotBlocked;
-
-	if (SDL_mutexP(_flagMutex) != 0) {
-		PSP_ERROR("PowerManager::blockOnSuspend(): Couldn't lock flagMutex[%p]\n", _flagMutex);
-		ret = Error;
-	}
+	bool ret = false;
+	
+	_flagMutex.lock();
 
 	// Check the access flag
-	if (_suspendFlag == true) {
-		PSP_DEBUG_PRINT("We're being blocked!\n");
-		debugPM();
-		ret = Blocked;
+	if (_suspendFlag) {
+		ret = true;
 
-		// If it's true, we wait for a signal to continue
-		if (SDL_CondWait(_condSuspendable, _flagMutex) != 0) {
-			PSP_DEBUG_PRINT("PowerManager::blockOnSuspend(): Couldn't wait on cond[%p]\n", _condSuspendable);
-		}
+		PSP_DEBUG_PRINT("I got blocked. ThreadId[%x]\n", sceKernelGetThreadId());
+		debugPM();
+		
+		_threadSleep.wait(_flagMutex);
 
-		PSP_DEBUG_PRINT("We got blocked!!\n");
+		PSP_DEBUG_PRINT_FUNC("I got released. ThreadId[%x]\n", sceKernelGetThreadId());
 		debugPM();
 	}
 
 	// Now prevent the PM from suspending until we're done
-	if (justBlock == false)
-		_criticalCounter++;
+	_criticalCounter++;
 
-	if (SDL_mutexV(_flagMutex) != 0) {
-		PSP_ERROR("PowerManager::blockOnSuspend(): Couldn't unlock flagMutex[%p]\n", _flagMutex);
-		ret = Error;
-	}
+	_flagMutex.unlock();
 
 	return ret;
 }
 
-int PowerManager::endCriticalSection() {
+// returns success = true
+void PowerManager::endCriticalSection() {
 	DEBUG_ENTER_FUNC();
-	int ret = 0;
 
-	if (SDL_mutexP(_flagMutex) != 0) {
-		PSP_ERROR("PowerManager::endCriticalSection(): Couldn't lock flagMutex[%p]\n", _flagMutex);
-		ret = Error;
-	}
+	_flagMutex.lock();
 
 	// We're done with our critical section
 	_criticalCounter--;
 
 	if (_criticalCounter <= 0) {
-		if (_suspendFlag == true) {	// If the PM is sleeping, this flag must be set
-			PSP_DEBUG_PRINT("Unblocked thread waking up the PM.\n");
-			debugPM();
-
-			SDL_CondBroadcast(_condPM);
-
-			PSP_DEBUG_PRINT("Woke up the PM\n");
-			debugPM();
+		if (_suspendFlag) {		// If the PM is sleeping, this flag must be set
+				PSP_DEBUG_PRINT_FUNC("PM is asleep. Waking it up.\n");
+				debugPM();
+				
+				_pmSleep.releaseAll();
+				
+				PSP_DEBUG_PRINT_FUNC("Woke up the PM\n");
+			
+				debugPM();
 		}
 
 		if (_criticalCounter < 0) {	// Check for bad usage of critical sections
-			PSP_ERROR("Critical counter[%d]\n", _criticalCounter);
+			PSP_ERROR("Critical counter[%d]!!!\n", _criticalCounter);
 			debugPM();
 		}
 	}
 
-	if (SDL_mutexV(_flagMutex) != 0) {
-		PSP_ERROR("Couldn't unlock flagMutex[%p]\n", _flagMutex);
-		ret = Error;
-	}
-
-	return ret;
+	_flagMutex.unlock();	
 }
 
 /*******************************************
@@ -286,90 +206,77 @@ int PowerManager::endCriticalSection() {
 *	Callback function to be called to put every Suspendable to suspend
 *
 ********************************************/
-int PowerManager::suspend() {
+void PowerManager::suspend() {
 	DEBUG_ENTER_FUNC();
-	int ret = 0;
 
-	if (_pauseFlag) return ret;	// Very important - make sure we only suspend once
+	if (_pauseFlag) 
+		return;					// Very important - make sure we only suspend once
 
-	scePowerLock(0);			// Critical to make sure PSP doesn't suspend before we're done
+	scePowerLock(0);			// Also critical to make sure PSP doesn't suspend before we're done
 
 	// The first stage of suspend is pausing the engine if possible. We don't want to cause files
 	// to block, or we might not get the engine to pause. On the other hand, we might wait for polling
 	// and it'll never happen. We also want to do this w/o mutexes (for speed) which is ok in this case.
 	_pauseFlag = true;
 
-	PMStatusSet(kWaitForClientPause);
+	_PMStatus = kWaitForClientPause;
 
 	// Now we wait, giving the engine thread some time to find our flag.
-	for (int i = 0; i < 10 && _pauseClientState == Unpaused; i++)
-		sceKernelDelayThread(50000);	// We wait 50 msec x 10 times = 0.5 seconds
+	for (int i = 0; i < 10 && _pauseClientState == UNPAUSED; i++)
+		PspThread::delayMicros(50000);	// We wait 50 msec x 10 times = 0.5 seconds
 
-	if (_pauseClientState == Pausing) {	// Our event has been acknowledged. Let's wait until the client is done.
-		PMStatusSet(kWaitForClientToFinishPausing);
+	if (_pauseClientState == PAUSING) {	// Our event has been acknowledged. Let's wait until the client is done.
+		_PMStatus = kWaitForClientToFinishPausing;
 
-		while (_pauseClientState != Paused)
-			sceKernelDelayThread(50000);	// We wait 50 msec at a time
+		while (_pauseClientState != PAUSED)
+			PspThread::delayMicros(50000);	// We wait 50 msec at a time
 	}
 
-	// It's possible that the polling thread missed our pause event, but there's nothing we can do about that.
-	// We can't know if there's polling going on or not. It's usually not a critical thing anyway.
+	// It's possible that the polling thread missed our pause event, but there's 
+	// nothing we can do about that.
+	// We can't know if there's polling going on or not. 
+	// It's usually not a critical thing anyway.
 
-	PMStatusSet(kGettingFlagMutexSuspend);
+	_PMStatus = kGettingFlagMutexSuspend;
 
 	// Now we set the suspend flag to true to cause reading threads to block
+	_flagMutex.lock();
 
-	if (SDL_mutexP(_flagMutex) != 0) {
-		PSP_ERROR("Couldn't lock flagMutex[%p]\n", _flagMutex);
-		_error = Error;
-		ret = Error;
-	}
-
-	PMStatusSet(kGotFlagMutexSuspend);
+	_PMStatus = kGotFlagMutexSuspend;
 
 	_suspendFlag = true;
 
 	// Check if anyone is in a critical section. If so, we'll wait for them
 	if (_criticalCounter > 0) {
-		PMStatusSet(kWaitCritSectionSuspend);
-		SDL_CondWait(_condPM, _flagMutex);
-		PMStatusSet(kDoneWaitingCritSectionSuspend);
-	}
+		_PMStatus = kWaitCritSectionSuspend;
+		
+		_pmSleep.wait(_flagMutex);
+		
+		_PMStatus = kDoneWaitingCritSectionSuspend;
+	} 
+		
+	_flagMutex.unlock();
 
-	if (SDL_mutexV(_flagMutex) != 0) {
-		PSP_ERROR("Couldn't unlock flagMutex[%p]\n", _flagMutex);
-		_error = Error;
-		ret = Error;
-	}
-
-	PMStatusSet(kGettingListMutexSuspend);
+	_PMStatus = kGettingListMutexSuspend;
 
 	// Loop over list, calling suspend()
-	if (SDL_mutexP(_listMutex) != 0) {
-		PSP_ERROR("Couldn't lock listMutex[%p]\n", _listMutex);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kIteratingListSuspend);
+	_listMutex.lock();
+
+	_PMStatus = kIteratingListSuspend;
 	// Iterate
 	Common::List<Suspendable *>::iterator i;
 
 	for (i = _suspendList.begin(); i != _suspendList.end(); ++i) {
 		(*i)->suspend();
 	}
+	_PMStatus = kDoneIteratingListSuspend;
 
-	PMStatusSet(kDoneIteratingListSuspend);
-
-	if (SDL_mutexV(_listMutex) != 0) {
-		PSP_ERROR("Couldn't unlock listMutex[%p]\n", _listMutex);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kDoneSuspend);
+	_listMutex.unlock();
+	_PMStatus = kDoneSuspend;
 
 	scePowerUnlock(0);				// Allow the PSP to go to sleep now
-
-	return ret;
+	
+	_PMStatus = kDonePowerUnlock;
 }
 
 /*******************************************
@@ -377,24 +284,26 @@ int PowerManager::suspend() {
 *	Callback function to resume every Suspendable
 *
 ********************************************/
-int PowerManager::resume() {
+void PowerManager::resume() {
 	DEBUG_ENTER_FUNC();
-	int ret = 0;
+	
+	_PMStatus = kBeginResume;
 
 	// Make sure we can't get another suspend
 	scePowerLock(0);
 
-	if (!_pauseFlag) return ret;				// Make sure we can only resume once
+	_PMStatus = kCheckingPauseFlag;
+	
+	if (!_pauseFlag) 
+		return;						// Make sure we can only resume once
 
-	PMStatusSet(kGettingListMutexResume);
+	_PMStatus = kGettingListMutexResume;
 
 	// First we notify our Suspendables. Loop over list, calling resume()
-	if (SDL_mutexP(_listMutex) != 0) {
-		PSP_ERROR("Couldn't lock listMutex[%p]\n", _listMutex);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kIteratingListResume);
+	_listMutex.lock();
+	
+	_PMStatus = kIteratingListResume;
+
 	// Iterate
 	Common::List<Suspendable *>::iterator i = _suspendList.begin();
 
@@ -402,46 +311,31 @@ int PowerManager::resume() {
 		(*i)->resume();
 	}
 
-	PMStatusSet(kDoneIteratingListResume);
+	_PMStatus = kDoneIteratingListResume;
 
-	if (SDL_mutexV(_listMutex) != 0) {
-		PSP_ERROR("Couldn't unlock listMutex[%p]\n", _listMutex);
-		_error = Error;
-		ret = Error;
-	}
-
-	PMStatusSet(kGettingFlagMutexResume);
+	_listMutex.unlock();
+	
+	_PMStatus = kGettingFlagMutexResume;
 
 	// Now we set the suspend flag to false
-	if (SDL_mutexP(_flagMutex) != 0) {
-		PSP_ERROR("Couldn't lock flagMutex %p\n", _flagMutex);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kGotFlagMutexResume);
+	_flagMutex.lock();
+	
+	_PMStatus = kGotFlagMutexResume;
 
 	_suspendFlag = false;
 
-	PMStatusSet(kSignalSuspendedThreadsResume);
+	_PMStatus = kSignalSuspendedThreadsResume;
 
-	// Signal the other threads to wake up
-	if (SDL_CondBroadcast(_condSuspendable) != 0) {
-		PSP_ERROR("Couldn't broadcast condition[%p]\n", _condSuspendable);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kDoneSignallingSuspendedThreadsResume);
+	// Signal the threads to wake up
+	_threadSleep.releaseAll();
+	
+	_PMStatus = kDoneSignallingSuspendedThreadsResume;
 
-	if (SDL_mutexV(_flagMutex) != 0) {
-		PSP_ERROR("Couldn't unlock flagMutex[%p]\n", _flagMutex);
-		_error = Error;
-		ret = Error;
-	}
-	PMStatusSet(kDoneResume);
+	_flagMutex.unlock();
+	
+	_PMStatus = kDoneResume;
 
-	_pauseFlag = false;	// Signal engine to unpause
+	_pauseFlag = false;	// Signal engine to unpause -- no mutex needed
 
 	scePowerUnlock(0);	// Allow new suspends
-
-	return ret;
 }
diff --git a/backends/platform/psp/powerman.h b/backends/platform/psp/powerman.h
index af3134adee..5f09bc7794 100644
--- a/backends/platform/psp/powerman.h
+++ b/backends/platform/psp/powerman.h
@@ -26,8 +26,7 @@
 #ifndef POWERMAN_H
 #define POWERMAN_H
 
-#include <SDL/SDL_thread.h>
-#include <SDL/SDL_mutex.h>
+#include "backends/platform/psp/thread.h"
 #include "common/singleton.h"
 #include "common/list.h"
 
@@ -53,12 +52,12 @@ class PowerManager: public Common::Singleton<PowerManager> {
 
 public:
 	int blockOnSuspend();								/* block if suspending */
-	int beginCriticalSection(bool justBlock = false);	/* Use a critical section to block (if suspend was already pressed) */
-	int endCriticalSection();							/* and to prevent the PSP from suspending in a particular section */
-	int registerSuspend(Suspendable *item);			/* register to be called to suspend/resume */
-	int unregisterSuspend(Suspendable *item);		/* remove from suspend/resume list */
-	int suspend();									/* callback to have all items in list suspend */
-	int resume();									/* callback to have all items in list resume */
+	bool beginCriticalSection();	/* Use a critical section to block (if suspend was already pressed) */
+	void endCriticalSection();							/* and to prevent the PSP from suspending in a particular section */
+	bool registerForSuspend(Suspendable *item);			/* register to be called to suspend/resume */
+	bool unregisterForSuspend(Suspendable *item);		/* remove from suspend/resume list */
+	void suspend();									/* callback to have all items in list suspend */
+	void resume();									/* callback to have all items in list resume */
 	// Functions for pausing the engine
 	void pollPauseEngine();							/* Poll whether the engine should be paused */
 
@@ -69,11 +68,9 @@ public:
 	};
 
 	enum PauseState {
-		Unpaused = 0,
-		PauseEvent,
-		UnpauseEvent,
-		Pausing,
-		Paused
+		UNPAUSED = 0,
+		PAUSING,
+		PAUSED
 	};
 
 private:
@@ -81,34 +78,38 @@ private:
 	PowerManager();
 	~PowerManager();
 
-	Common::List<Suspendable *> _suspendList;		/* list to register in */
+	Common::List<Suspendable *> _suspendList;		// list to register in
 
-	volatile bool _pauseFlag;						/* For pausing, which is before suspending */
-	volatile bool _pauseFlagOld;					/* Save the last state of the flag while polling */
-	volatile int _pauseClientState;					/* Pause state of the target */
+	volatile bool _pauseFlag;						// For pausing, which is before suspending
+	volatile bool _pauseFlagOld;					// Save the last state of the flag while polling
+	volatile PauseState _pauseClientState;			// Pause state of the target
 
-	volatile bool _suspendFlag;						/* protected variable */
-	SDL_mutex *_flagMutex;							/* mutex to access access flag */
-	SDL_mutex *_listMutex;							/* mutex to access Suspendable list */
-	SDL_cond *_condSuspendable;						/* signal to synchronize accessing threads */
-	SDL_cond *_condPM;								/* signal to wake up the PM from a critical section */
-	volatile int _criticalCounter;					/* Counter of how many threads are in a critical section */
-	int _error;										/* error code - PM can't talk to us. For debugging */
+	volatile bool _suspendFlag;						// protected variable
+	PspMutex _flagMutex;							// mutex to access access flag
+	PspMutex _listMutex;							// mutex to access Suspendable list
+	PspCondition _threadSleep;						// signal to synchronize accessing threads
+	PspCondition _pmSleep;							// signal to wake up the PM from a critical section
+	volatile int _criticalCounter;					// Counter of how many threads are in a critical section
+	int _error;										// error code - PM can't talk to us. For debugging
+	volatile int _PMStatus;							// What the PM is doing. for debugging
 
 	// States for PM to be in (used for debugging)
 	enum PMState {
-		kInitDone = 1 ,
-		kDestroyPM,
-		kWaitForClientPause,
-		kWaitForClientToFinishPausing,
-		kGettingFlagMutexSuspend,
-		kGotFlagMutexSuspend,
-		kWaitCritSectionSuspend,
-		kDoneWaitingCritSectionSuspend,
-		kGettingListMutexSuspend,
-		kIteratingListSuspend,
-		kDoneIteratingListSuspend,
-		kDoneSuspend,
+		kInitDone = 1,
+		kDestroyPM = 2,
+		kWaitForClientPause = 3,
+		kWaitForClientToFinishPausing = 4,
+		kGettingFlagMutexSuspend = 5,
+		kGotFlagMutexSuspend = 6,
+		kWaitCritSectionSuspend = 7,
+		kDoneWaitingCritSectionSuspend = 8,
+		kGettingListMutexSuspend = 9,
+		kIteratingListSuspend = 10,
+		kDoneIteratingListSuspend = 11,
+		kDoneSuspend = 12,
+		kDonePowerUnlock,
+		kBeginResume,
+		kCheckingPauseFlag,
 		kGettingListMutexResume,
 		kIteratingListResume,
 		kDoneIteratingListResume,
@@ -122,8 +123,6 @@ private:
 	volatile int _listCounter;						/* How many people are in the list - just for debugging */
 
 	void debugPM();									/* print info about the PM */
-	void PMStatusSet(PMState s) { _PMStatus = s; }
-	volatile int _PMStatus;							/* What the PM is doing */
 
 public:
 	int getPMStatus() const { return _PMStatus; }
diff --git a/backends/platform/psp/psp.spec b/backends/platform/psp/psp.spec
index debdab3208..ac325b7fd6 100644
--- a/backends/platform/psp/psp.spec
+++ b/backends/platform/psp/psp.spec
@@ -1,3 +1,3 @@
 %rename lib	old_lib
 *lib:
-%(old_lib) -lz -lstdc++ -lc -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspkernel
+%(old_lib) -lz -lstdc++ -lc -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index e568184990..dba9a8fc2b 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -39,10 +39,12 @@
 #include <base/main.h>
 #include <base/plugins.h>
 #include "backends/platform/psp/powerman.h"
+#include "backends/platform/psp/thread.h"
 
 #include "backends/plugins/psp/psp-provider.h"
 #include "backends/platform/psp/psppixelformat.h"
 #include "backends/platform/psp/osys_psp.h"
+#include "backends/platform/psp/tests.h"	/* for unit/speed tests */
 #include "backends/platform/psp/trace.h"
 
 #ifdef ENABLE_PROFILING
@@ -109,12 +111,13 @@ int exit_callback(void) {
 }
 
 /* Function for handling suspend/resume */
-void power_callback(int , int powerinfo) {
+int power_callback(int , int powerinfo, void *) {
 	if (powerinfo & PSP_POWER_CB_POWER_SWITCH || powerinfo & PSP_POWER_CB_SUSPENDING) {
 		PowerMan.suspend();
 	} else if (powerinfo & PSP_POWER_CB_RESUME_COMPLETE) {
 		PowerMan.resume();
 	}
+	return 0;
 }
 
 /* Callback thread */
@@ -140,7 +143,7 @@ int CallbackThread(SceSize /*size*/, void *arg) {
 
 /* Sets up the callback thread and returns its thread id */
 int SetupCallbacks(void) {
-	int thid = sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, THREAD_ATTR_USER, 0);
+	int thid = sceKernelCreateThread("power_thread", CallbackThread, PRIORITY_POWER_THREAD, STACK_POWER_THREAD, THREAD_ATTR_USER, 0);
 	if (thid >= 0) {
 		sceKernelStartThread(thid, 0, 0);
 	}
@@ -167,6 +170,13 @@ int main(void) {
 	PluginManager::instance().addPluginProvider(new PSPPluginProvider());
 #endif
 
+/* unit/speed tests */
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
+	PSP_INFO_PRINT("running tests\n");
+	psp_tests();
+	sceKernelSleepThread();	// that's it. That's all we're doing
+#endif
+	
 	int res = scummvm_main(argc, argv);
 
 	g_system->quit();	// TODO: Consider removing / replacing this!
diff --git a/backends/platform/psp/rtc.cpp b/backends/platform/psp/rtc.cpp
new file mode 100644
index 0000000000..57edea7e49
--- /dev/null
+++ b/backends/platform/psp/rtc.cpp
@@ -0,0 +1,87 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 49903 2010-06-16 09:04:27Z Bluddy $
+ *
+ */
+
+#include <time.h> 
+#include <psptypes.h>
+#include <psprtc.h>
+ 
+#include "common/scummsys.h" 
+#include "backends/platform/psp/rtc.h" 
+ 
+//#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
+//#define __PSP_DEBUG_PRINT__	/* For debug printouts */
+
+#include "backends/platform/psp/trace.h"
+
+
+// Class PspRtc ---------------------------------------------------------------
+DECLARE_SINGLETON(PspRtc)
+
+void PspRtc::init() {						// init our starting ticks
+	uint32 ticks[2];
+	sceRtcGetCurrentTick((u64 *)ticks);
+
+	_startMillis = ticks[0]/1000;
+	_startMicros = ticks[0];
+	//_lastMillis = ticks[0]/1000;	//debug - only when we don't subtract startMillis
+}
+
+#define MS_LOOP_AROUND 4294967				/* We loop every 2^32 / 1000 = 71 minutes */
+#define MS_LOOP_CHECK  60000				/* Threading can cause weird mixups without this */
+
+// Note that after we fill up 32 bits ie 50 days we'll loop back to 0, which may cause 
+// unpredictable results
+uint32 PspRtc::getMillis() {
+	uint32 ticks[2];
+	
+	sceRtcGetCurrentTick((u64 *)ticks);		// can introduce weird thread delays
+	
+	uint32 millis = ticks[0]/1000;
+	millis -= _startMillis;					// get ms since start of program
+
+	if ((int)_lastMillis - (int)millis > MS_LOOP_CHECK) {		// we must have looped around
+		if (_looped == false) {					// check to make sure threads do this once
+			_looped = true;
+			_milliOffset += MS_LOOP_AROUND;		// add the needed offset
+			PSP_DEBUG_PRINT("looping around. last ms[%d], curr ms[%d]\n", _lastMillis, millis);
+		}	
+	} else {
+		_looped = false;
+	}
+	
+	_lastMillis = millis;	
+	
+	return millis + _milliOffset;
+}
+
+uint32 PspRtc::getMicros() {
+	uint32 ticks[2];
+	
+	sceRtcGetCurrentTick((u64 *)ticks);
+	ticks[0] -= _startMicros;
+	
+	return ticks[0]; 
+}
+
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h b/backends/platform/psp/rtc.h
index 90d271e115..7c1a28474d 100644
--- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.h
+++ b/backends/platform/psp/rtc.h
@@ -18,22 +18,33 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 49903 2010-06-16 09:04:27Z Bluddy $
  *
  */
 
-#ifndef __FORMEDITGAME_H__
-#define __FORMEDITGAME_H__
+#ifndef _PSP_RTC_H_
+#define _PSP_RTC_H_
 
-// edit game mode
-enum {
-	edtModeAdd,
-	edtModeEdit,
-	edtModeParams
+#include "common/singleton.h"
+ 
+class PspRtc : public Common::Singleton<PspRtc> {
+private:
+	uint32 _startMillis;
+	uint32 _startMicros;
+	uint32 _lastMillis;
+	uint32 _milliOffset;		// to prevent looping around of millis
+	bool _looped;				// make sure we only loop once - for threading
+public:
+	PspRtc()
+		: _startMillis(0), _startMicros(0),
+		  _lastMillis(0), _milliOffset(0),
+		  _looped(false) {
+		init();
+	}
+	void init();
+	uint32 getMillis();
+	uint32 getMicros();
 };
 
-extern UInt8 gFormEditMode;
-void EditGameFormDelete(Boolean direct);
-
-#endif
+#endif
\ No newline at end of file
diff --git a/backends/platform/psp/tests.cpp b/backends/platform/psp/tests.cpp
new file mode 100644
index 0000000000..d1bdb9e640
--- /dev/null
+++ b/backends/platform/psp/tests.cpp
@@ -0,0 +1,565 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
+ *
+ */
+
+// PSP speed and unit tests. Activate in tests.h 
+// You may also want to build without any engines. 
+ 
+#include "backends/platform/psp/tests.h"
+
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
+ 
+#include "common/scummsys.h"
+#include <pspiofilemgr_fcntl.h>
+#include <pspiofilemgr_stat.h>
+#include <pspiofilemgr.h>
+#include <pspthreadman.h>
+#include <pspsdk.h>
+#include <psprtc.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <psputils.h>
+#include "backends/platform/psp/rtc.h"
+#include "backends/platform/psp/thread.h"
+#include "backends/platform/psp/memory.h"
+
+
+#define UNCACHED(x)		((byte *)(((uint32)(x)) | 0x40000000))	/* make an uncached access */
+#define CACHED(x)		((byte *)(((uint32)(x)) & 0xBFFFFFFF))	/* make an uncached access into a cached one */
+ 
+//#define __PSP_DEBUG_FUNCS__
+//#define __PSP_DEBUG_PRINT__
+ 
+// Results: (333Mhz/222Mhz)
+// Getting a tick: 1-2 us
+// Getting a time structure: 9/14us
+// ie. using a tick and just dividing by 1000 saves us time.
+  
+#include "backends/platform/psp/trace.h" 
+
+class PspSpeedTests {
+public:
+	void tickSpeed();
+	void getMicrosSpeed();
+	void seekSpeed();
+	void msReadSpeed();
+	void threadFunctionsSpeed();
+	void semaphoreSpeed(); 
+	static int threadFunc(SceSize args, void *argp);
+	void semaphoreManyThreadSpeed();
+	void fastCopySpeed();
+	
+private:
+	enum {
+		MEMCPY_BUFFER_SIZE = 8192
+	};
+	static PspSemaphore _sem;	// semaphore
+
+	void readAndTime(uint32 bytes, char *buffer, FILE *file);
+	void seekAndTime(int bytes, int origin, FILE *file);
+	void fastCopySpecificSize(byte *dst, byte *src, uint32 bytes);
+	void fastCopyDifferentSizes(byte *dst, byte *src);
+	int getThreadIdSpeed();
+	void getPrioritySpeed();
+	void changePrioritySpeed(int id, int priority);
+};
+
+PspSemaphore PspSpeedTests::_sem(0);
+
+void PspSpeedTests::tickSpeed() {
+	uint32 ticksPerSecond = sceRtcGetTickResolution();
+	PSP_INFO_PRINT("ticksPerSecond[%d]\n", ticksPerSecond);
+
+	uint32 currentTicks1[2];
+	uint32 currentTicks2[2];
+	
+	sceRtcGetCurrentTick((u64 *)currentTicks1);
+	sceRtcGetCurrentTick((u64 *)currentTicks2);
+	PSP_INFO_PRINT("current tick[%x %x][%u %u]\n", currentTicks1[0], currentTicks1[1], currentTicks1[0], currentTicks1[1]);
+	PSP_INFO_PRINT("current tick[%x %x][%u %u]\n", currentTicks2[0], currentTicks2[1], currentTicks2[0], currentTicks2[1]);
+	
+	pspTime time;
+	sceRtcSetTick(&time, (u64 *)currentTicks2);
+	PSP_INFO_PRINT("current tick in time, year[%d] month[%d] day[%d] hour[%d] minutes[%d] seconds[%d] us[%d]\n", time.year, time.month, time.day, time.hour, time.minutes, time.seconds, time.microseconds);	
+	
+	pspTime time1;
+	pspTime time2;
+	sceRtcGetCurrentClockLocalTime(&time1);
+	sceRtcGetCurrentClockLocalTime(&time2);
+	PSP_INFO_PRINT("time1, year[%d] month[%d] day[%d] hour[%d] minutes[%d] seconds[%d] us[%d]\n", time1.year, time1.month, time1.day, time1.hour, time1.minutes, time1.seconds, time1.microseconds);
+	PSP_INFO_PRINT("time2, year[%d] month[%d] day[%d] hour[%d] minutes[%d] seconds[%d] us[%d]\n", time2.year, time2.month, time2.day, time2.hour, time2.minutes, time2.seconds, time2.microseconds);
+}
+
+void PspSpeedTests::getMicrosSpeed() {
+	uint32 time1, time2, time3, time4;
+	time1 = PspRtc::instance().getMicros();
+	time2 = PspRtc::instance().getMicros();
+	time3 = PspRtc::instance().getMicros();
+	time4 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("getMicros() times: %d, %d, %d\n", time4-time3, time3-time2, time2-time1);
+}
+
+void PspSpeedTests::readAndTime(uint32 bytes, char *buffer, FILE *file) {
+	uint32 time1 = PspRtc::instance().getMicros();
+	// test minimal read
+	fread(buffer, bytes, 1, file);
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Reading %d byte takes %dus\n", bytes, time2-time1);	
+}
+
+/*
+	333MHz/222MHz
+	Reading 1 byte takes 2590us / 3167
+	Reading 10 byte takes 8us / 9
+	Reading 50 byte takes 8us / 11
+	Reading 100 byte takes 8us / 11
+	Reading 1000 byte takes 915us / 1131
+	Reading 2000 byte takes 1806us / 2,284
+	Reading 3000 byte takes 2697us / 3,374
+	Reading 5000 byte takes 4551us / 5,544
+	Reading 6000 byte takes 5356us / 6,676
+	Reading 7000 byte takes 6800us / 8,358
+	Reading 8000 byte takes 6794us / 8,454
+	Reading 9000 byte takes 6782us / 8,563
+	Reading 10000 byte takes 8497us / 10,631
+	Reading 30000 byte takes 25995us / 32,473
+	Reading 80000 byte takes 68457us / 85,291
+	Reading 100000 byte takes 85103us / 106,163
+*/
+// Function to test the impact of MS reads
+// These tests can't be done from shell - the cache screws them up
+void PspSpeedTests::msReadSpeed() {
+	FILE *file;
+	file = fopen("ms0:/psp/music/track1.mp3", "r");
+
+	char *buffer = (char *)malloc(2 * 1024 * 1024);
+	
+	readAndTime(1, buffer, file);
+	readAndTime(10, buffer, file);
+	readAndTime(50, buffer, file);
+	readAndTime(100, buffer, file);
+	readAndTime(1000, buffer, file);
+	readAndTime(2000, buffer, file);
+	readAndTime(3000, buffer, file);
+	readAndTime(5000, buffer, file);
+	readAndTime(6000, buffer, file);
+	readAndTime(7000, buffer, file);
+	readAndTime(8000, buffer, file);
+	readAndTime(9000, buffer, file);	
+	readAndTime(10000, buffer, file);
+	readAndTime(30000, buffer, file);
+	readAndTime(50000, buffer, file);
+	readAndTime(80000, buffer, file);
+	readAndTime(100000, buffer, file);
+	
+	fclose(file);
+	free(buffer);	
+}
+ 
+void PspSpeedTests::seekAndTime(int bytes, int origin, FILE *file) {
+	char buffer[1000];
+	
+	uint32 time1 = PspRtc::instance().getMicros();
+	// test minimal read
+	fseek(file, bytes, origin);
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Seeking %d byte from %d took %dus\n", bytes, origin, time2-time1);
+
+	time1 = PspRtc::instance().getMicros();
+	// test minimal read
+	fread(buffer, 1000, 1, file);
+	time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Reading 1000 bytes took %dus\n", time2-time1);
+}
+
+/*
+333MHz
+Seeking 0 byte from 0 took 946us
+Reading 1000 bytes took 1781us
+Seeking 5 byte from 0 took 6us
+Reading 1000 bytes took 19us
+Seeking 1000 byte from 0 took 5us
+Reading 1000 bytes took 913us
+Seeking 100 byte from 0 took 955us
+Reading 1000 bytes took 906us
+Seeking 10000 byte from 0 took 963us
+Reading 1000 bytes took 905us
+Seeking -5 byte from 1 took 1022us
+Reading 1000 bytes took 949us
+Seeking -100 byte from 1 took 1040us
+Reading 1000 bytes took 907us
+Seeking 100 byte from 1 took 1044us
+Reading 1000 bytes took 930us
+Seeking 0 byte from 2 took 7211us
+Reading 1000 bytes took 80us
+Seeking 10000 byte from 2 took 3636us
+Reading 1000 bytes took 110us
+*/
+
+void PspSpeedTests::seekSpeed() {
+	FILE *file;
+	file = fopen("ms0:/psp/music/track1.mp3", "r");
+
+	seekAndTime(0, SEEK_SET, file);
+	seekAndTime(5, SEEK_SET, file);
+	seekAndTime(1000, SEEK_SET, file);
+	seekAndTime(100, SEEK_SET, file);
+	seekAndTime(10000, SEEK_SET, file);
+	seekAndTime(-5, SEEK_CUR, file);
+	seekAndTime(-100, SEEK_CUR, file);
+	seekAndTime(100, SEEK_CUR, file);
+	seekAndTime(0, SEEK_END, file);
+	seekAndTime(-10000, SEEK_END, file);
+
+	fclose(file);
+}
+
+// 222: 5-7us
+int PspSpeedTests::getThreadIdSpeed() {
+	uint32 time1 = PspRtc::instance().getMicros();
+	int threadId = sceKernelGetThreadId();
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Getting thread ID %d took %dus\n", threadId, time2-time1);
+	
+	return threadId;
+}
+
+// 222: 4-5us
+void PspSpeedTests::getPrioritySpeed() {
+	uint32 time1 = PspRtc::instance().getMicros();
+	int priority = sceKernelGetThreadCurrentPriority();
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Getting thread priority %d took %dus\n", priority, time2-time1);
+}
+
+// 222: 9-10us
+void PspSpeedTests::changePrioritySpeed(int id, int priority) {
+	uint32 time1 = PspRtc::instance().getMicros();
+	sceKernelChangeThreadPriority(id, priority);
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("Changing thread priority to %d for id %d took %dus\n", priority, id, time2-time1);
+}
+
+void PspSpeedTests::threadFunctionsSpeed() {
+	// very unscientific -- just ballpark
+	int id;
+	id = getThreadIdSpeed();
+	getThreadIdSpeed();
+	getPrioritySpeed();
+	getPrioritySpeed();
+	changePrioritySpeed(id, 30);
+	changePrioritySpeed(id, 35);
+	changePrioritySpeed(id, 25);
+	
+	// test context switch time
+	for (int i=0; i<10; i++) {
+		uint time1 = PspRtc::instance().getMicros();
+		PspThread::delayMicros(0);
+		uint time2 = PspRtc::instance().getMicros();
+		PSP_INFO_PRINT("poll %d. context switch Time = %dus\n", i, time2-time1);	// 10-15us	
+	}	
+}
+ 
+void PspSpeedTests::semaphoreSpeed() { 
+	PspSemaphore sem(1);
+	
+	uint32 time1 = PspRtc::instance().getMicros();
+	
+	sem.take();
+	
+	uint32 time2 = PspRtc::instance().getMicros();
+	
+	PSP_INFO_PRINT("taking semaphore took %d us\n", time2-time1);	// 10us
+	
+	uint32 time3 = PspRtc::instance().getMicros();
+	
+	sem.give();
+	
+	uint32 time4 = PspRtc::instance().getMicros();
+	PSP_INFO_PRINT("releasing semaphore took %d us\n", time4-time3);	//10us-55us
+}
+
+int PspSpeedTests::threadFunc(SceSize args, void *argp) {
+	PSP_INFO_PRINT("thread %x created.\n", sceKernelGetThreadId());
+	
+	_sem.take();
+	
+	PSP_INFO_PRINT("grabbed semaphore. Quitting thread\n");
+	
+	return 0;
+}
+
+void PspSpeedTests::semaphoreManyThreadSpeed() {	
+	
+	// create 4 threads
+	for (int i=0; i<4; i++) {
+		int thid = sceKernelCreateThread("my_thread", PspSpeedTests::threadFunc, 0x18, 0x10000, THREAD_ATTR_USER, NULL);
+		sceKernelStartThread(thid, 0, 0);
+	}
+		
+	PSP_INFO_PRINT("main thread. created threads\n");
+
+	uint32 threads = _sem.numOfWaitingThreads();
+	while (threads < 4) {
+		threads = _sem.numOfWaitingThreads();
+		PSP_INFO_PRINT("main thread: waiting threads[%d]\n", threads);
+	}
+	
+	PSP_INFO_PRINT("main: semaphore value[%d]\n", _sem.getValue());
+	PSP_INFO_PRINT("main thread: waiting threads[%d]\n", _sem.numOfWaitingThreads());
+	
+	_sem.give(4);
+}
+
+void PspSpeedTests::fastCopySpecificSize(byte *dst, byte *src, uint32 bytes) {
+	uint32 time1, time2;
+	uint32 fastcopyTime, memcpyTime;
+	const int iterations = 2000;
+	int intc;
+	
+	intc = pspSdkDisableInterrupts();
+	
+	time1 = PspRtc::instance().getMicros();
+	for (int i=0; i<iterations; i++) {
+		PspMemory::fastCopy(dst, src, bytes);
+	}	
+	time2 = PspRtc::instance().getMicros();
+	
+	pspSdkEnableInterrupts(intc);
+	
+	fastcopyTime = time2-time1;
+	
+	intc = pspSdkDisableInterrupts();
+	
+	time1 = PspRtc::instance().getMicros();
+	for (int i=0; i<iterations; i++) {
+		memcpy(dst, src, bytes);
+	}	
+	time2 = PspRtc::instance().getMicros();
+	
+	pspSdkEnableInterrupts(intc);
+	
+	memcpyTime = time2-time1;
+	
+	PSP_INFO_PRINT("%d bytes. memcpy[%d], fastcopy[%d]\n", bytes, memcpyTime, fastcopyTime);
+}
+
+void PspSpeedTests::fastCopyDifferentSizes(byte *dst, byte *src) {
+	PSP_INFO_PRINT("\nsrc[%p], dst[%p]\n", src, dst);
+	fastCopySpecificSize(dst, src, 1);
+	fastCopySpecificSize(dst, src, 2);
+	fastCopySpecificSize(dst, src, 3);
+	fastCopySpecificSize(dst, src, 4);
+	fastCopySpecificSize(dst, src, 5);
+	fastCopySpecificSize(dst, src, 8);
+	fastCopySpecificSize(dst, src, 10);
+	fastCopySpecificSize(dst, src, 16);
+	fastCopySpecificSize(dst, src, 32);
+	fastCopySpecificSize(dst, src, 50);
+	fastCopySpecificSize(dst, src, 100);
+	fastCopySpecificSize(dst, src, 500);
+	fastCopySpecificSize(dst, src, 1024);
+	fastCopySpecificSize(dst, src, 2048);
+}
+
+void PspSpeedTests::fastCopySpeed() {
+	PSP_INFO_PRINT("running fastCopy speed test\n");
+
+	uint32 *bufferSrc32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
+	uint32 *bufferDst32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
+	
+	// fill buffer 1
+	for (int i=0; i<MEMCPY_BUFFER_SIZE/4; i++)
+		bufferSrc32[i] = i | (((MEMCPY_BUFFER_SIZE/4)-i)<<16);
+		
+	// print buffer
+	for (int i=0; i<50; i++)
+		PSP_INFO_PRINT("%x ", bufferSrc32[i]);
+	PSP_INFO_PRINT("\n");
+	
+	byte *bufferSrc = ((byte *)bufferSrc32);
+	byte *bufferDst = ((byte *)bufferDst32);
+
+	PSP_INFO_PRINT("\n\ndst and src cached: -----------------\n");
+	fastCopyDifferentSizes(bufferDst, bufferSrc);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
+	
+	PSP_INFO_PRINT("\n\ndst cached, src uncached: -----------------\n");
+	bufferSrc = UNCACHED(bufferSrc);
+	fastCopyDifferentSizes(bufferDst, bufferSrc);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
+
+	PSP_INFO_PRINT("\n\ndst uncached, src uncached: --------------\n");
+	bufferDst = UNCACHED(bufferDst);
+	fastCopyDifferentSizes(bufferDst, bufferSrc);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
+	
+	PSP_INFO_PRINT("\n\ndst uncached, src cached: -------------------\n");
+	bufferSrc = CACHED(bufferSrc);
+	fastCopyDifferentSizes(bufferDst, bufferSrc);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
+
+	
+	free(bufferSrc32);
+	free(bufferDst32);
+}
+
+//-------Unit Tests -------------------------------
+
+class PspUnitTests {
+public:
+	void testFastCopy();
+
+private:
+	enum {
+		MEMCPY_BUFFER_SIZE = 8192
+	};
+	
+	void fastCopySpecificSize(byte *dst, byte *src, uint32 bytes, bool swap = false);
+	void fastCopyDifferentSizes(byte *dst, byte *src, bool swap = false);
+};	
+
+void PspUnitTests::testFastCopy() {
+	PSP_INFO_PRINT("running fastcopy unit test ***********\n");
+	PSP_INFO_PRINT("this test requires the test flag to be on in fastCopy\n\n");
+
+	uint32 *bufferSrc32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
+	uint32 *bufferDst32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
+	
+	// fill buffer 1
+	for (int i=0; i<MEMCPY_BUFFER_SIZE/4; i++)
+		bufferSrc32[i] = i | (((MEMCPY_BUFFER_SIZE/4)-i)<<16);
+		
+	// print buffer
+	for (int i=0; i<50; i++)
+		PSP_INFO_PRINT("%x ", bufferSrc32[i]);
+	PSP_INFO_PRINT("\n");
+	
+	byte *bufferSrc = ((byte *)bufferSrc32);
+	byte *bufferDst = ((byte *)bufferDst32);
+	
+	fastCopyDifferentSizes(bufferDst, bufferSrc, true);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+2, bufferSrc+2, true);
+	fastCopyDifferentSizes(bufferDst+3, bufferSrc+3);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+2, true);
+	fastCopyDifferentSizes(bufferDst+2, bufferSrc, true);
+	fastCopyDifferentSizes(bufferDst, bufferSrc+3);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+2);
+	fastCopyDifferentSizes(bufferDst+1, bufferSrc+3);
+	fastCopyDifferentSizes(bufferDst+2, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+2, bufferSrc+3);
+	fastCopyDifferentSizes(bufferDst+3, bufferSrc+1);
+	fastCopyDifferentSizes(bufferDst+3, bufferSrc+2);	
+	
+	free(bufferSrc32);
+	free(bufferDst32);
+}
+	
+void PspUnitTests::fastCopyDifferentSizes(byte *dst, byte *src, bool swap) {
+	fastCopySpecificSize(dst, src, 1);
+	fastCopySpecificSize(dst, src, 2, swap);
+	fastCopySpecificSize(dst, src, 4, swap);
+	fastCopySpecificSize(dst, src, 6, swap);
+	fastCopySpecificSize(dst, src, 8, swap);
+	fastCopySpecificSize(dst, src, 9);
+	fastCopySpecificSize(dst, src, 10, swap);
+	fastCopySpecificSize(dst, src, 11);
+	fastCopySpecificSize(dst, src, 12, swap);
+	fastCopySpecificSize(dst, src, 13);
+	fastCopySpecificSize(dst, src, 14, swap);
+	fastCopySpecificSize(dst, src, 15);	
+	fastCopySpecificSize(dst, src, 16, swap);
+	fastCopySpecificSize(dst, src, 17);
+	fastCopySpecificSize(dst, src, 18, swap);
+	fastCopySpecificSize(dst, src, 19);
+	fastCopySpecificSize(dst, src, 20, swap);
+	fastCopySpecificSize(dst, src, 32, swap);
+	fastCopySpecificSize(dst, src, 33);
+	fastCopySpecificSize(dst, src, 34, swap);
+	fastCopySpecificSize(dst, src, 35);
+	fastCopySpecificSize(dst, src, 36, swap);
+	fastCopySpecificSize(dst, src, 50, swap);
+	fastCopySpecificSize(dst, src, 100, swap);
+	fastCopySpecificSize(dst, src, 500, swap);
+	fastCopySpecificSize(dst, src, 1000, swap);
+}
+
+void PspUnitTests::fastCopySpecificSize(byte *dst, byte *src, uint32 bytes, bool swap) {
+	memset(dst, 0, bytes);
+	PspMemory::fastCopy(dst, src, bytes);
+	
+	if (swap) {	// test swap also
+		memset(dst, 0, bytes);
+		
+		// pixelformat for swap
+		PSPPixelFormat format;
+		format.set(PSPPixelFormat::Type_4444, true);
+	
+		PspMemory::fastSwap(dst, src, bytes, format);
+	}	
+}
+
+void psp_tests() {
+	PSP_INFO_PRINT("in tests\n");
+	
+#ifdef PSP_ENABLE_SPEED_TESTS
+	// Speed tests
+	PspSpeedTests speedTests;
+	speedTests.tickSpeed();
+	speedTests.getMicrosSpeed();
+	speedTests.msReadSpeed();
+	speedTests.seekSpeed();
+	speedTests.msReadSpeed();
+	speedTests.threadFunctionsSpeed();
+	speedTests.semaphoreSpeed();	
+	speedTests.semaphoreManyThreadSpeed();
+	speedTests.fastCopySpeed();
+#endif	
+	
+#ifdef PSP_ENABLE_UNIT_TESTS
+	// Unit tests
+	PspUnitTests unitTests;
+	
+	unitTests.testFastCopy();
+#endif	
+}	
+
+#endif /* (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS) */
\ No newline at end of file
diff --git a/backends/platform/PalmOS/Src/init_palmos.h b/backends/platform/psp/tests.h
index d4691dd15b..1518acfb4c 100644
--- a/backends/platform/PalmOS/Src/init_palmos.h
+++ b/backends/platform/psp/tests.h
@@ -18,25 +18,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/psp_main.cpp $
+ * $Id: psp_main.cpp 49155 2010-05-23 11:48:21Z Bluddy $
  *
  */
 
-#ifndef INIT_PALMOS_H
-#define INIT_PALMOS_H
+#ifndef _PSP_TESTS_H_ 
+#define _PSP_TESTS_H_
 
-#define PALM_PORTRAIT	1
-#define PALM_LANDSCAPE	2
-
-void PalmInit(UInt8 init);
-void PalmRelease(UInt8 init);
-
-Err PalmHRInit(UInt32 depth);
-void PalmHRRelease();
-
-
-UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh);
-void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP);
+//#define PSP_ENABLE_UNIT_TESTS		// run unit tests
+//#define PSP_ENABLE_SPEED_TESTS		// run speed tests
 
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
+void psp_tests();
 #endif
+
+#endif /* _PSP_TESTS_H_ */
\ No newline at end of file
diff --git a/backends/platform/psp/thread.cpp b/backends/platform/psp/thread.cpp
new file mode 100644
index 0000000000..e757c2f575
--- /dev/null
+++ b/backends/platform/psp/thread.cpp
@@ -0,0 +1,234 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include <pspthreadman.h> 
+
+#include "backends/platform/psp/thread.h"
+#include "backends/platform/psp/trace.h"
+ 
+// Class PspThreadable -------------------------------------------------- 
+// Inherit this to create C++ threads easily
+
+bool PspThreadable::threadCreateAndStart(const char *threadName, int priority, int stackSize, bool useVfpu /*= false*/) {
+	DEBUG_ENTER_FUNC();
+
+	if (_threadId != -1) {
+		PSP_ERROR("thread already created!\n");
+		return false;
+	}
+		
+	_threadId = sceKernelCreateThread(threadName, __threadCallback, priority, stackSize, THREAD_ATTR_USER, 0);	// add VFPU support
+
+	if (_threadId < 0) {
+		PSP_ERROR("failed to create %s thread. Error code %d\n", threadName, _threadId);
+		return false;
+	}
+	
+	// We want to pass the pointer to this, but we'll have to take address of this so use a little trick
+	PspThreadable *_this = this;
+	
+	if (sceKernelStartThread(_threadId, sizeof(uint32 *), &_this) < 0) {
+		PSP_ERROR("failed to start %s thread id[%d]\n", threadName, _threadId);
+		return false;
+	}
+	
+	PSP_DEBUG_PRINT("Started %s thread with id[%x]\n", threadName, _threadId);	
+	
+	return true;
+}
+
+// Callback function to be called by PSP kernel
+int PspThreadable::__threadCallback(SceSize, void *__this) {
+	DEBUG_ENTER_FUNC();
+	
+	PspThreadable *_this = *(PspThreadable **)__this;	// Dereference the copied value which was 'this'
+	
+	_this->threadFunction();	// call the virtual function
+	
+	return 0;
+}
+
+// PspThread class
+// Utilities to access general thread functions
+ 
+void PspThread::delayMillis(uint32 ms) {
+	sceKernelDelayThread(ms * 1000);
+}
+
+void PspThread::delayMicros(uint32 us) {
+	sceKernelDelayThread(us);
+}
+
+// Class PspSemaphore ------------------------------------------------
+//#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
+//#define __PSP_DEBUG_PRINT__	/* For debug printouts */
+
+#include "backends/platform/psp/trace.h"
+
+PspSemaphore::PspSemaphore(int initialValue, int maxValue/*=255*/) {
+	DEBUG_ENTER_FUNC();
+	_handle = 0;
+	_handle = (uint32)sceKernelCreateSema("ScummVM Sema", 0 /* attr */, 
+								  initialValue, maxValue, 
+								  0 /*option*/);
+	if (!_handle)
+		PSP_ERROR("failed to create semaphore.\n");
+}
+
+PspSemaphore::~PspSemaphore() {
+	DEBUG_ENTER_FUNC();
+	if (_handle)
+		if (sceKernelDeleteSema((SceUID)_handle) < 0)
+			PSP_ERROR("failed to delete semaphore.\n");
+}
+
+int PspSemaphore::numOfWaitingThreads() {
+	DEBUG_ENTER_FUNC();
+	SceKernelSemaInfo info;
+	info.numWaitThreads = 0;
+	
+	if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0)
+		PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle);
+		
+	return info.numWaitThreads;
+}
+
+int PspSemaphore::getValue() {
+	DEBUG_ENTER_FUNC();
+	SceKernelSemaInfo info;
+	info.currentCount = 0;
+	
+	if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0)
+		PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle);
+		
+	return info.currentCount;
+}
+
+bool PspSemaphore::pollForValue(int value) {
+	DEBUG_ENTER_FUNC();
+	if (sceKernelPollSema((SceUID)_handle, value) < 0)
+		return false;
+	
+	return true;
+}
+
+// false: timeout or error
+bool PspSemaphore::takeWithTimeOut(uint32 timeOut) {
+	DEBUG_ENTER_FUNC();
+	
+	uint32 *pTimeOut = 0;
+	if (timeOut) 
+		pTimeOut = &timeOut;
+	
+	if (sceKernelWaitSema(_handle, 1, pTimeOut) < 0)	// we always wait for 1
+		return false;
+	return true;
+}
+
+bool PspSemaphore::give(int num /*=1*/) {
+	DEBUG_ENTER_FUNC();
+	
+	if (sceKernelSignalSema((SceUID)_handle, num) < 0)
+		return false;	
+	return true;
+}
+
+// Class PspMutex ------------------------------------------------------------
+
+bool PspMutex::lock() {
+	DEBUG_ENTER_FUNC();
+	int threadId = sceKernelGetThreadId();
+	bool ret = true;
+	
+	if (_ownerId == threadId) {
+		_recursiveCount++;
+	} else {
+		ret = _semaphore.take();
+		_ownerId = threadId;
+		_recursiveCount = 0;
+	}
+	return ret;
+}
+
+bool PspMutex::unlock() {
+	DEBUG_ENTER_FUNC();
+	int threadId = sceKernelGetThreadId();
+	bool ret = true;
+	
+	if (_ownerId != threadId) {
+		PSP_ERROR("attempt to unlock mutex by thread[%x] as opposed to owner[%x]\n",
+			threadId, _ownerId);
+		return false;
+	}
+	
+	if (_recursiveCount) {
+		_recursiveCount--;
+	} else {
+		_ownerId = 0;
+		ret = _semaphore.give(1);
+	}	
+	return ret;
+}
+
+// Class PspCondition -------------------------------------------------
+
+// Release all threads waiting on the condition
+void PspCondition::releaseAll() {
+        _mutex.lock();
+        if (_waitingThreads > _signaledThreads) {	// we have signals to issue
+                int numWaiting = _waitingThreads - _signaledThreads;	// threads we haven't signaled
+                _signaledThreads = _waitingThreads;
+                
+				_waitSem.give(numWaiting);
+                _mutex.unlock();
+                for (int i=0; i<numWaiting; i++)	// wait for threads to tell us they're awake
+					_doneSem.take();
+        } else {
+                _mutex.unlock();
+        }
+}
+
+// Mutex must be taken before entering wait
+void PspCondition::wait(PspMutex &externalMutex) {
+        _mutex.lock();
+        _waitingThreads++;
+        _mutex.unlock();
+
+        externalMutex.unlock();	// must unlock external mutex
+
+		_waitSem.take();	// sleep on the wait semaphore
+
+		// let the signaling thread know we're done
+		_mutex.lock();
+        if (_signaledThreads > 0 ) {
+                _doneSem.give();	// let the thread know
+                _signaledThreads--;
+        }
+        _waitingThreads--;
+        _mutex.unlock();
+
+        externalMutex.lock();		// must lock external mutex here for continuation
+}
+
diff --git a/backends/platform/psp/thread.h b/backends/platform/psp/thread.h
new file mode 100644
index 0000000000..44394af40a
--- /dev/null
+++ b/backends/platform/psp/thread.h
@@ -0,0 +1,112 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef PSP_THREAD_H
+#define PSP_THREAD_H
+
+#include <pspthreadman.h>
+#include "common/scummsys.h"
+
+// class to inherit for creating threads
+class PspThreadable {
+protected:
+	int _threadId;
+	virtual void threadFunction() = 0;	// this function will be called when the thread starts
+public:	
+	PspThreadable() : _threadId(-1) {}					// constructor
+	virtual ~PspThreadable() {}							// destructor
+	static int __threadCallback(SceSize, void *__this);	// used to get called by sceKernelStartThread() Don't override
+	bool threadCreateAndStart(const char *threadName, int priority, int stackSize, bool useVfpu = false);
+};
+
+// class for thread utils
+class PspThread {
+public:	
+	// static functions
+	static void delayMillis(uint32 ms);	// delay the current thread
+	static void delayMicros(uint32 us);
+};
+
+class PspSemaphore {
+private:
+	uint32 _handle;
+public:
+	PspSemaphore(int initialValue, int maxValue=255);
+	~PspSemaphore();
+	bool take() { return takeWithTimeOut(0); }
+	bool takeWithTimeOut(uint32 timeOut);
+	bool give(int num=1);
+	bool pollForValue(int value);	// check for a certain value
+	int numOfWaitingThreads();
+	int getValue();
+};
+
+class PspMutex {
+private:
+	PspSemaphore _semaphore;
+	int _recursiveCount;
+	int _ownerId;
+public:
+	PspMutex(bool initialValue) : _semaphore(initialValue ? 1 : 0, 255), _recursiveCount(0), _ownerId(0) {}	// initial, max value
+	bool lock();
+	bool unlock();
+	bool poll() { return _semaphore.pollForValue(1); }
+	int numOfWaitingThreads() { return _semaphore.numOfWaitingThreads(); }
+	bool getValue() { return (bool)_semaphore.getValue(); }
+};
+
+class PspCondition {
+private:
+	PspMutex _mutex;
+	int _waitingThreads;
+	int _signaledThreads;
+	PspSemaphore _waitSem;
+	PspSemaphore _doneSem;
+public:
+	PspCondition() : _mutex(true), _waitingThreads(0), _signaledThreads(0),
+								_waitSem(0), _doneSem(0) {}
+	void wait(PspMutex &externalMutex);
+	void releaseAll();
+};
+
+enum ThreadPriority {
+	PRIORITY_MAIN_THREAD = 36,
+	PRIORITY_TIMER_THREAD = 30,
+	PRIORITY_AUDIO_THREAD = 25,		// must be higher than timer or we get stuttering
+	PRIORITY_POWER_THREAD = 20,		// quite a light thread
+	PRIORITY_DISPLAY_THREAD = 17	// very light thread for callbacks only
+};
+
+enum StackSizes {
+	STACK_DEFAULT = 4 * 1024,
+	STACK_AUDIO_THREAD = 16 * 1024,
+	STACK_TIMER_THREAD = 32 * 1024,
+	STACK_DISPLAY_THREAD = 2 * 1024,
+	STACK_POWER_THREAD = 4 * 1024
+};
+	
+#endif /* PSP_THREADS_H */
+
+
diff --git a/backends/platform/psp/trace.cpp b/backends/platform/psp/trace.cpp
index 4bf5450177..7bac6534da 100644
--- a/backends/platform/psp/trace.cpp
+++ b/backends/platform/psp/trace.cpp
@@ -30,8 +30,9 @@
 #include <stdio.h>
 
 int psp_debug_indent = 0;
+bool firstWriteToFile = true;
 
-void PSPDebugTrace(bool alsoToScreen, const char *format, ...) {
+void PspDebugTrace(bool alsoToScreen, const char *format, ...) {
 	va_list	opt;
 	char		buffer[2048];
 	int			bufsz;
@@ -41,8 +42,12 @@ void PSPDebugTrace(bool alsoToScreen, const char *format, ...) {
 	bufsz = vsnprintf(buffer, (size_t) sizeof(buffer), format, opt);
 	va_end(opt);
 
-	//fd = fopen("MS0:/SCUMMTRACE.TXT", "ab");
-	fd = fopen("SCUMMTRACE.TXT", "ab");
+	if (firstWriteToFile) {
+		fd = fopen("SCUMMTRACE.TXT", "wb");		// erase the file the first time we write
+		firstWriteToFile = false;
+	} else {
+		fd = fopen("SCUMMTRACE.TXT", "ab");
+	}
 
 	if (fd == 0)
 		return;
diff --git a/backends/platform/psp/trace.h b/backends/platform/psp/trace.h
index 1aad0f6781..625aa60772 100644
--- a/backends/platform/psp/trace.h
+++ b/backends/platform/psp/trace.h
@@ -30,17 +30,19 @@
 
 #include "common/str.h"
 
+#define __PSP_PRINT_TO_FILE_AND_SCREEN__
+
 /* Choose to print to file/screen/both */
 #ifdef __PSP_PRINT_TO_FILE__
-	#define __PSP_PRINT__(format,...)			PSPDebugTrace(false, format, ## __VA_ARGS__)
+	#define __PSP_PRINT__(format,...)			PspDebugTrace(false, format, ## __VA_ARGS__)
 #elif defined __PSP_PRINT_TO_FILE_AND_SCREEN__
-	#define __PSP_PRINT__(format,...)			PSPDebugTrace(true, format, ## __VA_ARGS__)
+	#define __PSP_PRINT__(format,...)			PspDebugTrace(true, format, ## __VA_ARGS__)
 #else /* default - print to screen */
 	#define __PSP_PRINT__(format,...)			fprintf(stderr, format, ## __VA_ARGS__)
 #endif /* PSP_PRINT_TO_FILE/SCREEN */
 
-/* Error function */
-#define PSP_ERROR(format,...)					__PSP_PRINT__("Error in %s: " format, __PRETTY_FUNCTION__, ## __VA_ARGS__)
+/* Error function - always print to file as well */
+#define PSP_ERROR(format,...)					PspDebugTrace(true, "Error in %s: " format, __PRETTY_FUNCTION__, ## __VA_ARGS__)
 
 /* Do the indent */
 #define __PSP_INDENT__							for(int _i=psp_debug_indent; _i>0; _i--) \
@@ -52,7 +54,7 @@
 #define PSP_INFO_PRINT_INDENT(format,...)		{ __PSP_INDENT__; \
 												__PSP_PRINT__(format, ## __VA_ARGS__); }
 
-void PSPDebugTrace(bool alsoToScreen, const char *format, ...);
+void PspDebugTrace(bool alsoToScreen, const char *format, ...);
 
 extern int psp_debug_indent;
 
diff --git a/backends/platform/samsungtv/module.mk b/backends/platform/samsungtv/module.mk
index 27e2cfa77d..d7ebe75080 100644
--- a/backends/platform/samsungtv/module.mk
+++ b/backends/platform/samsungtv/module.mk
@@ -5,8 +5,7 @@ MODULE_OBJS := \
 	main.o \
 	samsungtv.o
 
-MODULE_DIRS += \
-	backends/platform/samsungtv/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 1965cb3031..1c1d82730f 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -180,6 +180,7 @@ static void SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) {
 
 bool OSystem_SDL::pollEvent(Common::Event &event) {
 	SDL_Event ev;
+	ev.type = SDL_NOEVENT;
 
 	handleKbdMouse();
 
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 9d0d872c3d..aec90d1352 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -25,6 +25,7 @@
 
 #include "backends/platform/sdl/sdl.h"
 #include "common/mutex.h"
+#include "common/translation.h"
 #include "common/util.h"
 #ifdef USE_RGB_COLOR
 #include "common/list.h"
@@ -36,7 +37,7 @@
 #include "graphics/surface.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
-	{"1x", "Normal (no scaling)", GFX_NORMAL},
+	{"1x", _s("Normal (no scaling)"), GFX_NORMAL},
 #ifdef USE_SCALERS
 	{"2x", "2x", GFX_DOUBLESIZE},
 	{"3x", "3x", GFX_TRIPLESIZE},
@@ -213,45 +214,54 @@ OSystem::TransactionError OSystem_SDL::endGFXTransaction() {
 }
 
 #ifdef USE_RGB_COLOR
-const Graphics::PixelFormat RGBList[] = {
+
+Common::List<Graphics::PixelFormat> OSystem_SDL::getSupportedFormats() const {
+	assert(!_supportedFormats.empty());
+	return _supportedFormats;
+}
+
+void OSystem_SDL::detectSupportedFormats() {
+
+	// Clear old list
+	_supportedFormats.clear();
+
+	// Some tables with standard formats that we always list
+	// as "supported". If frontend code tries to use one of
+	// these, we will perform the necessary format
+	// conversion in the background. Of course this incurs a
+	// performance hit, but on desktop ports this should not
+	// matter. We still push the currently active format to
+	// the front, so if frontend code just uses the first
+	// available format, it will get one that is "cheap" to
+	// use.
+	const Graphics::PixelFormat RGBList[] = {
 #ifdef ENABLE_32BIT
-	// RGBA8888, ARGB8888, RGB888
-	Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0),
-	Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24),
-	Graphics::PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0),
+		// RGBA8888, ARGB8888, RGB888
+		Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0),
+		Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24),
+		Graphics::PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0),
 #endif
-	// RGB565, XRGB1555, RGB555, RGBA4444, ARGB4444
-	Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0),
-	Graphics::PixelFormat(2, 5, 5, 5, 1, 10, 5, 0, 15),
-	Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0),
-	Graphics::PixelFormat(2, 4, 4, 4, 4, 12, 8, 4, 0),
-	Graphics::PixelFormat(2, 4, 4, 4, 4, 8, 4, 0, 12)
-};
-const Graphics::PixelFormat BGRList[] = {
+		// RGB565, XRGB1555, RGB555, RGBA4444, ARGB4444
+		Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0),
+		Graphics::PixelFormat(2, 5, 5, 5, 1, 10, 5, 0, 15),
+		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0),
+		Graphics::PixelFormat(2, 4, 4, 4, 4, 12, 8, 4, 0),
+		Graphics::PixelFormat(2, 4, 4, 4, 4, 8, 4, 0, 12)
+	};
+	const Graphics::PixelFormat BGRList[] = {
 #ifdef ENABLE_32BIT
-	// ABGR8888, BGRA8888, BGR888
-	Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24),
-	Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0),
-	Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0),
+		// ABGR8888, BGRA8888, BGR888
+		Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24),
+		Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0),
+		Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0),
 #endif
-	// BGR565, XBGR1555, BGR555, ABGR4444, BGRA4444
-	Graphics::PixelFormat(2, 5, 6, 5, 0, 0, 5, 11, 0),
-	Graphics::PixelFormat(2, 5, 5, 5, 1, 0, 5, 10, 15),
-	Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0),
-	Graphics::PixelFormat(2, 4, 4, 4, 4, 0, 4, 8, 12),
-	Graphics::PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0)
-};
-
-// TODO: prioritize matching alpha masks
-Common::List<Graphics::PixelFormat> OSystem_SDL::getSupportedFormats() {
-	static Common::List<Graphics::PixelFormat> list;
-	static bool inited = false;
-
-	if (inited)
-		return list;
-
-	bool BGR = false;
-	int listLength = ARRAYSIZE(RGBList);
+		// BGR565, XBGR1555, BGR555, ABGR4444, BGRA4444
+		Graphics::PixelFormat(2, 5, 6, 5, 0, 0, 5, 11, 0),
+		Graphics::PixelFormat(2, 5, 5, 5, 1, 0, 5, 10, 15),
+		Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0),
+		Graphics::PixelFormat(2, 4, 4, 4, 4, 0, 4, 8, 12),
+		Graphics::PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0)
+	};
 
 	Graphics::PixelFormat format = Graphics::PixelFormat::createFormatCLUT8();
 	if (_hwscreen) {
@@ -267,31 +277,32 @@ Common::List<Graphics::PixelFormat> OSystem_SDL::getSupportedFormats() {
 			format.aLoss = 8;
 
 		// Push it first, as the prefered format.
-		list.push_back(format);
+		_supportedFormats.push_back(format);
+	}
 
-		if (format.bShift > format.rShift)
-			BGR = true;
+	// TODO: prioritize matching alpha masks
+	int i;
 
-		// Mark that we don't need to do this any more.
-		inited = true;
+	// Push some RGB formats
+	for (i = 0; i < ARRAYSIZE(RGBList); i++) {
+		if (_hwscreen && (RGBList[i].bytesPerPixel > format.bytesPerPixel))
+			continue;
+		if (RGBList[i] != format)
+			_supportedFormats.push_back(RGBList[i]);
 	}
 
-	for (int i = 0; i < listLength; i++) {
-		if (inited && (RGBList[i].bytesPerPixel > format.bytesPerPixel))
+	// Push some BGR formats
+	for (i = 0; i < ARRAYSIZE(BGRList); i++) {
+		if (_hwscreen && (BGRList[i].bytesPerPixel > format.bytesPerPixel))
 			continue;
-		if (BGR) {
-			if (BGRList[i] != format)
-				list.push_back(BGRList[i]);
-			list.push_back(RGBList[i]);
-		} else {
-			if (RGBList[i] != format)
-				list.push_back(RGBList[i]);
-			list.push_back(BGRList[i]);
-		}
+		if (BGRList[i] != format)
+			_supportedFormats.push_back(BGRList[i]);
 	}
-	list.push_back(Graphics::PixelFormat::createFormatCLUT8());
-	return list;
+
+	// Finally, we always supposed 8 bit palette graphics
+	_supportedFormats.push_back(Graphics::PixelFormat::createFormatCLUT8());
 }
+
 #endif
 
 bool OSystem_SDL::setGraphicsMode(int mode) {
@@ -573,6 +584,10 @@ bool OSystem_SDL::loadGFXMode() {
 	_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 16,
 		_videoMode.fullscreen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
 	);
+#ifdef USE_RGB_COLOR
+	detectSupportedFormats();
+#endif
+
 	if (_hwscreen == NULL) {
 		// DON'T use error(), as this tries to bring up the debug
 		// console, which WON'T WORK now that _hwscreen is hosed.
@@ -768,7 +783,8 @@ void OSystem_SDL::internUpdateScreen() {
 #endif
 
 	// If the shake position changed, fill the dirty area with blackness
-	if (_currentShakePos != _newShakePos) {
+	if (_currentShakePos != _newShakePos || 
+		(_mouseNeedsRedraw && _mouseBackup.y <= _currentShakePos)) {
 		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor};
 
 		if (_videoMode.aspectRatioCorrection && !_overlayVisible)
@@ -1377,6 +1393,10 @@ void OSystem_SDL::setMousePos(int x, int y) {
 void OSystem_SDL::warpMouse(int x, int y) {
 	int y1 = y;
 
+	// Don't change mouse position, when mouse is outside of our window (in case of windowed mode)
+	if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS))
+		return;
+
 	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
 		y1 = real2Aspect(y);
 
@@ -1662,7 +1682,7 @@ void OSystem_SDL::undrawMouse() {
 		return;
 
 	if (_mouseBackup.w != 0 && _mouseBackup.h != 0)
-		addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
+		addDirtyRect(x, y - _currentShakePos, _mouseBackup.w, _mouseBackup.h);
 }
 
 void OSystem_SDL::drawMouse() {
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index b38b815438..ef95a6d256 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -28,6 +28,7 @@
 // otherwise we will get errors about the windows headers redefining
 // "ARRAYSIZE" for example.
 #if defined(WIN32) && !defined(__SYMBIAN32__)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index f6ec769253..43751a57b2 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -7,8 +7,7 @@ MODULE_OBJS := \
 	main.o \
 	sdl.o
 
-MODULE_DIRS += \
-	backends/platform/sdl/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index e54d70e8b2..5c50a43daf 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -24,6 +24,7 @@
  */
 
 #if defined(WIN32)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
 #undef ARRAYSIZE
@@ -95,11 +96,11 @@ AspectRatio::AspectRatio(int w, int h) {
 }
 
 #if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && defined(USE_SCALERS)
-static const size_t AR_COUNT = 4;
-static const char*       desiredAspectRatioAsStrings[AR_COUNT] = {            "auto",            "4/3",            "16/9",            "16/10" };
-static const AspectRatio desiredAspectRatios[AR_COUNT]         = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) };
-
 static AspectRatio getDesiredAspectRatio() {
+	const size_t AR_COUNT = 4;
+	const char*       desiredAspectRatioAsStrings[AR_COUNT] = {            "auto",            "4/3",            "16/9",            "16/10" };
+	const AspectRatio desiredAspectRatios[AR_COUNT]         = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) };
+
 	//TODO : We could parse an arbitrary string, if we code enough proper validation
 	Common::String desiredAspectRatio = ConfMan.get("desired_screen_aspect_ratio");
 
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index b6baa52391..ace07f349e 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -98,7 +98,7 @@ public:
 	virtual Graphics::PixelFormat getScreenFormat() const { return _screenFormat; }
 
 	// Highest supported
-	virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+	virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
 #endif
 
 	// Set the size and format of the video bitmap.
@@ -272,6 +272,13 @@ protected:
 #ifdef USE_RGB_COLOR
 	Graphics::PixelFormat _screenFormat;
 	Graphics::PixelFormat _cursorFormat;
+	Common::List<Graphics::PixelFormat> _supportedFormats;
+
+	/**
+	 * Update the list of supported pixel formats.
+	 * This method is invoked by loadGFXMode().
+	 */
+	void detectSupportedFormats();
 #endif
 
 	// temporary screen (for scalers)
diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
index 3543dc8d19..62fcef0275 100644
--- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
@@ -61,6 +61,7 @@ $ftp_url = "FTP://$FTP_User\@$FTP_Host/$FTP_Dir/";
 $ExtraMacros =  "MACRO		NONSTANDARD_PORT\n";
 $ExtraMacros .=  "MACRO		ENABLE_VKEYBD\n";
 $ExtraMacros .= "MACRO		DISABLE_FANCY_THEMES\n";
+$ExtraMacros .= "MACRO		USE_TRANSLATION\n";
 
 # prep nice list of SDKs
 #while( ($SDK, $RootDir) = each(%SDK_RootDirs) )
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index cd107f59ca..a9e7aa562a 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -42,12 +42,12 @@
 		'zlib'		=> 'zlib.lib', 
 		'mad'		=> 'libmad.lib', 
 		'tremor'	=> 'libtremor.lib',
-		'mpeg2'		=> 'libmpeg2.lib'
+		'flac'		=> 'libflac.lib'
 	);
 	
 	# these are normally enabled for each variation
 	#$DefaultFeatures = qw(zlib,mad);
-	$DefaultFeatures = qw(zlib,mad,tremor);		
+	$DefaultFeatures = qw(zlib,mad,tremor,flac);		
 													
 ##################################################################################################################
 	##
@@ -229,6 +229,45 @@
 		# now you can add $VariationSets only built on this PC below this line :)
 
 	}
+	elsif ($ENV{'COMPUTERNAME'} eq "EMBEDDEV_VAIO1") #################################################################
+	{
+		$Producer = "AnotherGuest";
+		$RedirectSTDERR = 1;
+		$HaltOnError = 0;
+		$SkipExistingPackages = 1;
+		$ReallyQuiet = 1;
+
+		#$FTP_Host = "host.com";
+		#$FTP_User = "ag@host.com";
+		#$FTP_Pass = "password";
+		#$FTP_Dir  = "cvsbuilds";
+
+		#$SDK_RootDirs{'UIQ2'}= "D:\\UIQ2";
+		$SDK_RootDirs{'UIQ3'}= "G:\\UIQ3";
+		#$SDK_RootDirs{'S60v1'}= "D:\\S60v1";
+		#$SDK_RootDirs{'S60v2'}= "D:\\S60v2";
+		$SDK_RootDirs{'S60v3'}= "G:\\S60v3";
+		#$SDK_RootDirs{'S80'}= "D:\\S80";
+		#$SDK_RootDirs{'S90'}= "D:\\S90";
+		$ECompXL_BinDir= "D:\\ECompXL\\";
+		if (0) # so we can turn them on/off easily
+		{
+#			$SDK_LibraryDirs{'ALL'}{'zlib.lib'}		= "C:\\S\\zlib-1.2.2\\epoc";
+#			$SDK_LibraryDirs{'ALL'}{'libmad.lib'}	= "C:\\S\\libmad-0.15.1b\\group";
+#			$SDK_LibraryDirs{'ALL'}{'libtremor.lib'}= "C:\\tremor\\epoc";
+			$SDK_LibraryDirs{'UIQ2'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\UIQ";
+			$SDK_LibraryDirs{'S60v1'}{'esdl.lib'}	= $SDK_LibraryDirs{'S60v2'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\S60";
+			$SDK_LibraryDirs{'S80'}{'esdl.lib'}		= "E:\\WICKED\\ESDL\\epoc\\S80";
+			$SDK_LibraryDirs{'S90'}{'esdl.lib'}		= "E:\\WICKED\\ESDL\\epoc\\S90";
+			$SDK_LibraryDirs{'S60v3'}{'esdl.lib'}		= "E:\\WICKED\\ESDL\\epoc\\S60\\S60V3";
+			$SDK_LibraryDirs{'UIQ3'}{'esdl.lib'}		= "E:\\WICKED\\ESDL\\epoc\\UIQ\\UIQ3";
+			#$SDK_LibraryDirs{'ALL'}{'libmpeg2.lib'} = "C:\\S\\mpeg2dec-0.4.0\\epoc";
+		}
+
+		# now you can add $VariationSets only built on this PC below this line :)
+
+	}
+
 	else #########################################################################################################
 	{
 		print "ERROR: Computer name ".$ENV{'COMPUTERNAME'}." not recognized! Plz edit _LocalSettings.pl!";
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
index bd65c3b5e7..99cbb264c2 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
@@ -110,13 +110,13 @@ SOURCEPATH ..\..\..\..\base
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\..\
+SOURCEPATH ..\..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
-SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\platform\sdl\hardwarekeys.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp
 SOURCE backends\platform\symbian\src\SymbianActions.cpp
@@ -127,6 +127,9 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
+// Common error 
+source common\error.cpp
+
 // Special for graphics
 source graphics\iff.cpp
 
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 34207df5cf..3509714152 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -110,13 +110,13 @@ SOURCEPATH ..\..\..\..\base
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\..\
+SOURCEPATH ..\..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
-SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\platform\sdl\hardwarekeys.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp
 SOURCE backends\platform\symbian\src\SymbianActions.cpp
@@ -127,6 +127,9 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
+// Common error 
+source common\error.cpp
+
 // Special for graphics
 source graphics\iff.cpp
 
diff --git a/backends/platform/symbian/mmp/scummvm_sci.mmp.in b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
index 2466f0ec2d..1748be29b9 100644
--- a/backends/platform/symbian/mmp/scummvm_sci.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
@@ -58,7 +58,7 @@ SOURCEPATH ..\..\..\..\engines\sci
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\sci
+USERINCLUDE     ..\..\..\..\engines
 USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index d925f5f0e7..1a55a68778 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -28,6 +28,7 @@
 #include "gui/message.h"
 #include "scumm/scumm.h"
 #include "common/config-manager.h"
+#include "common/translation.h"
 
 #include <sdl.h>
 
@@ -37,25 +38,25 @@ namespace GUI {
 // or we put them in this file separated by #ifdefs, this one is up to you, AnotherGuest :)
 
 const Common::String actionNames[] = {
-	"Up",
-	"Down",
-	"Left",
-	"Right",
-	"Left Click",
-	"Right Click",
-	"Save",
-	"Skip",
-	"Zone",
-	"Multi Function",
-	"Swap character",
-	"Skip text",
-	"Pause",
-	"Fast mode",
-	"Quit",
-	"Debugger",
-	"Global menu",
-	"Virtual keyboard",
-	"Key mapper"
+	_s("Up"),
+	_s("Down"),
+	_s("Left"),
+	_s("Right"),
+	_s("Left Click"),
+	_s("Right Click"),
+	_s("Save"),
+	_s("Skip"),
+	_s("Zone"),
+	_s("Multi Function"),
+	_s("Swap character"),
+	_s("Skip text"),
+	_s("Pause"),
+	_s("Fast mode"),
+	_s("Quit"),
+	_s("Debugger"),
+	_s("Global menu"),
+	_s("Virtual keyboard"),
+	_s("Key mapper")
 };
 
 #ifdef UIQ
@@ -75,7 +76,7 @@ void SymbianActions::init() {
 
 
 Common::String SymbianActions::actionName(ActionType action) {
-	return actionNames[action];
+	return _(actionNames[action]);
 }
 
 int SymbianActions::size() {
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 2ae47b07a8..d63c9fe044 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -35,6 +35,7 @@
 
 #include "common/config-manager.h"
 #include "common/scummsys.h"
+#include "common/translation.h"
 
 #include "gui/message.h"
 
@@ -442,7 +443,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 
 			case GUI::ACTION_QUIT:
 				{
-					GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No");
+					GUI::MessageDialog alert(_("Do you want to quit ?"), _("Yes"), _("No"));
 					if (alert.runModal() == GUI::kMessageOK)
 						quit();
 
diff --git a/backends/platform/wii/module.mk b/backends/platform/wii/module.mk
index cf55a182c0..88e75fba26 100644
--- a/backends/platform/wii/module.mk
+++ b/backends/platform/wii/module.mk
@@ -8,8 +8,7 @@ MODULE_OBJS := \
 	osystem_sfx.o \
 	osystem_events.o
 
-MODULE_DIRS += \
-	backends/platform/wii/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/wii/options.cpp b/backends/platform/wii/options.cpp
index a8f3552313..295856d564 100644
--- a/backends/platform/wii/options.cpp
+++ b/backends/platform/wii/options.cpp
@@ -28,6 +28,8 @@
 #include "gui/dialog.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 
+#include "common/translation.h"
+
 #include "options.h"
 
 WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
@@ -42,84 +44,84 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
 		_strUnderscanY = "wii_video_default_underscan_y";
 	}
 
-	new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, "Ok", 'k');
-	new ButtonWidget(this, _w - 216 - 32, _h - 24 - 16, 108, 24, "Cancel", 'c');
+	new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, _("OK"), 0, 'k');
+	new ButtonWidget(this, _w - 216 - 32, _h - 24 - 16, 108, 24, _("Cancel"), 0, 'c');
 	_tab = new TabWidget(this, 0, 0, _w, _h - 54);
 
-	_tabVideo = _tab->addTab("Video");
+	_tabVideo = _tab->addTab(_("Video"));
 
 	new StaticTextWidget(_tab, 16, 16, 128, 16,
-							"Current video mode:", Graphics::kTextAlignRight);
+						 _("Current video mode:"), Graphics::kTextAlignRight);
 	new StaticTextWidget(_tab, 160, 16, 128, 16,
-							_doubleStrike ? "Double-strike" : "Default",
+						 _doubleStrike ? _("Double-strike") : _("Default"),
 							Graphics::kTextAlignLeft);
 
 	new StaticTextWidget(_tab, 16, 48, 128, 16,
-							"Horizontal underscan:", Graphics::kTextAlignRight);
-	_sliderUnderscanX = new SliderWidget(_tab, 160, 47, 128, 18, 'x');
+						 _("Horizontal underscan:"), Graphics::kTextAlignRight);
+	_sliderUnderscanX = new SliderWidget(_tab, 160, 47, 128, 18, 0, 'x');
 	_sliderUnderscanX->setMinValue(0);
 	_sliderUnderscanX->setMaxValue(32);
 
 	new StaticTextWidget(_tab, 16, 80, 128, 16,
-							"Vertical underscan:", Graphics::kTextAlignRight);
-	_sliderUnderscanY = new SliderWidget(_tab, 160, 79, 128, 18, 'y');
+						 _("Vertical underscan:"), Graphics::kTextAlignRight);
+	_sliderUnderscanY = new SliderWidget(_tab, 160, 79, 128, 18, 0, 'y');
 	_sliderUnderscanY->setMinValue(0);
 	_sliderUnderscanY->setMaxValue(32);
 
-	_tabInput = _tab->addTab("Input");
+	_tabInput = _tab->addTab(_("Input"));
 
 	new StaticTextWidget(_tab, 16, 16, 128, 16,
-							"GC Pad sensitivity:", Graphics::kTextAlignRight);
-	_sliderPadSensitivity = new SliderWidget(_tab, 160, 15, 128, 18, 'x');
+						 _("GC Pad sensitivity:"), Graphics::kTextAlignRight);
+	_sliderPadSensitivity = new SliderWidget(_tab, 160, 15, 128, 18, 0, 'x');
 	_sliderPadSensitivity->setMinValue(0);
 	_sliderPadSensitivity->setMaxValue(64);
 
 	new StaticTextWidget(_tab, 16, 44, 128, 16,
-							"GC Pad acceleration:", Graphics::kTextAlignRight);
-	_sliderPadAcceleration = new SliderWidget(_tab, 160, 43, 128, 18, 'y');
+						 _("GC Pad acceleration:"), Graphics::kTextAlignRight);
+	_sliderPadAcceleration = new SliderWidget(_tab, 160, 43, 128, 18, 0, 'y');
 	_sliderPadAcceleration->setMinValue(0);
 	_sliderPadAcceleration->setMaxValue(8);
 
 #ifdef USE_WII_DI
-	_tabDVD = _tab->addTab("DVD");
+	_tabDVD = _tab->addTab(_("DVD"));
 
 	new StaticTextWidget(_tab, 16, 16, 64, 16,
-							"Status:", Graphics::kTextAlignRight);
-	_textDVDStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, "Unknown",
+						 _("Status:"), Graphics::kTextAlignRight);
+	_textDVDStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, _("Unknown"),
 											Graphics::kTextAlignLeft);
 
-	new ButtonWidget(_tab, 16, 48, 108, 24, "Mount DVD", 'mdvd');
-	new ButtonWidget(_tab, 140, 48, 108, 24, "Unmount DVD", 'udvd');
+	new ButtonWidget(_tab, 16, 48, 108, 24, _("Mount DVD"), 0, 'mdvd');
+	new ButtonWidget(_tab, 140, 48, 108, 24, _("Unmount DVD"), 0, 'udvd');
 #endif
 
 #ifdef USE_WII_SMB
-	_tabSMB = _tab->addTab("SMB");
+	_tabSMB = _tab->addTab(_("SMB"));
 
 	new StaticTextWidget(_tab, 16, 16, 64, 16,
-							"Status:", Graphics::kTextAlignRight);
-	_textSMBStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, "Unknown",
+						 _("Status:"), Graphics::kTextAlignRight);
+	_textSMBStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, _("Unknown"),
 											Graphics::kTextAlignLeft);
 
 	new StaticTextWidget(_tab, 16, 52, 64, 16,
-							"Server:", Graphics::kTextAlignRight);
+						 _("Server:"), Graphics::kTextAlignRight);
 	_editSMBServer = new EditTextWidget(_tab, 96, 48, _w - 96 - 32, 24, "");
 
 	new StaticTextWidget(_tab, 16, 92, 64, 16,
-							"Share:", Graphics::kTextAlignRight);
+						 _("Share:"), Graphics::kTextAlignRight);
 	_editSMBShare = new EditTextWidget(_tab, 96, 88, _w - 96 - 32, 24, "");
 
 	new StaticTextWidget(_tab, 16, 132, 64, 16,
-							"Username:", Graphics::kTextAlignRight);
+						 _("Username:"), Graphics::kTextAlignRight);
 	_editSMBUsername = new EditTextWidget(_tab, 96, 128, _w - 96 - 32, 24, "");
 
 	new StaticTextWidget(_tab, 16, 172, 64, 16,
-							"Password:", Graphics::kTextAlignRight);
+						 _("Password:"), Graphics::kTextAlignRight);
 	_editSMBPassword = new EditTextWidget(_tab, 96, 168, _w - 96 - 32, 24, "");
 
-	new ButtonWidget(_tab, 16, 208, 108, 24, "Init network", 'net');
+	new ButtonWidget(_tab, 16, 208, 108, 24, _("Init network"), 0, 'net');
 
-	new ButtonWidget(_tab, 140, 208, 108, 24, "Mount SMB", 'msmb');
-	new ButtonWidget(_tab, 264, 208, 108, 24, "Unmount SMB", 'usmb');
+	new ButtonWidget(_tab, 140, 208, 108, 24, _("Mount SMB"), 0, 'msmb');
+	new ButtonWidget(_tab, 264, 208, 108, 24, _("Unmount SMB"), 0, 'usmb');
 #endif
 
 	_tab->setActiveTab(_tabVideo);
@@ -140,12 +142,12 @@ void WiiOptionsDialog::handleTickle() {
 #ifdef USE_WII_DI
 	if (tab == _tabDVD) {
 		if (fsf.isMounted(WiiFilesystemFactory::kDVD)) {
-			_textDVDStatus->setLabel("DVD Mounted successfully");
+			_textDVDStatus->setLabel(_("DVD Mounted successfully"));
 		} else {
 			if (fsf.failedToMount(WiiFilesystemFactory::kDVD))
-				_textDVDStatus->setLabel("Error while mounting the DVD");
+				_textDVDStatus->setLabel(_("Error while mounting the DVD"));
 			else
-				_textDVDStatus->setLabel("DVD not mounted");
+				_textDVDStatus->setLabel(_("DVD not mounted"));
 		}
 	}
 #endif
@@ -158,32 +160,32 @@ void WiiOptionsDialog::handleTickle() {
 		switch (status) {
 		case 0:
 			if (fsf.isMounted(WiiFilesystemFactory::kSMB)) {
-				label = "Network up, share mounted";
+				label = _("Network up, share mounted");
 			} else {
-				label = "Network up";
+				label = _("Network up");
 
 				if (fsf.failedToMount(WiiFilesystemFactory::kSMB))
-					label += ", error while mounting the share";
+					label += _(", error while mounting the share");
 				else
-					label += ", share not mounted";
+					label += _(", share not mounted");
 			}
 
 			break;
 
 		case -ENETDOWN:
-			label = "Network down";
+			label = _("Network down");
 			break;
 
 		case -EBUSY:
-			label = "Initialising network";
+			label = _("Initialising network");
 			break;
 
 		case -ETIMEDOUT:
-			label = "Timeout while initialising network";
+			label = _("Timeout while initialising network");
 			break;
 
 		default:
-			label = String::printf("Network not initialsed (%d)", status);
+			label = String::printf(_("Network not initialsed (%d)"), status);
 			break;
 		}
 
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index d277aa38b1..8180d5727f 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -156,7 +156,7 @@ public:
 	virtual bool setGraphicsMode(int mode);
 #ifdef USE_RGB_COLOR
 	virtual Graphics::PixelFormat getScreenFormat() const;
-	virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+	virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
 #endif
 	virtual int getGraphicsMode() const;
 	virtual void initSize(uint width, uint height,
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 3d4e75883b..19190048a0 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -209,7 +209,7 @@ Graphics::PixelFormat OSystem_Wii::getScreenFormat() const {
 	return _pfGame;
 }
 
-Common::List<Graphics::PixelFormat> OSystem_Wii::getSupportedFormats() {
+Common::List<Graphics::PixelFormat> OSystem_Wii::getSupportedFormats() const {
 	Common::List<Graphics::PixelFormat> res;
 	res.push_back(_pfRGB565);
 	res.push_back(Graphics::PixelFormat::createFormatCLUT8());
diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp
index ebe6981290..64abd0be3e 100644
--- a/backends/platform/wince/CEActionsPocket.cpp
+++ b/backends/platform/wince/CEActionsPocket.cpp
@@ -31,30 +31,32 @@
 #include "common/config-manager.h"
 #include "gui/KeysDialog.h"
 
+#include "common/translation.h"
+
 #ifdef _WIN32_WCE
 #define		KEY_ALL_SKIP	3457
 #endif
 
 const String pocketActionNames[] = {
-	"Pause",
-	"Save",
-	"Quit",
-	"Skip",
-	"Hide Toolbar",
-	"Show Keyboard",
-	"Sound on/off",
-	"Right click",
-	"Show/Hide Cursor",
-	"Free look",
-	"Zoom up",
-	"Zoom down",
-	"Multi Function",
-	"Bind Keys",
-	"Cursor Up",
-	"Cursor Down",
-	"Cursor Left",
-	"Cursor Right",
-	"Left Click",
+	_s("Pause"),
+	_s("Save"),
+	_s("Quit"),
+	_s("Skip"),
+	_s("Hide Toolbar"),
+	_s("Show Keyboard"),
+	_s("Sound on/off"),
+	_s("Right click"),
+	_s("Show/Hide Cursor"),
+	_s("Free look"),
+	_s("Zoom up"),
+	_s("Zoom down"),
+	_s("Multi Function"),
+	_s("Bind Keys"),
+	_s("Cursor Up"),
+	_s("Cursor Down"),
+	_s("Cursor Left"),
+	_s("Cursor Right"),
+	_s("Left Click")
 };
 
 void CEActionsPocket::init() {
@@ -63,7 +65,7 @@ void CEActionsPocket::init() {
 
 
 String CEActionsPocket::actionName(GUI::ActionType action) {
-	return pocketActionNames[action];
+	return _(pocketActionNames[action]);
 }
 
 int CEActionsPocket::size() {
@@ -258,7 +260,7 @@ bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) {
 		if (action == POCKET_ACTION_SAVE && ConfMan.get("gameid") == "parallaction") {
 			// FIXME: This is a temporary solution. The engine should handle its own menus.
 			// Note that the user can accomplish this via the virtual keyboard as well, this is just for convenience
-			GUI::MessageDialog alert("Do you want to load or save the game?", "Load", "Save");
+			GUI::MessageDialog alert(_("Do you want to load or save the game?"), _("Load"), _("Save"));
 			if (alert.runModal() == GUI::kMessageOK)
 				_key_action[action].setKey(SDLK_l);
 			else
@@ -308,7 +310,7 @@ bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) {
 	case POCKET_ACTION_QUIT:
 		if (!quitdialog) {
 			quitdialog = true;
-			GUI::MessageDialog alert("   Are you sure you want to quit ?   ", "Yes", "No");
+			GUI::MessageDialog alert(_("   Are you sure you want to quit ?   "), _("Yes"), _("No"));
 			if (alert.runModal() == GUI::kMessageOK)
 				_mainSystem->quit();
 			quitdialog = false;
diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp
index 47733ae317..af80bd2908 100644
--- a/backends/platform/wince/CEActionsSmartphone.cpp
+++ b/backends/platform/wince/CEActionsSmartphone.cpp
@@ -30,23 +30,25 @@
 #include "common/config-manager.h"
 #include "gui/KeysDialog.h"
 
+#include "common/translation.h"
+
 #define		KEY_ALL_SKIP	3457
 
 const String smartphoneActionNames[] = {
-	"Up",
-	"Down",
-	"Left",
-	"Right",
-	"Left Click",
-	"Right Click",
-	"Save",
-	"Skip",
-	"Zone",
-	"Multi Function",
-	"Bind Keys",
-	"Keyboard",
-	"Rotate",
-	"Quit"
+	_s("Up"),
+	_s("Down"),
+	_s("Left"),
+	_s("Right"),
+	_s("Left Click"),
+	_s("Right Click"),
+	_s("Save"),
+	_s("Skip"),
+	_s("Zone"),
+	_s("Multi Function"),
+	_s("Bind Keys"),
+	_s("Keyboard"),
+	_s("Rotate"),
+	_s("Quit")
 };
 
 const int ACTIONS_SMARTPHONE_DEFAULT[] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F3, SDLK_ESCAPE, SDLK_9, SDLK_8, SDLK_F4, SDLK_RETURN, SDLK_5, SDLK_0 };
@@ -57,7 +59,7 @@ void CEActionsSmartphone::init() {
 
 
 String CEActionsSmartphone::actionName(GUI::ActionType action) {
-	return smartphoneActionNames[action];
+	return _(smartphoneActionNames[action]);
 }
 
 int CEActionsSmartphone::size() {
@@ -220,7 +222,7 @@ bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) {
 			if (action == SMARTPHONE_ACTION_SAVE && ConfMan.get("gameid") == "parallaction") {
 				// FIXME: This is a temporary solution. The engine should handle its own menus.
 				// Note that the user can accomplish this via the virtual keyboard as well, this is just for convenience
-				GUI::MessageDialog alert("Do you want to load or save the game?", "Load", "Save");
+				GUI::MessageDialog alert(_("Do you want to load or save the game?"), _("Load"), _("Save"));
 				if (alert.runModal() == GUI::kMessageOK)
 					_key_action[action].setKey(SDLK_l);
 				else
@@ -267,7 +269,7 @@ bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) {
 		case SMARTPHONE_ACTION_QUIT:
 			if (!quitdialog) {
 				quitdialog = true;
-				GUI::MessageDialog alert("   Are you sure you want to quit ?   ", "Yes", "No");
+				GUI::MessageDialog alert(_("   Are you sure you want to quit ?   "), _("Yes"), _("No"));
 				if (alert.runModal() == GUI::kMessageOK)
 					_mainSystem->quit();
 				quitdialog = false;
diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp
index 21a967336e..11e4900c2d 100644
--- a/backends/platform/wince/CELauncherDialog.cpp
+++ b/backends/platform/wince/CELauncherDialog.cpp
@@ -38,6 +38,8 @@
 
 #include "common/config-manager.h"
 
+#include "common/translation.h"
+
 using namespace GUI;
 using namespace Common;
 
@@ -51,13 +53,13 @@ public:
 		// needs fixing, or remove it!
 		const int buttonWidth = g_gui.xmlEval()->getVar("Globals.Button.Width", 0);
 		const int buttonHeight = g_gui.xmlEval()->getVar("Globals.Button.Height", 0);
-		new ButtonWidget(this, (_w - buttonWidth) / 2, 45, buttonWidth, buttonHeight, "OK", kCloseCmd, '\r');	// Close dialog - FIXME
+		new ButtonWidget(this, (_w - buttonWidth) / 2, 45, buttonWidth, buttonHeight, _("OK"), 0, kCloseCmd, '\r');	// Close dialog - FIXME
 
-		Common::String videoDriver("Using SDL driver ");
+		Common::String videoDriver(_("Using SDL driver "));
 		SDL_VideoDriverName(tempo, sizeof(tempo));
 		videoDriver += tempo;
 		new StaticTextWidget(this, 0, 10, _w, kLineHeight, videoDriver, Graphics::kTextAlignCenter);
-		Common::String displayInfos("Display ");
+		Common::String displayInfos(_("Display "));
 		sprintf(tempo, "%dx%d (real %dx%d)", GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), OSystem_WINCE3::getScreenWidth(), OSystem_WINCE3::getScreenHeight());
 		displayInfos += tempo;
 		new StaticTextWidget(this, 0, 20, _w, kLineHeight, displayInfos, Graphics::kTextAlignCenter);
@@ -99,7 +101,7 @@ void CELauncherDialog::automaticScanDirectory(const Common::FSNode &node) {
  * returns some illegal paths atm.
  */
 void CELauncherDialog::addGame() {
-	MessageDialog alert("Do you want to perform an automatic scan ?", "Yes", "No");
+	MessageDialog alert(_("Do you want to perform an automatic scan ?"), _("Yes"), _("No"));
 	if (alert.runModal() == kMessageOK && _browser->runModal() > 0) {
 		// Clear existing domains
 		ConfigManager::DomainMap &domains = (ConfigManager::DomainMap&)ConfMan.getGameDomains();
diff --git a/backends/platform/wince/module.mk b/backends/platform/wince/module.mk
index 6e328b0af4..2d852670f8 100644
--- a/backends/platform/wince/module.mk
+++ b/backends/platform/wince/module.mk
@@ -28,8 +28,7 @@ MODULE_OBJS := \
 	PocketSCUMM.o \
 	smartLandScale.o
 
-MODULE_DIRS += \
-	backends/platform/wince/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index b3480702b5..aef2117bd7 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -30,6 +30,7 @@
 #include "common/events.h"
 #include "common/util.h"
 #include "common/timer.h"
+#include "common/translation.h"
 
 #include "engines/engine.h"
 
@@ -107,14 +108,14 @@ bool _hasSmartphoneResolution = false;
 // Low end devices 240x320
 
 static const OSystem::GraphicsMode s_supportedGraphicsModesLow[] = {
-	{"1x", "Normal (no scaling)", GFX_NORMAL},
+	{"1x", _s("Normal (no scaling)"), GFX_NORMAL},
 	{0, 0, 0}
 };
 
 // High end device 480x640
 
 static const OSystem::GraphicsMode s_supportedGraphicsModesHigh[] = {
-	{"1x", "Normal (no scaling)", GFX_NORMAL},
+	{"1x", _s("Normal (no scaling)"), GFX_NORMAL},
 	{"2x", "2x", GFX_DOUBLESIZE},
 #ifndef _MSC_VER // EVC breaks template functions, and I'm tired of fixing them :)
 	{"2xsai", "2xSAI", GFX_2XSAI},
@@ -2263,6 +2264,7 @@ static int mapKeyCE(SDLKey key, SDLMod mod, Uint16 unicode, bool unfilter) {
 
 bool OSystem_WINCE3::pollEvent(Common::Event &event) {
 	SDL_Event ev;
+	ev.type = SDL_NOEVENT;
 	byte b = 0;
 	DWORD currentTime;
 	bool keyEvent = false;