More compiling. All 'easy-to-compile' files now do.

Added the Rebellion license.

39 files changed, 595 insertions, 125 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7d5d285
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,5 @@
+The source code to Aliens Vs Predator is copyright (c) 1999-2000 Rebellion and
+is provided as is with no warranty for its suitability for use. You may not
+use this source code in full or in part for commercial purposes. Any use must
+include a clearly visible credit to Rebellion as the creators and owners, and
+reiteration of this license.
diff --git a/Makefile b/Makefile
index 49120a0..2c30074 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CC = gcc
 NASM = nasm
 
-CFLAGS = -g -Wall -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets
+CFLAGS = -g -Wall -pipe -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets
 CXXFLAGS = $(CFLAGS)
 LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a
 
@@ -11,21 +11,13 @@ LDLIBS += `sdl-config --libs`
 AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow
 
 ROOT = afont.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c
-AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cheatmodes.c comp_map.c comp_shp.c consolelog.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gameflow.c hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c
+AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gamecmds.cpp gameflow.c gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c
 SHAPES = cube.c
-SUPPORT =
-AVPWIN95 = avpchunk.cpp ffstdio.cpp hierplace.cpp kzsort.c langplat.c npcsetup.cpp objsetup.cpp pathchnk.cpp platsup.c pldghost.c projload.cpp strachnk.cpp system.c vision.c
-# usr_io.c
-FRONTEND = avp_envinfo.c avp_intro.cpp
-# avp_menudata.c
-GADGETS =
-WIN95 = animchnk.cpp animobs.cpp chnkload.cpp chnktype.cpp chunk.cpp chunkpal.cpp dummyobjectchunk.cpp enumchnk.cpp enumsch.cpp envchunk.cpp fail.c fragchnk.cpp gsprchnk.cpp hierchnk.cpp huffman.cpp iff.cpp iff_ilbm.cpp ilbm_ext.cpp io.c list_tem.cpp ltchunk.cpp media.cpp mishchnk.cpp obchunk.cpp oechunk.cpp our_mem.c plat_shp.c plspecfn.c shpchunk.cpp sndchunk.cpp sprchunk.cpp string.cpp toolchnk.cpp txioctrl.cpp wpchunk.cpp zsp.cpp
-# texio.c
-
-# AVP:
-# unused?: avpitems.cpp avppages.cpp
-# not needed: mp_launch.c
-# need fix: cconvars.cpp cdtrackselection.cpp davehook.cpp game_statistics.c gamecmds.cpp gamevars.cpp missions.cpp player.c psnd.c savegame.c scream.cpp
+SUPPORT = consbind.cpp consbtch.cpp coordstr.cpp daemon.cpp r2base.cpp r2pos666.cpp reflist.cpp refobj.cpp scstring.cpp strtab.cpp strutil.c trig666.cpp wrapstr.cpp
+AVPWIN95 = avpchunk.cpp cheat.c chtcodes.cpp d3d_hud.cpp endianio.c ffread.cpp ffstdio.cpp gflwplat.c hierplace.cpp iofocus.cpp jsndsup.cpp kzsort.c langplat.c modcmds.cpp npcsetup.cpp objsetup.cpp pathchnk.cpp platsup.c pldghost.c projload.cpp strachnk.cpp system.c vision.c
+FRONTEND = avp_envinfo.c avp_intro.cpp 
+GADGETS = ahudgadg.cpp conscmnd.cpp conssym.cpp consvar.cpp gadget.cpp hudgadg.cpp rootgadg.cpp t_ingadg.cpp teletype.cpp textexp.cpp textin.cpp trepgadg.cpp
+WIN95 = animchnk.cpp animobs.cpp bmpnames.cpp chnkload.cpp chnktype.cpp chunk.cpp chunkpal.cpp debuglog.cpp dummyobjectchunk.cpp enumchnk.cpp enumsch.cpp envchunk.cpp fail.c fragchnk.cpp gsprchnk.cpp hierchnk.cpp huffman.cpp iff.cpp iff_ilbm.cpp ilbm_ext.cpp io.c list_tem.cpp ltchunk.cpp media.cpp mishchnk.cpp obchunk.cpp oechunk.cpp our_mem.c plat_shp.c plspecfn.c shpchunk.cpp sndchunk.cpp sprchunk.cpp string.cpp toolchnk.cpp txioctrl.cpp wpchunk.cpp zsp.cpp
 
 # the following should really be autogenerated...
 
@@ -39,15 +31,19 @@ AVPSRC	=	$(call SRCNAMES,$(AVP),avp)
 AVPOBJ	=	$(call OBJNAMES,$(AVP),avp)
 SHAPESSRC =	$(call SRCNAMES,$(SHAPES),avp/shapes)
 SHAPESOBJ =	$(call OBJNAMES,$(SHAPES),avp/shapes)
+SUPPORTSRC =	$(call SRCNAMES,$(SUPPORT),avp/support)
+SUPPORTOBJ =	$(call OBJNAMES,$(SUPPORT),avp/support)
 AVPWIN95SRC =	$(call SRCNAMES,$(AVPWIN95),avp/win95)
 AVPWIN95OBJ =	$(call OBJNAMES,$(AVPWIN95),avp/win95)
 FRONTENDSRC =	$(call SRCNAMES,$(FRONTEND),avp/win95/frontend)
 FRONTENDOBJ =	$(call OBJNAMES,$(FRONTEND),avp/win95/frontend)
+GADGETSSRC =	$(call SRCNAMES,$(GADGETS),avp/win95/gadgets)
+GADGETSOBJ =	$(call OBJNAMES,$(GADGETS),avp/win95/gadgets)
 WIN95SRC =	$(call SRCNAMES,$(WIN95),win95)
 WIN95OBJ =	$(call OBJNAMES,$(WIN95),win95)
 
-SRC = $(ROOTSRC) $(AVPSRC) $(SHAPESSRC) $(AVPWIN95SRC) $(FRONTENDSRC) $(WIN95SRC)
-OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(AVPWIN95OBJ) $(FRONTENDOBJ) $(WIN95OBJ)
+SRC = $(ROOTSRC) $(AVPSRC) $(SHAPESSRC) $(SUPPORTSRC) $(AVPWIN95SRC) $(FRONTENDSRC) $(GADGETSSRC) $(WIN95SRC)
+OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(SUPPORTOBJ) $(AVPWIN95OBJ) $(FRONTENDOBJ) $(GADGETSOBJ) $(WIN95OBJ)
 
 .SUFFIXES: .asm
 
diff --git a/source2.txt b/source2.txt
new file mode 100644
index 0000000..4c8c5c6
--- /dev/null
+++ b/source2.txt
@@ -0,0 +1,491 @@
+afont.c
+frustum.c
+frustum.h
+kshape.c
+kshape.h
+map.c
+maths.c
+md5.c
+md5.h
+mem3dc.c
+mem3dcpp.cpp
+module.c
+morph.c
+mslhand.c
+mslhand.h
+object.c
+shpanim.c
+sphere.c
+sphere.h
+tables.c
+vdb.c
+version.c
+version.h
+
+avp/ai_sight.c
+avp/ai_sight.h
+avp/avpitems.hpp
+avp/avppages.hpp
+avp/avpview.c
+avp/avpview.h
+avp/bh_agun.c
+avp/bh_agun.h
+avp/bh_ais.c
+avp/bh_ais.h
+avp/bh_alien.c
+avp/bh_alien.h
+avp/bh_binsw.c
+avp/bh_binsw.h
+avp/bh_cable.c
+avp/bh_cable.h
+avp/bh_corpse.c
+avp/bh_corpse.h
+avp/bh_deathvol.c
+avp/bh_deathvol.h
+avp/bh_debri.c
+avp/bh_debri.h
+avp/bh_dummy.c
+avp/bh_dummy.h
+avp/bh_fan.c
+avp/bh_fan.h
+avp/bh_far.c
+avp/bh_far.h
+avp/bh_fhug.c
+avp/bh_fhug.h
+avp/bh_gener.c
+avp/bh_gener.h
+avp/bh_ldoor.c
+avp/bh_ldoor.h
+avp/bh_lift.c
+avp/bh_lift.h
+avp/bh_light.c
+avp/bh_light.h
+avp/bh_lnksw.c
+avp/bh_lnksw.h
+avp/bh_ltfx.c
+avp/bh_ltfx.h
+avp/bh_marin.c
+avp/bh_marin.h
+avp/bh_mission.c
+avp/bh_mission.h
+avp/bh_near.c
+avp/bh_near.h
+avp/bh_paq.h
+avp/bh_pargen.c
+avp/bh_pargen.h
+avp/bh_plachier.c
+avp/bh_plachier.h
+avp/bh_plift.c
+avp/bh_plift.h
+avp/bh_pred.c
+avp/bh_pred.h
+avp/bh_queen.c
+avp/bh_queen.h
+avp/bh_rubberduck.c
+avp/bh_rubberduck.h
+avp/bh_selfdest.c
+avp/bh_selfdest.h
+avp/bh_snds.c
+avp/bh_snds.h
+avp/bh_spcl.c
+avp/bh_spcl.h
+avp/bh_swdor.c
+avp/bh_swdor.h
+avp/bh_track.c
+avp/bh_track.h
+avp/bh_types.c
+avp/bh_types.h
+avp/bh_videoscreen.c
+avp/bh_videoscreen.h
+avp/bh_waypt.c
+avp/bh_waypt.h
+avp/bh_weap.c
+avp/bh_weap.h
+avp/bh_xeno.c
+avp/bh_xeno.h
+avp/bonusabilities.c
+avp/bonusabilities.h
+avp/cconvars.cpp
+avp/cdtrackselection.cpp
+avp/cdtrackselection.h
+avp/cheatmodes.c
+avp/comp_map.c
+avp/comp_shp.c
+avp/comp_shp.h
+avp/consolelog.cpp
+avp/consolelog.hpp
+avp/database.h
+avp/davehook.cpp
+avp/davehook.h
+avp/deaths.c
+avp/decal.c
+avp/decal.h
+avp/detaillevels.c
+avp/detaillevels.h
+avp/dynamics.c
+avp/dynamics.h
+avp/dynblock.c
+avp/dynblock.h
+avp/equates.h
+avp/equipmnt.c
+avp/equipmnt.h
+avp/equiputl.cpp
+avp/equiputl.hpp
+avp/extents.c
+avp/extents.h
+avp/game.c
+TODO avp/game_statistics.c
+avp/game_statistics.h
+avp/gamecmds.cpp
+avp/gamedef.h
+avp/gameflow.c
+avp/gameflow.h
+avp/gamevars.cpp
+avp/hmodel.c
+avp/hmodel.h
+avp/hud.c
+avp/hud_map.h
+avp/huddefs.h
+avp/inventry.c
+avp/inventry.h
+avp/langenum.h
+avp/language.c
+avp/language.h
+avp/lighting.c
+avp/lighting.h
+avp/load_shp.c
+avp/load_shp.h
+avp/los.c
+avp/los.h
+avp/ltfx_exp.h
+avp/macro.h
+avp/maps.c
+avp/mempool.c
+avp/mempool.h
+avp/menudefs.h
+avp/messagehistory.c
+avp/missions.cpp
+avp/missions.hpp
+avp/movement.c
+DELE avp/mp_launch.c
+avp/paintball.c
+avp/paintball.h
+avp/particle.c
+avp/particle.h
+avp/pfarlocs.c
+avp/pfarlocs.h
+avp/pheromon.c
+avp/pheromon.h
+TODO avp/player.c
+avp/pmove.c
+avp/pmove.h
+avp/projfont.h
+avp/projmenu.hpp
+avp/projtext.h
+TODO avp/psnd.c
+avp/psnd.h
+avp/psndproj.c
+avp/psndproj.h
+avp/pvisible.c
+avp/pvisible.h
+avp/savegame.c
+avp/savegame.h
+avp/scream.cpp
+avp/scream.h
+avp/secstats.c
+avp/sequnces.h
+avp/sfx.c
+avp/sfx.h
+avp/statpane.h
+avp/stratdef.c
+avp/stratdef.h
+avp/targeting.c
+avp/targeting.h
+avp/track.c
+avp/track.h
+avp/triggers.c
+avp/triggers.h
+avp/weapons.c
+avp/weapons.h
+
+avp/shapes/cube.c
+
+avp/support/command.hpp
+avp/support/consbind.cpp
+avp/support/consbind.hpp
+avp/support/consbtch.cpp
+avp/support/consbtch.hpp
+avp/support/coordstr.cpp
+avp/support/coordstr.hpp
+avp/support/daemon.cpp
+avp/support/daemon.h
+avp/support/dcontext.hpp
+avp/support/expvar.hpp
+TODO avp/support/indexfnt.cpp
+avp/support/indexfnt.hpp
+avp/support/ourbool.h
+avp/support/r2base.cpp
+avp/support/r2base.h
+avp/support/r2pos666.cpp
+avp/support/r2pos666.hpp
+avp/support/rebitems.hpp
+avp/support/rebmenus.hpp
+avp/support/reflist.cpp
+avp/support/reflist.hpp
+avp/support/refobj.cpp
+avp/support/refobj.hpp
+TODO avp/support/rentrntq.cpp
+avp/support/rentrntq.h
+avp/support/scstring.cpp
+avp/support/scstring.hpp
+avp/support/strtab.cpp
+avp/support/strtab.hpp
+avp/support/strutil.c
+avp/support/strutil.h
+TODO avp/support/tallfont.cpp
+avp/support/tallfont.hpp
+avp/support/trig666.cpp
+avp/support/trig666.hpp
+avp/support/wrapstr.cpp
+avp/support/wrapstr.hpp
+
+avp/win95/avpchunk.cpp
+avp/win95/avpchunk.hpp
+DELE avp/win95/avpreg.cpp
+avp/win95/avpreg.hpp
+avp/win95/bmp2.h
+avp/win95/cheat.c
+avp/win95/cheat.h
+avp/win95/chtcodes.cpp
+avp/win95/d3d_hud.cpp
+avp/win95/d3d_hud.h
+TODO avp/win95/d3d_render.cpp
+avp/win95/d3d_render.h
+avp/win95/datatype.h
+avp/win95/dbdefs.h
+TODO avp/win95/ddplat.cpp
+TODO avp/win95/directplay.c
+TODO avp/win95/dp_func.c
+avp/win95/dp_func.h
+avp/win95/dp_sprh.h
+TODO avp/win95/dplayext.c
+avp/win95/dplayext.h
+TODO avp/win95/dx_proj.cpp
+DELE avp/win95/eax.h
+avp/win95/endianio.c
+avp/win95/endianio.h
+avp/win95/ffread.cpp
+avp/win95/ffread.hpp
+avp/win95/ffstdio.cpp
+avp/win95/ffstdio.h
+avp/win95/font.h
+avp/win95/gameplat.h
+DELE avp/win95/gammacontrol.cpp
+avp/win95/gammacontrol.h
+avp/win95/gflwplat.c
+avp/win95/heap_tem.hpp
+avp/win95/hierplace.cpp
+avp/win95/hierplace.hpp
+avp/win95/hud_data.h
+avp/win95/hud_layout.h
+avp/win95/hudgfx.h
+TODO avp/win95/intro.cpp
+avp/win95/intro.hpp
+avp/win95/iofocus.cpp
+avp/win95/iofocus.h
+avp/win95/jsndsup.cpp
+avp/win95/jsndsup.h
+avp/win95/kzsort.c
+avp/win95/kzsort.h
+avp/win95/langplat.c
+avp/win95/menugfx.h
+avp/win95/modcmds.cpp
+avp/win95/modcmds.hpp
+DELE avp/win95/mousecentreing.cpp
+avp/win95/multmenu.h
+avp/win95/npcsetup.cpp
+avp/win95/npcsetup.h
+avp/win95/objsetup.cpp
+avp/win95/objsetup.hpp
+avp/win95/pathchnk.cpp
+avp/win95/pathchnk.hpp
+TODO avp/win95/pcmenus.cpp
+avp/win95/pcmenus.h
+avp/win95/platsup.c
+avp/win95/pldghost.c
+avp/win95/pldghost.h
+TODO avp/win95/pldnet.c
+avp/win95/pldnet.h
+TODO avp/win95/progress_bar.cpp
+avp/win95/progress_bar.h
+avp/win95/projload.cpp
+avp/win95/projload.hpp
+TODO avp/win95/psndplat.c
+avp/win95/psndplat.h
+TODO avp/win95/scrshot.cpp
+avp/win95/scrshot.hpp
+avp/win95/strachnk.cpp
+avp/win95/strachnk.hpp
+avp/win95/system.c
+avp/win95/system.h
+TODO avp/win95/usr_io.c
+avp/win95/usr_io.h
+avp/win95/vision.c
+avp/win95/vision.h
+avp/win95/vmanpset.h
+TODO avp/win95/win_proj.cpp
+TODO avp/win95/winmain.c
+
+avp/win95/frontend/avp_envinfo.c
+avp/win95/frontend/avp_envinfo.h
+avp/win95/frontend/avp_intro.cpp
+TODO avp/win95/frontend/avp_menudata.c
+TODO avp/win95/frontend/avp_menugfx.cpp
+avp/win95/frontend/avp_menugfx.hpp
+TODO avp/win95/frontend/avp_menus.c
+avp/win95/frontend/avp_menus.h
+TODO avp/win95/frontend/avp_mp_config.cpp
+avp/win95/frontend/avp_mp_config.h
+TODO avp/win95/frontend/avp_userprofile.cpp
+avp/win95/frontend/avp_userprofile.h
+
+avp/win95/gadgets/ahudgadg.cpp
+avp/win95/gadgets/ahudgadg.hpp
+avp/win95/gadgets/conscmnd.cpp
+avp/win95/gadgets/conscmnd.hpp
+avp/win95/gadgets/conssym.cpp
+avp/win95/gadgets/conssym.hpp
+avp/win95/gadgets/consvar.cpp
+avp/win95/gadgets/consvar.hpp
+avp/win95/gadgets/gadget.cpp
+avp/win95/gadgets/gadget.h
+avp/win95/gadgets/hudgadg.cpp
+avp/win95/gadgets/hudgadg.hpp
+avp/win95/gadgets/rootgadg.cpp
+avp/win95/gadgets/rootgadg.hpp
+avp/win95/gadgets/t_ingadg.cpp
+avp/win95/gadgets/t_ingadg.hpp
+avp/win95/gadgets/teletype.cpp
+avp/win95/gadgets/teletype.hpp
+avp/win95/gadgets/textexp.cpp
+avp/win95/gadgets/textexp.hpp
+avp/win95/gadgets/textin.cpp
+avp/win95/gadgets/textin.hpp
+avp/win95/gadgets/trepgadg.cpp
+avp/win95/gadgets/trepgadg.hpp
+
+DELE win95/advwin32.h
+TODO win95/alt_tab.cpp
+win95/alt_tab.h
+win95/animchnk.cpp
+win95/animchnk.hpp
+win95/animobs.cpp
+win95/animobs.hpp
+win95/aw.h
+TODO win95/awbmpld.cpp
+TODO win95/awiffld.cpp
+TODO win95/awpnmld.cpp
+TODO win95/awtexld.cpp
+win95/awtexld.h
+win95/awtexld.hpp
+win95/bmpnames.cpp
+win95/bmpnames.hpp
+TODO win95/cd_player.c
+win95/cd_player.h
+win95/chnkload.cpp
+win95/chnkload.h
+win95/chnkload.hpp
+TODO win95/chnktexi.cpp
+win95/chnktexi.h
+win95/chnktype.cpp
+win95/chnktype.hpp
+win95/chunk.cpp
+win95/chunk.hpp
+win95/chunkpal.cpp
+win95/chunkpal.hpp
+TODO win95/d3_func.cpp
+win95/d3_func.h
+win95/d3dmacs.h
+TODO win95/db.c
+win95/db.h
+TODO win95/dd_func.cpp
+win95/debuglog.cpp
+win95/debuglog.h
+win95/debuglog.hpp
+TODO win95/di_func.cpp
+win95/dummyobjectchunk.cpp
+win95/dummyobjectchunk.hpp
+TODO win95/dxlog.c
+win95/dxlog.h
+win95/enumchnk.cpp
+win95/enumchnk.hpp
+win95/enumsch.cpp
+win95/enumsch.hpp
+win95/envchunk.cpp
+win95/envchunk.hpp
+win95/fail.c
+win95/fail.h
+win95/fragchnk.cpp
+win95/fragchnk.hpp
+win95/gsprchnk.cpp
+win95/gsprchnk.hpp
+win95/hash_tem.hpp
+win95/hierchnk.cpp
+win95/hierchnk.hpp
+win95/huffman.cpp
+win95/huffman.hpp
+win95/iff.cpp
+win95/iff.hpp
+win95/iff_ilbm.cpp
+win95/iff_ilbm.hpp
+win95/ilbm_ext.cpp
+win95/ilbm_ext.hpp
+win95/inline.h
+win95/io.c
+win95/list_tem.cpp
+win95/list_tem.hpp
+win95/ltchunk.cpp
+win95/ltchunk.hpp
+win95/media.cpp
+win95/media.hpp
+win95/mishchnk.cpp
+win95/mishchnk.hpp
+win95/mmx_math.h
+win95/obchunk.cpp
+win95/obchunk.hpp
+win95/objedit.h
+win95/oechunk.cpp
+win95/oechunk.h
+win95/our_mem.c
+win95/ourasert.h
+win95/pentime.h
+win95/plat_shp.c
+win95/plat_shp.h
+win95/platform.h
+win95/plspecfn.c
+win95/showcmds.h
+win95/shpanim.h
+win95/shpchunk.cpp
+win95/shpchunk.hpp
+win95/smsopt.h
+win95/sndchunk.cpp
+win95/sndchunk.hpp
+win95/sprchunk.cpp
+win95/sprchunk.hpp
+win95/string.cpp
+win95/string.hpp
+TODO win95/texio.c
+win95/toolchnk.cpp
+win95/toolchnk.hpp
+win95/txioctrl.cpp
+win95/txioctrl.h
+TODO win95/videomodes.cpp
+win95/videomodes.h
+DELE win95/vramtime.c
+win95/vramtime.h
+TODO win95/win_func.cpp
+win95/wpchunk.cpp
+win95/wpchunk.hpp
+win95/zmouse.h
+win95/zsp.cpp
+win95/zsp.hpp
diff --git a/src/avp/cdtrackselection.cpp b/src/avp/cdtrackselection.cpp
index 826c041..42f5b7e 100644
--- a/src/avp/cdtrackselection.cpp
+++ b/src/avp/cdtrackselection.cpp
@@ -9,7 +9,6 @@ extern "C"
 #include "gamedef.h"
 
 #include "avp_envinfo.h"
-#include "dxlog.h"
 };
 
 #include "list_tem.hpp"
@@ -32,7 +31,7 @@ void EmptyCDTrackList()
 		while(LevelCDTracks[i].size()) LevelCDTracks[i].delete_first_entry();
 	}
 
-	for(i=0;i<3;i++)
+	for(int i=0;i<3;i++)
 	{
 		while(MultiplayerCDTracks[i].size()) MultiplayerCDTracks[i].delete_first_entry();
 	}
@@ -90,7 +89,7 @@ static void ExtractTracksForLevel(char* & buffer,List<int> & track_list)
 		}
 		else
 		{
-			*buffer++;
+			buffer++;
 		}
 	}
 
@@ -140,7 +139,7 @@ void LoadCDTrackList()
 	}
 	
 	//now the level tracks
-	for(i=0 ;i<AVP_ENVIRONMENT_END_OF_LIST;i++)
+	for(int i=0 ;i<AVP_ENVIRONMENT_END_OF_LIST;i++)
 	{
 		ExtractTracksForLevel(bufferptr,LevelCDTracks[i]);
 	}
diff --git a/src/avp/gamecmds.cpp b/src/avp/gamecmds.cpp
index c84b538..53b4b96 100644
--- a/src/avp/gamecmds.cpp
+++ b/src/avp/gamecmds.cpp
@@ -47,12 +47,12 @@ int DebuggingCommandsActive=0;
 extern void GimmeCharge(void);
 
 // just change these to prototypes etc.
-extern void QuickLoad()
+extern void QuickLoad(void)
 {
 	//set the load request
 	LoadGameRequest = 0; //(that's slot 0 - not false)
 }
-extern void QuickSave()
+extern void QuickSave(void)
 {
 	//set the save request
 	SaveGameRequest = 0; //(that's slot 0 - not false)
@@ -73,7 +73,7 @@ void ConsoleCommandSave(int slot)
 		SaveGameRequest = slot-1;
 	}
 }
-extern void DisplaySavesLeft();
+extern void DisplaySavesLeft(void);
 
 
 
@@ -83,7 +83,7 @@ extern void ChangeNetGameType_Individual();
 extern void ChangeNetGameType_Coop();
 extern void ChangeNetGameType_LastManStanding();
 extern void ChangeNetGameType_PredatorTag();
-extern void ShowNearestPlayersName();
+extern void ShowNearestPlayersName(void);
 extern void ScreenShot(void);
 extern void CastAlienBot(void);
 extern void CastMarineBot(int weapon);
@@ -209,7 +209,7 @@ static void ChangeToSpecialist_Pistols()
 	ChangeToMarine();
 }
 
-extern void ShowMultiplayerScores()
+extern void ShowMultiplayerScores(void)
 {
 	ShowMultiplayerScoreTimer=5*ONE_FIXED;
 }
@@ -810,8 +810,4 @@ void CreateGameSpecificConsoleCommands(void)
 
 }	
 
-
-
-						
-
-} // extern "C"
\ No newline at end of file
+} // extern "C"
diff --git a/src/avp/support/consbind.cpp b/src/avp/support/consbind.cpp
index b621bac..97e6de6 100644
--- a/src/avp/support/consbind.cpp
+++ b/src/avp/support/consbind.cpp
@@ -15,6 +15,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "consbind.hpp"
 
diff --git a/src/avp/support/consbtch.cpp b/src/avp/support/consbtch.cpp
index 0f137de..859220c 100644
--- a/src/avp/support/consbtch.cpp
+++ b/src/avp/support/consbtch.cpp
@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 
 	#include "consbtch.hpp"
diff --git a/src/avp/support/coordstr.cpp b/src/avp/support/coordstr.cpp
index 92d983f..909f416 100644
--- a/src/avp/support/coordstr.cpp
+++ b/src/avp/support/coordstr.cpp
@@ -723,8 +723,3 @@ void AcyclicFixedSpeedHoming :: SetSpeed_FixP
 }
 
 #endif
-
-
-
-
-
diff --git a/src/avp/support/daemon.cpp b/src/avp/support/daemon.cpp
index 3cf38ec..059ba57 100644
--- a/src/avp/support/daemon.cpp
+++ b/src/avp/support/daemon.cpp
@@ -372,11 +372,13 @@ void DAEMON_Init(void)
 {
 }
 
+extern "C" {
 #if UseRealFrameTime
-extern "C" extern int RealFrameTime;
+extern int RealFrameTime;
 #else
-extern "C" extern int NormalFrameTime;
+extern int NormalFrameTime;
 #endif
+}
 
 void DAEMON_Maintain(void)
 {
diff --git a/src/avp/support/daemon.h b/src/avp/support/daemon.h
index 7079bbf..64c8071 100644
--- a/src/avp/support/daemon.h
+++ b/src/avp/support/daemon.h
@@ -66,14 +66,14 @@
 				Daemon* p666_New,
 				void* pUser_New
 			);
-			virtual ~CallbackHook();
 			
 		// ought to be private:
 			CallbackHook* pNxtHook;
 			CallbackHook* pPrvHook;
 			Daemon* p666_Val; 
 			void* pUser_Val;
-
+			
+			virtual ~CallbackHook();
 			
 	};
 	#endif // SupportCallbackHooks
@@ -87,8 +87,6 @@
 				OurBool fActive
 			);
 
-			virtual ~Daemon();
-
 		// Per object stuff:
 		public:
 			void Start(void);
@@ -132,6 +130,8 @@
 		public: // but probably ought to be private:
 			CallbackHook* pFirstHook;
 		#endif
+		public:
+			virtual ~Daemon();
 	};
 	#endif // ifdef __cplusplus
 
diff --git a/src/avp/support/indexfnt.hpp b/src/avp/support/indexfnt.hpp
index 9521966..1e942d5 100644
--- a/src/avp/support/indexfnt.hpp
+++ b/src/avp/support/indexfnt.hpp
@@ -409,7 +409,7 @@
 			ProjChar nextProjCh
 		) const = 0;
 		
-		virtual LPDIRECTDRAWSURFACE GetImagePtr(void) const = 0;
+//		virtual LPDIRECTDRAWSURFACE GetImagePtr(void) const = 0;
 
 	protected:
 		IndexedFont_Kerned
diff --git a/src/avp/support/r2base.cpp b/src/avp/support/r2base.cpp
index 23da40c..5ce7839 100644
--- a/src/avp/support/r2base.cpp
+++ b/src/avp/support/r2base.cpp
@@ -249,7 +249,9 @@ extern void R2BASE_ScreenModeChange_Setup(void)
 	}
 }
 
-extern "C" extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock;
+extern "C" {
+	extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock;
+};
 
 extern void R2BASE_ScreenModeChange_Cleanup(void)
 {
diff --git a/src/avp/support/rebmenus.hpp b/src/avp/support/rebmenus.hpp
index 3b18509..864719d 100644
--- a/src/avp/support/rebmenus.hpp
+++ b/src/avp/support/rebmenus.hpp
@@ -572,9 +572,7 @@ namespace RebMenus
 			{
 			}
 
-			~SelectionList();
-
-			AddSelection
+			void AddSelection
 			(
 				Selectable Sel_ToAdd
 			)
@@ -587,6 +585,8 @@ namespace RebMenus
 		private:
 			int NumInList;
 			Selectable theSel_A[MAX_IN_LIST];
+		public:
+			~SelectionList();
 		};
 	};
 
diff --git a/src/avp/support/refobj.cpp b/src/avp/support/refobj.cpp
index e1c4181..df7d45f 100644
--- a/src/avp/support/refobj.cpp
+++ b/src/avp/support/refobj.cpp
@@ -336,4 +336,4 @@ RefCountObject_TrackData :: Globals :: ~Globals()
 }
 #endif
 
-#endif // TrackReferenceCounted
\ No newline at end of file
+#endif // TrackReferenceCounted
diff --git a/src/avp/support/strutil.c b/src/avp/support/strutil.c
index 8175a2e..faa3b7a 100644
--- a/src/avp/support/strutil.c
+++ b/src/avp/support/strutil.c
@@ -7,6 +7,7 @@
 	rather than chars
 
 */
+#include <ctype.h>
 
 #include "3dc.h"
 
diff --git a/src/avp/support/tallfont.hpp b/src/avp/support/tallfont.hpp
index d8008a8..317e94f 100644
--- a/src/avp/support/tallfont.hpp
+++ b/src/avp/support/tallfont.hpp
@@ -95,6 +95,7 @@
 		int SpaceWidth_Val;
 
 		LPDIRECTDRAWSURFACE image_ptr;
+
 		AW_BACKUPTEXTUREHANDLE hBackup;
 
 		r2size R2Size_OverallImage;
diff --git a/src/avp/win95/d3d_hud.cpp b/src/avp/win95/d3d_hud.cpp
index 2c7fb7b..0987812 100644
--- a/src/avp/win95/d3d_hud.cpp
+++ b/src/avp/win95/d3d_hud.cpp
@@ -27,7 +27,7 @@ extern "C" {
 #include "chnktexi.h"
 
 
-#include "HUD_layout.h"
+#include "hud_layout.h"
 #include "language.h"
 
 
diff --git a/src/avp/win95/ffread.cpp b/src/avp/win95/ffread.cpp
index 98f1d09..6d5ef90 100644
--- a/src/avp/win95/ffread.cpp
+++ b/src/avp/win95/ffread.cpp
@@ -1,6 +1,7 @@
 #include <string.h>
-#include <malloc.h>
-#include <windows.h>
+#include <stdlib.h>
+#include <ctype.h>
+//#include <windows.h>
 #include <stdio.h>
 
 #include "ffread.hpp"
@@ -27,6 +28,7 @@ void ReportError(char const * mesg1, char const * mesg2)
 	}
 	else
 	{
+#if 0
 		char * lpMsgBuf;
 
 		err = GetLastError();
@@ -49,6 +51,10 @@ void ReportError(char const * mesg1, char const * mesg2)
 		
 		// Free the buffer.
 		LocalFree( lpMsgBuf );
+#endif
+		mesg = new char [strlen(mesg1)+32];
+		strcpy(mesg, mesg1);
+		strcat(mesg, "\n\nReportError: I have no clue!\n");
 	}
 	
 	// Display the string.
diff --git a/src/avp/win95/frontend/avp_menus.c b/src/avp/win95/frontend/avp_menus.c
index 50e9754..a6cd3ab 100644
--- a/src/avp/win95/frontend/avp_menus.c
+++ b/src/avp/win95/frontend/avp_menus.c
@@ -6,11 +6,11 @@
 #include "bh_types.h"
 #include "pldnet.h"
 
-#include "AvP_Menus.h"
-#include "AvP_EnvInfo.h"
+#include "avp_menus.h"
+#include "avp_envinfo.h"
 
-#include "hud_Layout.h"
-#include "AvP_UserProfile.h"
+#include "hud_layout.h"
+#include "avp_userprofile.h"
 #include "huffman.hpp"
 
 #include "hudgfx.h"
@@ -19,9 +19,8 @@
 #include "ourasert.h"
 #include "iofocus.h"
 #include <time.h>
-#include "winnls.h"
-#include "GammaControl.h"
-#include "AvP_MP_Config.h"
+#include "gammacontrol.h"
+#include "avp_mp_config.h"
 #include "psnd.h"
 #include "savegame.h"
 
diff --git a/src/avp/win95/frontend/avp_mp_config.cpp b/src/avp/win95/frontend/avp_mp_config.cpp
index bf3e5a0..aa5b338 100644
--- a/src/avp/win95/frontend/avp_mp_config.cpp
+++ b/src/avp/win95/frontend/avp_mp_config.cpp
@@ -6,10 +6,10 @@
 #include "bh_types.h"
 #include "pldnet.h"
 
-#include "AvP_MP_Config.h"
-#include "AvP_Envinfo.h"
+#include "avp_mp_config.h"
+#include "avp_envinfo.h"
 
-#include "AvP_Menus.h"
+#include "avp_menus.h"
 #include "list_tem.hpp"
 
 #define UseLocalAssert Yes
diff --git a/src/avp/win95/frontend/avp_userprofile.cpp b/src/avp/win95/frontend/avp_userprofile.cpp
index 3ff88fb..ed5babe 100644
--- a/src/avp/win95/frontend/avp_userprofile.cpp
+++ b/src/avp/win95/frontend/avp_userprofile.cpp
@@ -7,7 +7,7 @@ extern "C"
 #include "module.h"
 #include "stratdef.h"
 
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 #include "language.h"
 #include "GammaControl.h"
 #include "psnd.h"
diff --git a/src/avp/win95/gadgets/conscmnd.hpp b/src/avp/win95/gadgets/conscmnd.hpp
index c52a3ad..517d8f9 100644
--- a/src/avp/win95/gadgets/conscmnd.hpp
+++ b/src/avp/win95/gadgets/conscmnd.hpp
@@ -76,7 +76,7 @@
 
 		virtual void Execute( ProjChar* pProjCh_In ) = 0;
 
-		virtual ~ConsoleCommand();
+		
 
 		void Display(void) const;
 
@@ -96,7 +96,8 @@
 		SCString* pSCString_Description;
 
 		static List <ConsoleCommand*> List_pConsoleCommand;
-
+	public:
+		virtual ~ConsoleCommand();
 	};
 	
 
diff --git a/src/avp/win95/gadgets/conssym.hpp b/src/avp/win95/gadgets/conssym.hpp
index 2c03cd6..f9d7664 100644
--- a/src/avp/win95/gadgets/conssym.hpp
+++ b/src/avp/win95/gadgets/conssym.hpp
@@ -51,11 +51,10 @@
 		(
 			ProjChar* pProjCh_ToUse
 		);
-		virtual ~ConsoleSymbol();
+		
 
 		SCString* pSCString_Symbol;
 
-
 	public:
 		SCString* GetpSCString(void) const
 		{
@@ -66,6 +65,9 @@
 	private:
 		
 		static List <ConsoleSymbol *> List_pConsoleSym;
+
+	public:
+		virtual ~ConsoleSymbol();
 	};	// suggested naming: "ConsoleSym"
 
 /* Exported globals *****************************************************/
diff --git a/src/avp/win95/gadgets/consvar.hpp b/src/avp/win95/gadgets/consvar.hpp
index 0b42eec..025cdae 100644
--- a/src/avp/win95/gadgets/consvar.hpp
+++ b/src/avp/win95/gadgets/consvar.hpp
@@ -62,7 +62,7 @@
 			OurBool Cheat = FALSE
 		);
 
-		~ConsoleVariable();
+		
 
 		virtual int GetValue(void) const = 0;
 		virtual void SetValue(int Val_New) = 0;
@@ -120,6 +120,8 @@
 		SCString* pSCString_Description;
 
 		static List <ConsoleVariable*> List_pConsoleVar;
+	public:
+		~ConsoleVariable();
 	};	// suggested naming: "ConsoleVar"
 
 /* Exported globals *****************************************************/
diff --git a/src/avp/win95/gadgets/hudgadg.hpp b/src/avp/win95/gadgets/hudgadg.hpp
index 38e0c52..6f5cf28 100644
--- a/src/avp/win95/gadgets/hudgadg.hpp
+++ b/src/avp/win95/gadgets/hudgadg.hpp
@@ -99,7 +99,7 @@
 
 
 		// Destructor:
-		virtual ~HUDGadget();
+		
 
 	protected:
 		// Constructor is protected since an abstract class
@@ -118,7 +118,9 @@
 	protected:
 		SCString* pSCString_Current;
 	#endif
-
+	
+	public:
+		virtual ~HUDGadget();
 	};
 
 	// Inline methods:
diff --git a/src/avp/win95/gadgets/rootgadg.hpp b/src/avp/win95/gadgets/rootgadg.hpp
index 573473e..99238ac 100644
--- a/src/avp/win95/gadgets/rootgadg.hpp
+++ b/src/avp/win95/gadgets/rootgadg.hpp
@@ -49,14 +49,15 @@
 
 	private:
 		RootGadget();
-		~RootGadget();
+		
 
 	private:
 		static RootGadget* pSingleton;
 
 		HUDGadget* pHUDGadg;
 			// allowed to be NULL if no head-up-display e.g. when not in a game
-
+	private:
+		~RootGadget();
 	};
 	
 	// Inline methods:
diff --git a/src/avp/win95/gadgets/textexp.hpp b/src/avp/win95/gadgets/textexp.hpp
index fc08ccc..fa7e7d0 100644
--- a/src/avp/win95/gadgets/textexp.hpp
+++ b/src/avp/win95/gadgets/textexp.hpp
@@ -34,7 +34,7 @@
 	class TextExpansion
 	{
 	public:
-		~TextExpansion();
+		
 
 		void Display(void);
 			// sends info on this expansion to the screen
@@ -81,6 +81,8 @@
 
 		static List<TextExpansion*> List_pTextExp;
 
+	public:
+		~TextExpansion();
 	};  // suggested naming: TextExp
 
 /* Exported globals *****************************************************/
diff --git a/src/avp/win95/gadgets/textin.cpp b/src/avp/win95/gadgets/textin.cpp
index a5ba230..4c8eae6 100644
--- a/src/avp/win95/gadgets/textin.cpp
+++ b/src/avp/win95/gadgets/textin.cpp
@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "textin.hpp"
 
diff --git a/src/avp/win95/gadgets/trepgadg.cpp b/src/avp/win95/gadgets/trepgadg.cpp
index 0f513f7..b4c17ff 100644
--- a/src/avp/win95/gadgets/trepgadg.cpp
+++ b/src/avp/win95/gadgets/trepgadg.cpp
@@ -23,7 +23,7 @@
 
 #include "iofocus.h"
 
-#include "ConsoleLog.hpp"
+#include "consolelog.hpp"
 
 	#include "rootgadg.hpp"
 	#include "hudgadg.hpp"
diff --git a/src/avp/win95/gflwplat.c b/src/avp/win95/gflwplat.c
index 309686b..b6598f1 100644
--- a/src/avp/win95/gflwplat.c
+++ b/src/avp/win95/gflwplat.c
@@ -153,7 +153,7 @@ void ShowMissionMessage ()
 
 // this will only print one string from the top of the screen
 
-static int CharWidthInPixels(char Ch)
+static int CharWidthInPixels(unsigned char Ch)
 {
 	if 
 	(
diff --git a/src/avp/win95/hudgfx.h b/src/avp/win95/hudgfx.h
index e0f3882..38b5e52 100644
--- a/src/avp/win95/hudgfx.h
+++ b/src/avp/win95/hudgfx.h
@@ -66,7 +66,8 @@ enum HUD_RES_ID
 /* description of a single DD surface used for HUD gfx */
 struct DDGraphicTag 
 {
-	LPDIRECTDRAWSURFACE    LPDDS;
+//	LPDIRECTDRAWSURFACE    LPDDS;
+
 	AW_BACKUPTEXTUREHANDLE hBackup; // JH 12/2/98 changed for new gfx loading system
     RECT				   SrcRect;
 };
@@ -117,7 +118,7 @@ extern void RestoreAllDDGraphics(void);
 /*KJL****************************************************************************************
 * 										 E X T E R N S 	  									*
 ****************************************************************************************KJL*/
-extern LPDIRECTDRAW lpDD;
-extern LPDIRECTDRAWSURFACE lpDDSBack;
+//extern LPDIRECTDRAW lpDD;
+//extern LPDIRECTDRAWSURFACE lpDDSBack;
 
 #endif
\ No newline at end of file
diff --git a/src/avp/win95/jsndsup.cpp b/src/avp/win95/jsndsup.cpp
index 1268818..ced63a6 100644
--- a/src/avp/win95/jsndsup.cpp
+++ b/src/avp/win95/jsndsup.cpp
@@ -11,7 +11,6 @@
 
 extern "C"
 {
-	extern LPDIRECTSOUND DSObject; 
 	extern int SoundSwitchedOn;
 	// Pat sets this up
 };
diff --git a/src/avp/win95/modcmds.cpp b/src/avp/win95/modcmds.cpp
index 2e29d09..7d67085 100644
--- a/src/avp/win95/modcmds.cpp
+++ b/src/avp/win95/modcmds.cpp
@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "gadget.h"
 
@@ -131,8 +133,7 @@ void ModuleCommands :: ListModules(void)
 							(
 								Msg,
 								"MODULE:%3i NULL NAME",
-								Index,
-								pModule -> name
+								Index
 							);							
 						}
 						
diff --git a/src/fixer.h b/src/fixer.h
index faba91d..173b82a 100644
--- a/src/fixer.h
+++ b/src/fixer.h
@@ -52,6 +52,8 @@ typedef unsigned short WORD;
 typedef unsigned int DWORD;
 typedef long LONG;
 typedef char TCHAR;
+typedef DWORD * LPDWORD;
+typedef char * LPTSTR;
 
 #define TEXT(x) x
 
@@ -90,11 +92,12 @@ typedef struct SYSTEMTIME
 #define FILE_CURRENT		6
 #define FILE_BEGIN		7
 #define FILE_END		8
+#define FILE_SHARE_READ		9
 
 HANDLE CreateFile(const char *file, int write, int x, int y, int flags, int flags2, int z);
 HANDLE CreateFileA(const char *file, int write, int x, int y, int flags, int flags2, int z);
 int WriteFile(HANDLE file, const void *data, int len, unsigned long *byteswritten, int x);
-int ReadFile(HANDLE file, void *data, int len, unsigned long *bytesread, int x);
+int ReadFile(HANDLE file, void *data, int len, /* unsigned long */ void *bytesread, int x);
 int GetFileSize(HANDLE file, int x);
 int CloseHandle(HANDLE file);
 int DeleteFile(const char *file);
diff --git a/src/win95/awbmpld.cpp b/src/win95/awbmpld.cpp
index 375e1d7..e47b156 100644
--- a/src/win95/awbmpld.cpp
+++ b/src/win95/awbmpld.cpp
@@ -1,4 +1,3 @@
-#include "advwin32.h"
 #ifndef DB_LEVEL
 #define DB_LEVEL 4
 #endif
diff --git a/src/win95/bmpnames.cpp b/src/win95/bmpnames.cpp
index 1918033..92cb05a 100644
--- a/src/win95/bmpnames.cpp
+++ b/src/win95/bmpnames.cpp
@@ -958,7 +958,3 @@ size_t Bitmap_MD5_Chunk::size_chunk()
 		+(shapename ? strlen(shapename) : 0)
 		+3 +3&~3;
 }
-
-
-
-
diff --git a/src/win95/d3_func.cpp b/src/win95/d3_func.cpp
index 923e7f2..35de5bd 100644
--- a/src/win95/d3_func.cpp
+++ b/src/win95/d3_func.cpp
@@ -907,43 +907,7 @@ void FlushZB(void)
 
 }
 
-
-
 // For extern "C"
 
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
  
\ No newline at end of file
diff --git a/src/win95/debuglog.cpp b/src/win95/debuglog.cpp
index 2e76b9f..9b64a76 100644
--- a/src/win95/debuglog.cpp
+++ b/src/win95/debuglog.cpp
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <stdlib.h>
-#include <windows.h>
 #include "debuglog.hpp"
 
 LogFile::LogFile(char const * const _fname) : fname(0) , ever_written(0)
@@ -37,7 +36,7 @@ LogFile::~LogFile()
 		FILE * fp = fopen(fname,"a");
 		for (int attempt=0; !fp && attempt<10; ++attempt)
 		{
-			Sleep(100);
+			/* Sleep(100); */
 			fp = fopen(fname,"a");
 		}
 		if (fp)
diff --git a/src/win95/texio.c b/src/win95/texio.c
index 0ffb1ae..6cea7d8 100644
--- a/src/win95/texio.c
+++ b/src/win95/texio.c
@@ -17,7 +17,6 @@
 #else
 
 #include <stdio.h>
-#include <conio.h>
 #include <sys/stat.h>
 
 #include "system.h"