diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 247f1f7675f..3f297d8e21c 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -74,8 +74,6 @@ astrocde.cpp
 astrof.cpp
 astropc.cpp
 asuka.cpp
-atari_s1.cpp
-atari_s2.cpp
 atarifb.cpp
 atarig1.cpp
 atarig42.cpp
@@ -85,6 +83,8 @@ atarisy1.cpp
 atarisy2.cpp
 atarisy4.cpp
 atarittl.cpp
+atari_s1.cpp
+atari_s2.cpp
 atetris.cpp
 atlantis.cpp
 atronic.cpp
@@ -117,14 +117,14 @@ belatra.cpp
 berzerk.cpp
 bestleag.cpp
 bfcobra.cpp
+bfmsys83.cpp
+bfmsys85.cpp
 bfm_ad5sw.cpp
 bfm_sc1.cpp
 bfm_sc2.cpp
 bfm_sc4.cpp
 bfm_sc5sw.cpp
 bfm_swp.cpp
-bfmsys83.cpp
-bfmsys85.cpp
 bgt.cpp
 big10.cpp
 bigevglf.cpp
@@ -307,20 +307,20 @@ ddragon.cpp
 ddragon3.cpp
 ddribble.cpp
 ddz.cpp
-de_2.cpp
-de_3.cpp
-de_3b.cpp
 deadang.cpp
 dec0.cpp
 dec8.cpp
-deco_ld.cpp
-deco_mlc.cpp
 deco156.cpp
 deco32.cpp
 decocass.cpp
+deco_ld.cpp
+deco_mlc.cpp
 deniam.cpp
 deshoros.cpp
 destroyr.cpp
+de_2.cpp
+de_3.cpp
+de_3b.cpp
 dfruit.cpp
 dgpix.cpp
 dietgo.cpp
@@ -386,8 +386,8 @@ exterm.cpp
 extrema.cpp
 exzisus.cpp
 ez2d.cpp
-f1gp.cpp
 f-32.cpp
+f1gp.cpp
 famibox.cpp
 fantland.cpp
 fastfred.cpp
@@ -489,9 +489,9 @@ goodejan.cpp
 gotcha.cpp
 gottlieb.cpp
 gotya.cpp
+gpworld.cpp
 gp_1.cpp
 gp_2.cpp
-gpworld.cpp
 gradius3.cpp
 grchamp.cpp
 gridlee.cpp
@@ -543,19 +543,19 @@ hvyunit.cpp
 hyhoo.cpp
 hyperspt.cpp
 hyprduel.cpp
+icecold.cpp
 ice_bozopail.cpp
 ice_tbd.cpp
-icecold.cpp
 ichiban.cpp
 idsa.cpp
-igs_fear.cpp
-igs_m027.cpp
-igs_m036.cpp
 igs009.cpp
 igs011.cpp
 igs017.cpp
 igspc.cpp
 igspoker.cpp
+igs_fear.cpp
+igs_m027.cpp
+igs_m036.cpp
 ikki.cpp
 imolagp.cpp
 inder.cpp
@@ -650,9 +650,9 @@ lasso.cpp
 lastbank.cpp
 lastduel.cpp
 lastfght.cpp
+lazercmd.cpp
 laz_aftrshok.cpp
 laz_ribrac.cpp
-lazercmd.cpp
 lbeach.cpp
 lckydraw.cpp
 legionna.cpp
@@ -942,11 +942,11 @@ piratesh.cpp
 pitnrun.cpp
 pkscram.cpp
 pktgaldx.cpp
+playch10.cpp
+playmark.cpp
 play_1.cpp
 play_2.cpp
 play_3.cpp
-playch10.cpp
-playmark.cpp
 pluto5.cpp
 plygonet.cpp
 pntnpuzl.cpp
@@ -998,8 +998,8 @@ r2dtank.cpp
 r2dx_v33.cpp
 rabbit.cpp
 raiden.cpp
-raiden_ms.cpp
 raiden2.cpp
+raiden_ms.cpp
 rallyx.cpp
 rampart.cpp
 ramtek.cpp
@@ -1191,8 +1191,6 @@ sspeedr.cpp
 ssrj.cpp
 sstrangr.cpp
 ssv.cpp
-st_mp100.cpp
-st_mp200.cpp
 stactics.cpp
 stadhero.cpp
 starcrus.cpp
@@ -1208,6 +1206,8 @@ stlforce.cpp
 strkzn.cpp
 stuntair.cpp
 stv.cpp
+st_mp100.cpp
+st_mp200.cpp
 su2000.cpp
 sub.cpp
 subhuntr.cpp
@@ -1240,14 +1240,6 @@ system16.cpp
 tagteam.cpp
 tail2nos.cpp
 taito.cpp
-taito_b.cpp
-taito_f2.cpp
-taito_f3.cpp
-taito_h.cpp
-taito_l.cpp
-taito_o.cpp
-taito_x.cpp
-taito_z.cpp
 taitoair.cpp
 taitogn.cpp
 taitojc.cpp
@@ -1257,6 +1249,14 @@ taitottl.cpp
 taitotx.cpp
 taitotz.cpp
 taitowlf.cpp
+taito_b.cpp
+taito_f2.cpp
+taito_f3.cpp
+taito_h.cpp
+taito_l.cpp
+taito_o.cpp
+taito_x.cpp
+taito_z.cpp
 tank8.cpp
 tankbatt.cpp
 tankbust.cpp
@@ -1393,8 +1393,8 @@ wecleman.cpp
 welltris.cpp
 wgp.cpp
 wheelfir.cpp
-white_mod.cpp
 whitestar.cpp
+white_mod.cpp
 wico.cpp
 wildpkr.cpp
 williams.cpp
@@ -1429,11 +1429,11 @@ yiear.cpp
 yunsun16.cpp
 yunsung8.cpp
 yuvomz80.cpp
+zac2650.cpp
+zaccaria.cpp
 zac_1.cpp
 zac_2.cpp
 zac_proto.cpp
-zac2650.cpp
-zaccaria.cpp
 zaxxon.cpp
 zerozone.cpp
 zn.cpp
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 6655e6860ab..e553c3cbd6b 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -20,8 +20,8 @@ aci_boris.cpp
 aci_borisdpl.cpp
 aci_ggm.cpp
 aci_prodigy.cpp
-acrnsys1.cpp
 acrnsys.cpp
+acrnsys1.cpp
 actions_atj2279b.cpp
 acvirus.cpp
 adam.cpp
@@ -40,15 +40,15 @@ alesis.cpp
 alesis_qs.cpp
 alfaskop41xx.cpp
 alphasma.cpp
-alphatpx.cpp
 alphatpc16.cpp
+alphatpx.cpp
 alphatro.cpp
 altair.cpp
 alto1.cpp
 alto2.cpp
 altos2.cpp
-altos5.cpp
 altos486.cpp
+altos5.cpp
 altos8600.cpp
 am1000.cpp
 amico2k.cpp
@@ -57,8 +57,8 @@ ampex.cpp
 ampex210.cpp
 ampro.cpp
 ampscarp.cpp
-amstr_pc.cpp
 amstrad.cpp
+amstr_pc.cpp
 amust.cpp
 anzterm.cpp
 apc.cpp
@@ -158,8 +158,8 @@ chaos.cpp
 chessmate.cpp
 chessmst.cpp
 cit101.cpp
-cit220.cpp
 cit1500.cpp
+cit220.cpp
 cking_master.cpp
 clcd.cpp
 clickstart.cpp
@@ -177,8 +177,8 @@ compuchess.cpp
 compucolor.cpp
 comquest.cpp
 comx35.cpp
-conchess.cpp
 concept.cpp
+conchess.cpp
 controlid.cpp
 cortex.cpp
 cosmicos.cpp
@@ -321,8 +321,8 @@ geniusjr.cpp
 genpc.cpp
 gigatron.cpp
 gimix.cpp
-gkidabc.cpp
 gizmondo.cpp
+gkidabc.cpp
 glcx.cpp
 gmaster.cpp
 goupil.cpp
@@ -340,6 +340,7 @@ hazeltin.cpp
 hazl1420.cpp
 hec2hrp.cpp
 hektor.cpp
+hhtiger.cpp
 hh_amis2k.cpp
 hh_cop400.cpp
 hh_hmcs40.cpp
@@ -348,7 +349,6 @@ hh_pic16.cpp
 hh_sm510.cpp
 hh_tms1k.cpp
 hh_ucom4.cpp
-hhtiger.cpp
 hk68v10.cpp
 homelab.cpp
 homez80.cpp
@@ -374,8 +374,8 @@ hp_ipc.cpp
 ht6000.cpp
 ht68k.cpp
 huebler.cpp
-hunter2.cpp
 hunter16.cpp
+hunter2.cpp
 husky.cpp
 hx20.cpp
 i7000.cpp
@@ -518,10 +518,10 @@ microtan.cpp
 microterm.cpp
 microterm_f8.cpp
 microvsn.cpp
+mightyframe.cpp
 mikro80.cpp
 mikromik.cpp
 mikrosha.cpp
-mightyframe.cpp
 milton6805.cpp
 milwaukee.cpp
 mindset.cpp
@@ -622,9 +622,9 @@ osi.cpp
 p112.cpp
 p2000t.cpp
 p8k.cpp
+palestra.cpp
 palm.cpp
 palmz22.cpp
-palestra.cpp
 partner.cpp
 paso1600.cpp
 pasogo.cpp
@@ -667,9 +667,9 @@ pet.cpp
 pg685.cpp
 phc25.cpp
 phunsy.cpp
+picno.cpp
 pimps.cpp
 pipbug.cpp
-picno.cpp
 pk8000.cpp
 pk8020.cpp
 plan80.cpp
@@ -716,16 +716,16 @@ px8.cpp
 pyl601.cpp
 ql.cpp
 qtsbc.cpp
-qvt70.cpp
 qvt102.cpp
 qvt103.cpp
 qvt190.cpp
 qvt201.cpp
+qvt70.cpp
 qx10.cpp
 r9751.cpp
+radio86.cpp
 rad_eu3a05.cpp
 rad_eu3a14.cpp
-radio86.cpp
 rainbow.cpp
 rambo.cpp
 ravens.cpp
@@ -739,8 +739,8 @@ riscpc.cpp
 rm380z.cpp
 rmnimbus.cpp
 roland_cm32p.cpp
-roland_d50.cpp
 roland_d110.cpp
+roland_d50.cpp
 roland_mt32.cpp
 roland_sc55.cpp
 rt1715.cpp
@@ -756,8 +756,6 @@ saitek_cp2000.cpp
 saitek_delta1.cpp
 saitek_mark5.cpp
 saitek_risc2500.cpp
-spg2xx_mysprtch.cpp
-spg2xx_smarttv.cpp
 saitek_ssystem3.cpp
 saitek_stratos.cpp
 saitek_superstar.cpp
@@ -779,10 +777,10 @@ sdk80.cpp
 sdk85.cpp
 sdk86.cpp
 seattlecmp.cpp
-sega_beena.cpp
-sega_sawatte.cpp
 segapico.cpp
 segapm.cpp
+sega_beena.cpp
+sega_sawatte.cpp
 selz80.cpp
 sg1000.cpp
 sh4robot.cpp
@@ -820,11 +818,13 @@ spg2xx_jakks.cpp
 spg2xx_jakks_gkr.cpp
 spg2xx_jakks_tvtouch.cpp
 spg2xx_lexibook.cpp
+spg2xx_mysprtch.cpp
 spg2xx_pdc.cpp
 spg2xx_playvision.cpp
 spg2xx_senario.cpp
 spg2xx_senario_poker.cpp
 spg2xx_shredmjr.cpp
+spg2xx_smarttv.cpp
 spg2xx_telestory.cpp
 spg2xx_tvgogo.cpp
 spg2xx_vii.cpp
@@ -883,9 +883,9 @@ telex277d.cpp
 terak.cpp
 terco.cpp
 terminal.cpp
-test_t400.cpp
 testconsole.cpp
 testpat.cpp
+test_t400.cpp
 textelcomp.cpp
 tg100.cpp
 thomson.cpp
@@ -894,19 +894,19 @@ ti74.cpp
 ti85.cpp
 ti89.cpp
 ti931.cpp
+ti990_10.cpp
+ti990_4.cpp
 ti99_2.cpp
 ti99_4p.cpp
 ti99_4x.cpp
 ti99_8.cpp
-ti990_10.cpp
-ti990_4.cpp
 tiki100.cpp
-titan_soc.cpp
 tim011.cpp
 tim100.cpp
 timex.cpp
 tispeak.cpp
 tispellb.cpp
+titan_soc.cpp
 tk2000.cpp
 tk635.cpp
 tk80.cpp
@@ -915,8 +915,8 @@ tm990189.cpp
 tmc1800.cpp
 tmc2000e.cpp
 tmc600.cpp
-tosh1000.cpp
 tomy_princ.cpp
+tosh1000.cpp
 tr175.cpp
 tr606.cpp
 tranz330.cpp
@@ -926,10 +926,10 @@ trs80.cpp
 trs80dt1.cpp
 trs80m2.cpp
 trs80m3.cpp
+ts3000.cpp
 ts802.cpp
 ts803.cpp
 ts816.cpp
-ts3000.cpp
 tsispch.cpp
 tti.cpp
 tulip1.cpp
@@ -947,18 +947,18 @@ tvgame.cpp
 tx0.cpp
 uchroma68.cpp
 uknc.cpp
-unkmandd.cpp
 unichamp.cpp
 unior.cpp
 unistar.cpp
 univac.cpp
 unixpc.cpp
+unkmandd.cpp
 ut88.cpp
 uzebox.cpp
 v100.cpp
 v102.cpp
-v550.cpp
 v1050.cpp
+v550.cpp
 v6809.cpp
 vanguardmk1.cpp
 vax11.cpp
@@ -988,14 +988,14 @@ vp60.cpp
 vsmile.cpp
 vsmileb.cpp
 vsmilepro.cpp
-vt52.cpp
-vt62.cpp
 vt100.cpp
+vt1682.cpp
 vt220.cpp
 vt240.cpp
 vt320.cpp
+vt52.cpp
 vt520.cpp
-vt1682.cpp
+vt62.cpp
 vta2000.cpp
 vtech1.cpp
 vtech2.cpp
@@ -1021,9 +1021,9 @@ xavix2.cpp
 xbox.cpp
 xerox820.cpp
 xor100.cpp
+ymmu100.cpp
 ymmu50.cpp
 ymmu80.cpp
-ymmu100.cpp
 ymvl70.cpp
 z100.cpp
 z1013.cpp