More missing includes/forward declarations in header files