fix includes for traits and resource types

fixes #13