Fixed include patterns in Type/Enum (closes #107)