Revert broken build changes

This reverts commit a5227b0d4abde8efe5981c56fe5f9f49c775c701. The header
files were not being generated properly after a "make clobber".