-#include <dali/public-api/adaptor-framework/accessibility-action-handler.h>
-#include <dali/public-api/adaptor-framework/accessibility-gesture-handler.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>