Correctness fixes.

ie. Get rid of more protected goto jumps.
also fix some include paths for *nix systems.