non domain_id static references (::) to methods in includes removed