Fix hdr makefile location, fix obelisk_client refs in VC++, refactor.