Added missing headers to fix 'make dist'.