Fixed the Travis build 'redefinition of typedef' warnings (= errors).

Now uses `#include` instead of duplicate typedefs. This should fix the travis build errors.