Closes #3605 (closed) a third time.
3f1c0958 Add missing headers used for fuzzing
d64bbf27 Remove unused files in fuzz