Added missing headers to fix 'make dist'.
Merge pull request #80 from bmahler/master

Added missing headers to fix 'make dist'.