Correct header files order and add new program options