Remove --with-readers
Add header files to sources list