Improve header hiearchy on platform plugins