VM: remove empty type-inl.h, fix other includes