Some initial Windows portability fixes in include files