Try to patch some of the windows concol.h

Compiles and runs but doesn't work yet.
Move headers where they are needed

--CAR