The original headerbuttons.c is for now kept as headerbuttons.txt The included .h files were updated to only include needed ones in each file. Makefile.am (for the autotools build) was updated. Didn't test with original makefiles. Other build systems will of course need to be updated.