refactoring of include files