diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.cpp
similarity index 100%
rename from tools/quake3/common/aselib.c
rename to tools/quake3/common/aselib.cpp
diff --git a/tools/quake3/common/bspfile.c b/tools/quake3/common/bspfile.cpp
similarity index 100%
rename from tools/quake3/common/bspfile.c
rename to tools/quake3/common/bspfile.cpp
diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.cpp
similarity index 100%
rename from tools/quake3/common/cmdlib.c
rename to tools/quake3/common/cmdlib.cpp
diff --git a/tools/quake3/common/imagelib.c b/tools/quake3/common/imagelib.cpp
similarity index 100%
rename from tools/quake3/common/imagelib.c
rename to tools/quake3/common/imagelib.cpp
diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.cpp
similarity index 100%
rename from tools/quake3/common/inout.c
rename to tools/quake3/common/inout.cpp
diff --git a/tools/quake3/common/jpeg.c b/tools/quake3/common/jpeg.cpp
similarity index 100%
rename from tools/quake3/common/jpeg.c
rename to tools/quake3/common/jpeg.cpp
diff --git a/tools/quake3/common/l3dslib.c b/tools/quake3/common/l3dslib.cpp
similarity index 100%
rename from tools/quake3/common/l3dslib.c
rename to tools/quake3/common/l3dslib.cpp
diff --git a/tools/quake3/common/md4.c b/tools/quake3/common/md4.cpp
similarity index 100%
rename from tools/quake3/common/md4.c
rename to tools/quake3/common/md4.cpp
diff --git a/tools/quake3/common/miniz.c b/tools/quake3/common/miniz.cpp
similarity index 100%
rename from tools/quake3/common/miniz.c
rename to tools/quake3/common/miniz.cpp
diff --git a/tools/quake3/common/mutex.c b/tools/quake3/common/mutex.cpp
similarity index 100%
rename from tools/quake3/common/mutex.c
rename to tools/quake3/common/mutex.cpp
diff --git a/tools/quake3/common/polylib.c b/tools/quake3/common/polylib.cpp
similarity index 100%
rename from tools/quake3/common/polylib.c
rename to tools/quake3/common/polylib.cpp
diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.cpp
similarity index 100%
rename from tools/quake3/common/scriplib.c
rename to tools/quake3/common/scriplib.cpp
diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.cpp
similarity index 100%
rename from tools/quake3/common/threads.c
rename to tools/quake3/common/threads.cpp
diff --git a/tools/quake3/common/trilib.c b/tools/quake3/common/trilib.cpp
similarity index 100%
rename from tools/quake3/common/trilib.c
rename to tools/quake3/common/trilib.cpp
diff --git a/tools/quake3/common/unzip.c b/tools/quake3/common/unzip.cpp
similarity index 100%
rename from tools/quake3/common/unzip.c
rename to tools/quake3/common/unzip.cpp
diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.cpp
similarity index 100%
rename from tools/quake3/common/vfs.c
rename to tools/quake3/common/vfs.cpp
diff --git a/tools/quake3/q3data/3dslib.c b/tools/quake3/q3data/3dslib.cpp
similarity index 100%
rename from tools/quake3/q3data/3dslib.c
rename to tools/quake3/q3data/3dslib.cpp
diff --git a/tools/quake3/q3data/compress.c b/tools/quake3/q3data/compress.cpp
similarity index 100%
rename from tools/quake3/q3data/compress.c
rename to tools/quake3/q3data/compress.cpp
diff --git a/tools/quake3/q3data/images.c b/tools/quake3/q3data/images.cpp
similarity index 100%
rename from tools/quake3/q3data/images.c
rename to tools/quake3/q3data/images.cpp
diff --git a/tools/quake3/q3data/md3lib.c b/tools/quake3/q3data/md3lib.cpp
similarity index 100%
rename from tools/quake3/q3data/md3lib.c
rename to tools/quake3/q3data/md3lib.cpp
diff --git a/tools/quake3/q3data/models.c b/tools/quake3/q3data/models.cpp
similarity index 100%
rename from tools/quake3/q3data/models.c
rename to tools/quake3/q3data/models.cpp
diff --git a/tools/quake3/q3data/oldstuff.c b/tools/quake3/q3data/oldstuff.cpp
similarity index 100%
rename from tools/quake3/q3data/oldstuff.c
rename to tools/quake3/q3data/oldstuff.cpp
diff --git a/tools/quake3/q3data/p3dlib.c b/tools/quake3/q3data/p3dlib.cpp
similarity index 100%
rename from tools/quake3/q3data/p3dlib.c
rename to tools/quake3/q3data/p3dlib.cpp
diff --git a/tools/quake3/q3data/polyset.c b/tools/quake3/q3data/polyset.cpp
similarity index 100%
rename from tools/quake3/q3data/polyset.c
rename to tools/quake3/q3data/polyset.cpp
diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.cpp
similarity index 100%
rename from tools/quake3/q3data/q3data.c
rename to tools/quake3/q3data/q3data.cpp
diff --git a/tools/quake3/q3data/stripper.c b/tools/quake3/q3data/stripper.cpp
similarity index 100%
rename from tools/quake3/q3data/stripper.c
rename to tools/quake3/q3data/stripper.cpp
diff --git a/tools/quake3/q3data/video.c b/tools/quake3/q3data/video.cpp
similarity index 100%
rename from tools/quake3/q3data/video.c
rename to tools/quake3/q3data/video.cpp
diff --git a/tools/quake3/q3map2/autopk3.c b/tools/quake3/q3map2/autopk3.cpp
similarity index 100%
rename from tools/quake3/q3map2/autopk3.c
rename to tools/quake3/q3map2/autopk3.cpp
diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.cpp
similarity index 100%
rename from tools/quake3/q3map2/brush.c
rename to tools/quake3/q3map2/brush.cpp
diff --git a/tools/quake3/q3map2/brush_primit.c b/tools/quake3/q3map2/brush_primit.cpp
similarity index 100%
rename from tools/quake3/q3map2/brush_primit.c
rename to tools/quake3/q3map2/brush_primit.cpp
diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/bsp.c
rename to tools/quake3/q3map2/bsp.cpp
diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.cpp
similarity index 100%
rename from tools/quake3/q3map2/bspfile_abstract.c
rename to tools/quake3/q3map2/bspfile_abstract.cpp
diff --git a/tools/quake3/q3map2/bspfile_ibsp.c b/tools/quake3/q3map2/bspfile_ibsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/bspfile_ibsp.c
rename to tools/quake3/q3map2/bspfile_ibsp.cpp
diff --git a/tools/quake3/q3map2/bspfile_rbsp.c b/tools/quake3/q3map2/bspfile_rbsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/bspfile_rbsp.c
rename to tools/quake3/q3map2/bspfile_rbsp.cpp
diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.cpp
similarity index 100%
rename from tools/quake3/q3map2/convert_ase.c
rename to tools/quake3/q3map2/convert_ase.cpp
diff --git a/tools/quake3/q3map2/convert_bsp.c b/tools/quake3/q3map2/convert_bsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/convert_bsp.c
rename to tools/quake3/q3map2/convert_bsp.cpp
diff --git a/tools/quake3/q3map2/convert_map.c b/tools/quake3/q3map2/convert_map.cpp
similarity index 100%
rename from tools/quake3/q3map2/convert_map.c
rename to tools/quake3/q3map2/convert_map.cpp
diff --git a/tools/quake3/q3map2/convert_obj.c b/tools/quake3/q3map2/convert_obj.cpp
similarity index 100%
rename from tools/quake3/q3map2/convert_obj.c
rename to tools/quake3/q3map2/convert_obj.cpp
diff --git a/tools/quake3/q3map2/decals.c b/tools/quake3/q3map2/decals.cpp
similarity index 100%
rename from tools/quake3/q3map2/decals.c
rename to tools/quake3/q3map2/decals.cpp
diff --git a/tools/quake3/q3map2/exportents.c b/tools/quake3/q3map2/exportents.cpp
similarity index 100%
rename from tools/quake3/q3map2/exportents.c
rename to tools/quake3/q3map2/exportents.cpp
diff --git a/tools/quake3/q3map2/facebsp.c b/tools/quake3/q3map2/facebsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/facebsp.c
rename to tools/quake3/q3map2/facebsp.cpp
diff --git a/tools/quake3/q3map2/fog.c b/tools/quake3/q3map2/fog.cpp
similarity index 100%
rename from tools/quake3/q3map2/fog.c
rename to tools/quake3/q3map2/fog.cpp
diff --git a/tools/quake3/q3map2/help.c b/tools/quake3/q3map2/help.cpp
similarity index 100%
rename from tools/quake3/q3map2/help.c
rename to tools/quake3/q3map2/help.cpp
diff --git a/tools/quake3/q3map2/image.c b/tools/quake3/q3map2/image.cpp
similarity index 100%
rename from tools/quake3/q3map2/image.c
rename to tools/quake3/q3map2/image.cpp
diff --git a/tools/quake3/q3map2/leakfile.c b/tools/quake3/q3map2/leakfile.cpp
similarity index 100%
rename from tools/quake3/q3map2/leakfile.c
rename to tools/quake3/q3map2/leakfile.cpp
diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.cpp
similarity index 100%
rename from tools/quake3/q3map2/light.c
rename to tools/quake3/q3map2/light.cpp
diff --git a/tools/quake3/q3map2/light_bounce.c b/tools/quake3/q3map2/light_bounce.cpp
similarity index 100%
rename from tools/quake3/q3map2/light_bounce.c
rename to tools/quake3/q3map2/light_bounce.cpp
diff --git a/tools/quake3/q3map2/light_shadows.c b/tools/quake3/q3map2/light_shadows.cpp
similarity index 100%
rename from tools/quake3/q3map2/light_shadows.c
rename to tools/quake3/q3map2/light_shadows.cpp
diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.cpp
similarity index 100%
rename from tools/quake3/q3map2/light_trace.c
rename to tools/quake3/q3map2/light_trace.cpp
diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.cpp
similarity index 100%
rename from tools/quake3/q3map2/light_ydnar.c
rename to tools/quake3/q3map2/light_ydnar.cpp
diff --git a/tools/quake3/q3map2/lightmaps.c b/tools/quake3/q3map2/lightmaps.cpp
similarity index 100%
rename from tools/quake3/q3map2/lightmaps.c
rename to tools/quake3/q3map2/lightmaps.cpp
diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.cpp
similarity index 100%
rename from tools/quake3/q3map2/lightmaps_ydnar.c
rename to tools/quake3/q3map2/lightmaps_ydnar.cpp
diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.cpp
similarity index 100%
rename from tools/quake3/q3map2/main.c
rename to tools/quake3/q3map2/main.cpp
diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.cpp
similarity index 100%
rename from tools/quake3/q3map2/map.c
rename to tools/quake3/q3map2/map.cpp
diff --git a/tools/quake3/q3map2/mesh.c b/tools/quake3/q3map2/mesh.cpp
similarity index 100%
rename from tools/quake3/q3map2/mesh.c
rename to tools/quake3/q3map2/mesh.cpp
diff --git a/tools/quake3/q3map2/minimap.c b/tools/quake3/q3map2/minimap.cpp
similarity index 100%
rename from tools/quake3/q3map2/minimap.c
rename to tools/quake3/q3map2/minimap.cpp
diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.cpp
similarity index 100%
rename from tools/quake3/q3map2/model.c
rename to tools/quake3/q3map2/model.cpp
diff --git a/tools/quake3/q3map2/patch.c b/tools/quake3/q3map2/patch.cpp
similarity index 100%
rename from tools/quake3/q3map2/patch.c
rename to tools/quake3/q3map2/patch.cpp
diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.cpp
similarity index 100%
rename from tools/quake3/q3map2/path_init.c
rename to tools/quake3/q3map2/path_init.cpp
diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.cpp
similarity index 100%
rename from tools/quake3/q3map2/portals.c
rename to tools/quake3/q3map2/portals.cpp
diff --git a/tools/quake3/q3map2/prtfile.c b/tools/quake3/q3map2/prtfile.cpp
similarity index 100%
rename from tools/quake3/q3map2/prtfile.c
rename to tools/quake3/q3map2/prtfile.cpp
diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.cpp
similarity index 100%
rename from tools/quake3/q3map2/shaders.c
rename to tools/quake3/q3map2/shaders.cpp
diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.cpp
similarity index 100%
rename from tools/quake3/q3map2/surface.c
rename to tools/quake3/q3map2/surface.cpp
diff --git a/tools/quake3/q3map2/surface_extra.c b/tools/quake3/q3map2/surface_extra.cpp
similarity index 100%
rename from tools/quake3/q3map2/surface_extra.c
rename to tools/quake3/q3map2/surface_extra.cpp
diff --git a/tools/quake3/q3map2/surface_foliage.c b/tools/quake3/q3map2/surface_foliage.cpp
similarity index 100%
rename from tools/quake3/q3map2/surface_foliage.c
rename to tools/quake3/q3map2/surface_foliage.cpp
diff --git a/tools/quake3/q3map2/surface_fur.c b/tools/quake3/q3map2/surface_fur.cpp
similarity index 100%
rename from tools/quake3/q3map2/surface_fur.c
rename to tools/quake3/q3map2/surface_fur.cpp
diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.cpp
similarity index 100%
rename from tools/quake3/q3map2/surface_meta.c
rename to tools/quake3/q3map2/surface_meta.cpp
diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.cpp
similarity index 100%
rename from tools/quake3/q3map2/tjunction.c
rename to tools/quake3/q3map2/tjunction.cpp
diff --git a/tools/quake3/q3map2/tree.c b/tools/quake3/q3map2/tree.cpp
similarity index 100%
rename from tools/quake3/q3map2/tree.c
rename to tools/quake3/q3map2/tree.cpp
diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.cpp
similarity index 100%
rename from tools/quake3/q3map2/vis.c
rename to tools/quake3/q3map2/vis.cpp
diff --git a/tools/quake3/q3map2/visflow.c b/tools/quake3/q3map2/visflow.cpp
similarity index 100%
rename from tools/quake3/q3map2/visflow.c
rename to tools/quake3/q3map2/visflow.cpp
diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.cpp
similarity index 100%
rename from tools/quake3/q3map2/writebsp.c
rename to tools/quake3/q3map2/writebsp.cpp