move header files to 3.16.1