FIXME
Clean up include statements and remove duplicate rules