Cleanup and code consolidation

moved all declares and related constants/structures into the Win32
module