header files modified to new settings