Add headers missing from Makefile rules to pass 'make distcheck'. These were included in the tree but were not added with those commits.