Fixed the include handler a bit