Move header to separate include