Remove unused includes

Authored by mlaurent on Aug 4 2019, 9:04 AM.