Updated some headers for visual studio