Proper win32/x11 build targets and dependencies
Changed .h headers to proper .hpp headers