Prepare for header file move to common include directory. Update #3254.
This is a merge of the RTL project.