remove obsolete includes, one which broke the travis build