*/
// EXTERNAL INCLUDES
-#include <dali/devel-api/common/conditional-wait.h>
+#include <dali/devel-api/threading/conditional-wait.h>
// INTERNAL INCLUDES
#include <integration-api/thread-synchronization-interface.h>
#include <base/interfaces/performance-interface.h>
#include <trigger-event-interface.h>
#include <base/frame-time.h>
-#include <base/render-thread.h>
+#include <base/render-request.h>
namespace Dali
{