Header files refactor