Add x86 include + Makefile fixes.