2 fixes for "make dist"

1. Finish renaming the files that was started in 15352c6
1. Clean out EXTRA_DIST; put .h files in their corresponding _SOURCES macros