added includes to fix test-headers failure