Cleared up handling of inclusions