Add includes for types used in object.cpp