header include fix and simplification of server parameter #941