Add missing includes for KF6

This fixes includes that were implicitly brought in with KF5.

(changed all KF5 references to KF6, fixed the build, then changed them back so we can apply this patch in master now)