diff --git a/src/ai/ai.c b/src/ai/ai.cpp
similarity index 100%
rename from src/ai/ai.c
rename to src/ai/ai.cpp
diff --git a/src/ai/default/default.c b/src/ai/default/default.cpp
similarity index 100%
rename from src/ai/default/default.c
rename to src/ai/default/default.cpp
diff --git a/src/ai/trolly/build.c b/src/ai/trolly/build.cpp
similarity index 100%
rename from src/ai/trolly/build.c
rename to src/ai/trolly/build.cpp
diff --git a/src/ai/trolly/pathfinder.c b/src/ai/trolly/pathfinder.cpp
similarity index 100%
rename from src/ai/trolly/pathfinder.c
rename to src/ai/trolly/pathfinder.cpp
diff --git a/src/ai/trolly/shared.c b/src/ai/trolly/shared.cpp
similarity index 100%
rename from src/ai/trolly/shared.c
rename to src/ai/trolly/shared.cpp
diff --git a/src/ai/trolly/trolly.c b/src/ai/trolly/trolly.cpp
similarity index 100%
rename from src/ai/trolly/trolly.c
rename to src/ai/trolly/trolly.cpp
diff --git a/src/aircraft_gui.c b/src/aircraft_gui.cpp
similarity index 100%
rename from src/aircraft_gui.c
rename to src/aircraft_gui.cpp
diff --git a/src/airport.c b/src/airport.cpp
similarity index 100%
rename from src/airport.c
rename to src/airport.cpp
diff --git a/src/airport_gui.c b/src/airport_gui.cpp
similarity index 100%
rename from src/airport_gui.c
rename to src/airport_gui.cpp
diff --git a/src/aystar.c b/src/aystar.cpp
similarity index 100%
rename from src/aystar.c
rename to src/aystar.cpp
diff --git a/src/bmp.c b/src/bmp.cpp
similarity index 100%
rename from src/bmp.c
rename to src/bmp.cpp
diff --git a/src/bridge_gui.c b/src/bridge_gui.cpp
similarity index 100%
rename from src/bridge_gui.c
rename to src/bridge_gui.cpp
diff --git a/src/bridge_map.c b/src/bridge_map.cpp
similarity index 100%
rename from src/bridge_map.c
rename to src/bridge_map.cpp
diff --git a/src/build_vehicle_gui.c b/src/build_vehicle_gui.cpp
similarity index 100%
rename from src/build_vehicle_gui.c
rename to src/build_vehicle_gui.cpp
diff --git a/src/callback_table.c b/src/callback_table.cpp
similarity index 100%
rename from src/callback_table.c
rename to src/callback_table.cpp
diff --git a/src/clear_cmd.c b/src/clear_cmd.cpp
similarity index 100%
rename from src/clear_cmd.c
rename to src/clear_cmd.cpp
diff --git a/src/command.c b/src/command.cpp
similarity index 100%
rename from src/command.c
rename to src/command.cpp
diff --git a/src/console.c b/src/console.cpp
similarity index 100%
rename from src/console.c
rename to src/console.cpp
diff --git a/src/console_cmds.c b/src/console_cmds.cpp
similarity index 100%
rename from src/console_cmds.c
rename to src/console_cmds.cpp
diff --git a/src/currency.c b/src/currency.cpp
similarity index 100%
rename from src/currency.c
rename to src/currency.cpp
diff --git a/src/date.c b/src/date.cpp
similarity index 100%
rename from src/date.c
rename to src/date.cpp
diff --git a/src/debug.c b/src/debug.cpp
similarity index 100%
rename from src/debug.c
rename to src/debug.cpp
diff --git a/src/dedicated.c b/src/dedicated.cpp
similarity index 100%
rename from src/dedicated.c
rename to src/dedicated.cpp
diff --git a/src/depot.c b/src/depot.cpp
similarity index 100%
rename from src/depot.c
rename to src/depot.cpp
diff --git a/src/depot_gui.c b/src/depot_gui.cpp
similarity index 100%
rename from src/depot_gui.c
rename to src/depot_gui.cpp
diff --git a/src/disaster_cmd.c b/src/disaster_cmd.cpp
similarity index 100%
rename from src/disaster_cmd.c
rename to src/disaster_cmd.cpp
diff --git a/src/dock_gui.c b/src/dock_gui.cpp
similarity index 100%
rename from src/dock_gui.c
rename to src/dock_gui.cpp
diff --git a/src/driver.c b/src/driver.cpp
similarity index 100%
rename from src/driver.c
rename to src/driver.cpp
diff --git a/src/dummy_land.c b/src/dummy_land.cpp
similarity index 100%
rename from src/dummy_land.c
rename to src/dummy_land.cpp
diff --git a/src/economy.c b/src/economy.cpp
similarity index 100%
rename from src/economy.c
rename to src/economy.cpp
diff --git a/src/elrail.c b/src/elrail.cpp
similarity index 100%
rename from src/elrail.c
rename to src/elrail.cpp
diff --git a/src/endian_check.c b/src/endian_check.cpp
similarity index 100%
rename from src/endian_check.c
rename to src/endian_check.cpp
diff --git a/src/engine.c b/src/engine.cpp
similarity index 100%
rename from src/engine.c
rename to src/engine.cpp
diff --git a/src/engine_gui.c b/src/engine_gui.cpp
similarity index 100%
rename from src/engine_gui.c
rename to src/engine_gui.cpp
diff --git a/src/fileio.c b/src/fileio.cpp
similarity index 100%
rename from src/fileio.c
rename to src/fileio.cpp
diff --git a/src/fios.c b/src/fios.cpp
similarity index 100%
rename from src/fios.c
rename to src/fios.cpp
diff --git a/src/fontcache.c b/src/fontcache.cpp
similarity index 100%
rename from src/fontcache.c
rename to src/fontcache.cpp
diff --git a/src/genworld.c b/src/genworld.cpp
similarity index 100%
rename from src/genworld.c
rename to src/genworld.cpp
diff --git a/src/genworld_gui.c b/src/genworld_gui.cpp
similarity index 100%
rename from src/genworld_gui.c
rename to src/genworld_gui.cpp
diff --git a/src/gfx.c b/src/gfx.cpp
similarity index 100%
rename from src/gfx.c
rename to src/gfx.cpp
diff --git a/src/gfxinit.c b/src/gfxinit.cpp
similarity index 100%
rename from src/gfxinit.c
rename to src/gfxinit.cpp
diff --git a/src/graph_gui.c b/src/graph_gui.cpp
similarity index 100%
rename from src/graph_gui.c
rename to src/graph_gui.cpp
diff --git a/src/heightmap.c b/src/heightmap.cpp
similarity index 100%
rename from src/heightmap.c
rename to src/heightmap.cpp
diff --git a/src/industry_cmd.c b/src/industry_cmd.cpp
similarity index 100%
rename from src/industry_cmd.c
rename to src/industry_cmd.cpp
diff --git a/src/industry_gui.c b/src/industry_gui.cpp
similarity index 100%
rename from src/industry_gui.c
rename to src/industry_gui.cpp
diff --git a/src/intro_gui.c b/src/intro_gui.cpp
similarity index 100%
rename from src/intro_gui.c
rename to src/intro_gui.cpp
diff --git a/src/landscape.c b/src/landscape.cpp
similarity index 100%
rename from src/landscape.c
rename to src/landscape.cpp
diff --git a/src/main_gui.c b/src/main_gui.cpp
similarity index 100%
rename from src/main_gui.c
rename to src/main_gui.cpp
diff --git a/src/map.c b/src/map.cpp
similarity index 100%
rename from src/map.c
rename to src/map.cpp
diff --git a/src/md5.c b/src/md5.cpp
similarity index 100%
rename from src/md5.c
rename to src/md5.cpp
diff --git a/src/mersenne.c b/src/mersenne.cpp
similarity index 100%
rename from src/mersenne.c
rename to src/mersenne.cpp
diff --git a/src/minilzo.c b/src/minilzo.cpp
similarity index 100%
rename from src/minilzo.c
rename to src/minilzo.cpp
diff --git a/src/misc.c b/src/misc.cpp
similarity index 100%
rename from src/misc.c
rename to src/misc.cpp
diff --git a/src/misc_cmd.c b/src/misc_cmd.cpp
similarity index 100%
rename from src/misc_cmd.c
rename to src/misc_cmd.cpp
diff --git a/src/misc_gui.c b/src/misc_gui.cpp
similarity index 100%
rename from src/misc_gui.c
rename to src/misc_gui.cpp
diff --git a/src/mixer.c b/src/mixer.cpp
similarity index 100%
rename from src/mixer.c
rename to src/mixer.cpp
diff --git a/src/music.c b/src/music.cpp
similarity index 100%
rename from src/music.c
rename to src/music.cpp
diff --git a/src/music/extmidi.c b/src/music/extmidi.cpp
similarity index 100%
rename from src/music/extmidi.c
rename to src/music/extmidi.cpp
diff --git a/src/music/null_m.c b/src/music/null_m.cpp
similarity index 100%
rename from src/music/null_m.c
rename to src/music/null_m.cpp
diff --git a/src/music/os2_m.c b/src/music/os2_m.cpp
similarity index 100%
rename from src/music/os2_m.c
rename to src/music/os2_m.cpp
diff --git a/src/music/qtmidi.c b/src/music/qtmidi.cpp
similarity index 100%
rename from src/music/qtmidi.c
rename to src/music/qtmidi.cpp
diff --git a/src/music/win32_m.c b/src/music/win32_m.cpp
similarity index 100%
rename from src/music/win32_m.c
rename to src/music/win32_m.cpp
diff --git a/src/music_gui.c b/src/music_gui.cpp
similarity index 100%
rename from src/music_gui.c
rename to src/music_gui.cpp
diff --git a/src/namegen.c b/src/namegen.cpp
similarity index 100%
rename from src/namegen.c
rename to src/namegen.cpp
diff --git a/src/network/core/core.c b/src/network/core/core.cpp
similarity index 100%
rename from src/network/core/core.c
rename to src/network/core/core.cpp
diff --git a/src/network/core/packet.c b/src/network/core/packet.cpp
similarity index 100%
rename from src/network/core/packet.c
rename to src/network/core/packet.cpp
diff --git a/src/network/core/tcp.c b/src/network/core/tcp.cpp
similarity index 100%
rename from src/network/core/tcp.c
rename to src/network/core/tcp.cpp
diff --git a/src/network/core/udp.c b/src/network/core/udp.cpp
similarity index 100%
rename from src/network/core/udp.c
rename to src/network/core/udp.cpp
diff --git a/src/network/network.c b/src/network/network.cpp
similarity index 100%
rename from src/network/network.c
rename to src/network/network.cpp
diff --git a/src/network/network_client.c b/src/network/network_client.cpp
similarity index 100%
rename from src/network/network_client.c
rename to src/network/network_client.cpp
diff --git a/src/network/network_data.c b/src/network/network_data.cpp
similarity index 100%
rename from src/network/network_data.c
rename to src/network/network_data.cpp
diff --git a/src/network/network_gamelist.c b/src/network/network_gamelist.cpp
similarity index 100%
rename from src/network/network_gamelist.c
rename to src/network/network_gamelist.cpp
diff --git a/src/network/network_gui.c b/src/network/network_gui.cpp
similarity index 100%
rename from src/network/network_gui.c
rename to src/network/network_gui.cpp
diff --git a/src/network/network_server.c b/src/network/network_server.cpp
similarity index 100%
rename from src/network/network_server.c
rename to src/network/network_server.cpp
diff --git a/src/network/network_udp.c b/src/network/network_udp.cpp
similarity index 100%
rename from src/network/network_udp.c
rename to src/network/network_udp.cpp
diff --git a/src/newgrf.c b/src/newgrf.cpp
similarity index 100%
rename from src/newgrf.c
rename to src/newgrf.cpp
diff --git a/src/newgrf_cargo.c b/src/newgrf_cargo.cpp
similarity index 100%
rename from src/newgrf_cargo.c
rename to src/newgrf_cargo.cpp
diff --git a/src/newgrf_config.c b/src/newgrf_config.cpp
similarity index 100%
rename from src/newgrf_config.c
rename to src/newgrf_config.cpp
diff --git a/src/newgrf_engine.c b/src/newgrf_engine.cpp
similarity index 100%
rename from src/newgrf_engine.c
rename to src/newgrf_engine.cpp
diff --git a/src/newgrf_gui.c b/src/newgrf_gui.cpp
similarity index 100%
rename from src/newgrf_gui.c
rename to src/newgrf_gui.cpp
diff --git a/src/newgrf_sound.c b/src/newgrf_sound.cpp
similarity index 100%
rename from src/newgrf_sound.c
rename to src/newgrf_sound.cpp
diff --git a/src/newgrf_spritegroup.c b/src/newgrf_spritegroup.cpp
similarity index 100%
rename from src/newgrf_spritegroup.c
rename to src/newgrf_spritegroup.cpp
diff --git a/src/newgrf_station.c b/src/newgrf_station.cpp
similarity index 100%
rename from src/newgrf_station.c
rename to src/newgrf_station.cpp
diff --git a/src/newgrf_text.c b/src/newgrf_text.cpp
similarity index 100%
rename from src/newgrf_text.c
rename to src/newgrf_text.cpp
diff --git a/src/news_gui.c b/src/news_gui.cpp
similarity index 100%
rename from src/news_gui.c
rename to src/news_gui.cpp
diff --git a/src/npf.c b/src/npf.cpp
similarity index 100%
rename from src/npf.c
rename to src/npf.cpp
diff --git a/src/oldloader.c b/src/oldloader.cpp
similarity index 100%
rename from src/oldloader.c
rename to src/oldloader.cpp
diff --git a/src/oldpool.c b/src/oldpool.cpp
similarity index 100%
rename from src/oldpool.c
rename to src/oldpool.cpp
diff --git a/src/openttd.c b/src/openttd.cpp
similarity index 100%
rename from src/openttd.c
rename to src/openttd.cpp
diff --git a/src/order_cmd.c b/src/order_cmd.cpp
similarity index 100%
rename from src/order_cmd.c
rename to src/order_cmd.cpp
diff --git a/src/order_gui.c b/src/order_gui.cpp
similarity index 100%
rename from src/order_gui.c
rename to src/order_gui.cpp
diff --git a/src/os/macosx/G5_detector.c b/src/os/macosx/G5_detector.cpp
similarity index 100%
rename from src/os/macosx/G5_detector.c
rename to src/os/macosx/G5_detector.cpp
diff --git a/src/os/macosx/splash.c b/src/os/macosx/splash.cpp
similarity index 100%
rename from src/os/macosx/splash.c
rename to src/os/macosx/splash.cpp
diff --git a/src/os2.c b/src/os2.cpp
similarity index 100%
rename from src/os2.c
rename to src/os2.cpp
diff --git a/src/os_timer.c b/src/os_timer.cpp
similarity index 100%
rename from src/os_timer.c
rename to src/os_timer.cpp
diff --git a/src/pathfind.c b/src/pathfind.cpp
similarity index 100%
rename from src/pathfind.c
rename to src/pathfind.cpp
diff --git a/src/player_gui.c b/src/player_gui.cpp
similarity index 100%
rename from src/player_gui.c
rename to src/player_gui.cpp
diff --git a/src/players.c b/src/players.cpp
similarity index 100%
rename from src/players.c
rename to src/players.cpp
diff --git a/src/queue.c b/src/queue.cpp
similarity index 100%
rename from src/queue.c
rename to src/queue.cpp
diff --git a/src/rail.c b/src/rail.cpp
similarity index 100%
rename from src/rail.c
rename to src/rail.cpp
diff --git a/src/rail_cmd.c b/src/rail_cmd.cpp
similarity index 100%
rename from src/rail_cmd.c
rename to src/rail_cmd.cpp
diff --git a/src/rail_gui.c b/src/rail_gui.cpp
similarity index 100%
rename from src/rail_gui.c
rename to src/rail_gui.cpp
diff --git a/src/road_cmd.c b/src/road_cmd.cpp
similarity index 100%
rename from src/road_cmd.c
rename to src/road_cmd.cpp
diff --git a/src/road_gui.c b/src/road_gui.cpp
similarity index 100%
rename from src/road_gui.c
rename to src/road_gui.cpp
diff --git a/src/road_map.c b/src/road_map.cpp
similarity index 100%
rename from src/road_map.c
rename to src/road_map.cpp
diff --git a/src/roadveh_cmd.c b/src/roadveh_cmd.cpp
similarity index 100%
rename from src/roadveh_cmd.c
rename to src/roadveh_cmd.cpp
diff --git a/src/roadveh_gui.c b/src/roadveh_gui.cpp
similarity index 100%
rename from src/roadveh_gui.c
rename to src/roadveh_gui.cpp
diff --git a/src/saveload.c b/src/saveload.cpp
similarity index 100%
rename from src/saveload.c
rename to src/saveload.cpp
diff --git a/src/screenshot.c b/src/screenshot.cpp
similarity index 100%
rename from src/screenshot.c
rename to src/screenshot.cpp
diff --git a/src/sdl.c b/src/sdl.cpp
similarity index 100%
rename from src/sdl.c
rename to src/sdl.cpp
diff --git a/src/settings.c b/src/settings.cpp
similarity index 100%
rename from src/settings.c
rename to src/settings.cpp
diff --git a/src/settings_gui.c b/src/settings_gui.cpp
similarity index 100%
rename from src/settings_gui.c
rename to src/settings_gui.cpp
diff --git a/src/ship_cmd.c b/src/ship_cmd.cpp
similarity index 100%
rename from src/ship_cmd.c
rename to src/ship_cmd.cpp
diff --git a/src/ship_gui.c b/src/ship_gui.cpp
similarity index 100%
rename from src/ship_gui.c
rename to src/ship_gui.cpp
diff --git a/src/signs.c b/src/signs.cpp
similarity index 100%
rename from src/signs.c
rename to src/signs.cpp
diff --git a/src/smallmap_gui.c b/src/smallmap_gui.cpp
similarity index 100%
rename from src/smallmap_gui.c
rename to src/smallmap_gui.cpp
diff --git a/src/sound.c b/src/sound.cpp
similarity index 100%
rename from src/sound.c
rename to src/sound.cpp
diff --git a/src/sound/cocoa_s.c b/src/sound/cocoa_s.cpp
similarity index 100%
rename from src/sound/cocoa_s.c
rename to src/sound/cocoa_s.cpp
diff --git a/src/sound/null_s.c b/src/sound/null_s.cpp
similarity index 100%
rename from src/sound/null_s.c
rename to src/sound/null_s.cpp
diff --git a/src/sound/sdl_s.c b/src/sound/sdl_s.cpp
similarity index 100%
rename from src/sound/sdl_s.c
rename to src/sound/sdl_s.cpp
diff --git a/src/sound/win32_s.c b/src/sound/win32_s.cpp
similarity index 100%
rename from src/sound/win32_s.c
rename to src/sound/win32_s.cpp
diff --git a/src/spritecache.c b/src/spritecache.cpp
similarity index 100%
rename from src/spritecache.c
rename to src/spritecache.cpp
diff --git a/src/station_cmd.c b/src/station_cmd.cpp
similarity index 100%
rename from src/station_cmd.c
rename to src/station_cmd.cpp
diff --git a/src/station_gui.c b/src/station_gui.cpp
similarity index 100%
rename from src/station_gui.c
rename to src/station_gui.cpp
diff --git a/src/station_map.c b/src/station_map.cpp
similarity index 100%
rename from src/station_map.c
rename to src/station_map.cpp
diff --git a/src/strgen/strgen.c b/src/strgen/strgen.cpp
similarity index 100%
rename from src/strgen/strgen.c
rename to src/strgen/strgen.cpp
diff --git a/src/string.c b/src/string.cpp
similarity index 100%
rename from src/string.c
rename to src/string.cpp
diff --git a/src/strings.c b/src/strings.cpp
similarity index 100%
rename from src/strings.c
rename to src/strings.cpp
diff --git a/src/subsidy_gui.c b/src/subsidy_gui.cpp
similarity index 100%
rename from src/subsidy_gui.c
rename to src/subsidy_gui.cpp
diff --git a/src/terraform_gui.c b/src/terraform_gui.cpp
similarity index 100%
rename from src/terraform_gui.c
rename to src/terraform_gui.cpp
diff --git a/src/texteff.c b/src/texteff.cpp
similarity index 100%
rename from src/texteff.c
rename to src/texteff.cpp
diff --git a/src/tgp.c b/src/tgp.cpp
similarity index 100%
rename from src/tgp.c
rename to src/tgp.cpp
diff --git a/src/thread.c b/src/thread.cpp
similarity index 100%
rename from src/thread.c
rename to src/thread.cpp
diff --git a/src/tile.c b/src/tile.cpp
similarity index 100%
rename from src/tile.c
rename to src/tile.cpp
diff --git a/src/town_cmd.c b/src/town_cmd.cpp
similarity index 100%
rename from src/town_cmd.c
rename to src/town_cmd.cpp
diff --git a/src/town_gui.c b/src/town_gui.cpp
similarity index 100%
rename from src/town_gui.c
rename to src/town_gui.cpp
diff --git a/src/train_cmd.c b/src/train_cmd.cpp
similarity index 100%
rename from src/train_cmd.c
rename to src/train_cmd.cpp
diff --git a/src/train_gui.c b/src/train_gui.cpp
similarity index 100%
rename from src/train_gui.c
rename to src/train_gui.cpp
diff --git a/src/tree_cmd.c b/src/tree_cmd.cpp
similarity index 100%
rename from src/tree_cmd.c
rename to src/tree_cmd.cpp
diff --git a/src/tunnel_map.c b/src/tunnel_map.cpp
similarity index 100%
rename from src/tunnel_map.c
rename to src/tunnel_map.cpp
diff --git a/src/tunnelbridge_cmd.c b/src/tunnelbridge_cmd.cpp
similarity index 100%
rename from src/tunnelbridge_cmd.c
rename to src/tunnelbridge_cmd.cpp
diff --git a/src/unix.c b/src/unix.cpp
similarity index 100%
rename from src/unix.c
rename to src/unix.cpp
diff --git a/src/unmovable_cmd.c b/src/unmovable_cmd.cpp
similarity index 100%
rename from src/unmovable_cmd.c
rename to src/unmovable_cmd.cpp
diff --git a/src/vehicle.c b/src/vehicle.cpp
similarity index 100%
rename from src/vehicle.c
rename to src/vehicle.cpp
diff --git a/src/vehicle_gui.c b/src/vehicle_gui.cpp
similarity index 100%
rename from src/vehicle_gui.c
rename to src/vehicle_gui.cpp
diff --git a/src/video/dedicated_v.c b/src/video/dedicated_v.cpp
similarity index 100%
rename from src/video/dedicated_v.c
rename to src/video/dedicated_v.cpp
diff --git a/src/video/null_v.c b/src/video/null_v.cpp
similarity index 100%
rename from src/video/null_v.c
rename to src/video/null_v.cpp
diff --git a/src/video/sdl_v.c b/src/video/sdl_v.cpp
similarity index 100%
rename from src/video/sdl_v.c
rename to src/video/sdl_v.cpp
diff --git a/src/video/win32_v.c b/src/video/win32_v.cpp
similarity index 100%
rename from src/video/win32_v.c
rename to src/video/win32_v.cpp
diff --git a/src/viewport.c b/src/viewport.cpp
similarity index 100%
rename from src/viewport.c
rename to src/viewport.cpp
diff --git a/src/water_cmd.c b/src/water_cmd.cpp
similarity index 100%
rename from src/water_cmd.c
rename to src/water_cmd.cpp
diff --git a/src/waypoint.c b/src/waypoint.cpp
similarity index 100%
rename from src/waypoint.c
rename to src/waypoint.cpp
diff --git a/src/widget.c b/src/widget.cpp
similarity index 100%
rename from src/widget.c
rename to src/widget.cpp
diff --git a/src/win32.c b/src/win32.cpp
similarity index 100%
rename from src/win32.c
rename to src/win32.cpp
diff --git a/src/window.c b/src/window.cpp
similarity index 100%
rename from src/window.c
rename to src/window.cpp