Version freeze with getopt in place.
Updating header include paths so they don't pop up a directory.