Simplify include paths
Fix typo in math.h
Let's see whether travis can deal with this.