#379 Removed obsolete includes