Fix automoc warnings about unnecessary moc includes

Authored by elvisangelaccio on Aug 13 2018, 8:10 AM.