#6: fix includes for clever pointers