Fix include order (closes #129)