added windows support, removed unused #includes