Keep fixing warnings and restructuring header files
before new release 2.3