Include exclude fixes; fixes #231