Removed windows.h and tchar.h and tried to clean up dependencies a bit.