Fix include order (closes #28)