Fix include order (closes #8)