Changed the include handling a bit