readded the rest of the missing include files