Move definition place for library headers to header files