Moved sourcering of xtra_includes to bashrc.