Remove duplicate definitions

* cbfff7d5f57ec281c8f467504b060e4c96f0344a introduced
  some duplicate solution items. This builds fine on
  Windows, but not on Linux.