Fixed headers for Windows