Fix missing decl_spec, changes for building
Merge branch 'windows'