Merge "Revert "DO NOT MERGE: Remove two almost-unused include files."" into klp-dev