Yes you are absolutely correct, and that is what I did for a while, but then I realised that I need those header in my main project so that when I decide to take the entire project it will still compile without having foreign includes.
I don't know I thought there would be a nice way to do so..

Thanks.