Commit bbe268ebd26ed0ca3271bed2f399749549a7026d

nijtmans 2019-09-03T10:53:40

Fix deprecation messages and unnecessary includes