Fixed includes for categories