Reorganized Windows includes.