Adding missing Windows c-files

Also needed to add new files to CMakeLists.
Merged a duplicate field for library includes in CMakeLists.