Added missing include files for the rebild_page feature