Fixed declarations for windows