removed unused includes; better win compatibility