Update travis tests.
Fix header problems.