Header files unification