Clean up a few deprecated headers, and make dependencies more explicit
Summary: Side effect from trying to figure out what needs to be done for T11568.
Reviewers: plasma-devel, sitter
Reviewed By: sitter
Tags: Plasma
Differential Revision: https://phabricator.kde.org/D23821