Be more consistant with paths in #includes. Eventually, eliminate a bunch of -I...