-# Install headers
-topleveldir = $(devincludepath)/dali-toolkit
-toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
-
-publicapidir = $(devincludepath)/dali-toolkit/public-api
-publicapicontrolsdir = $(publicapidir)/controls
-publicapialignmentdir = $(publicapidir)/controls/alignment
-publicapibloomviewdir = $(publicapidir)/controls/bloom-view
-publicapibuttonsdir = $(publicapidir)/controls/buttons
-publicapiclusterdir = $(publicapidir)/controls/cluster
-publicapidefaultcontrolsdir = $(publicapidir)/controls/default-controls
-publicapieffectsviewdir = $(publicapidir)/controls/effects-view
-publicapigaussianblurviewdir = $(publicapidir)/controls/gaussian-blur-view
-publicapiimageviewdir = $(publicapidir)/controls/image-view
-publicapiitemviewdir = $(publicapidir)/controls/scrollable/item-view
-publicapimagnifierdir = $(publicapidir)/controls/magnifier
-publicapipopupdir = $(publicapidir)/controls/popup
-publicapipageturnviewdir = $(publicapidir)/controls/page-turn-view
-publicapiscrollbardir = $(publicapidir)/controls/scroll-bar
-publicapiscrollcomponentdir = $(publicapidir)/controls/scroll-component
-publicapiscrollabledir = $(publicapidir)/controls/scrollable
-publicapiscrollviewdir = $(publicapidir)/controls/scrollable/scroll-view
-publicapisliderdir = $(publicapidir)/controls/slider
-publicapitableviewdir = $(publicapidir)/controls/table-view
-publicapitextviewdir = $(publicapidir)/controls/text-view
-publicapitextinputdir = $(publicapidir)/controls/text-input
-publicapitoolbardir = $(publicapidir)/controls/tool-bar
-publicapiselectorsdir = $(publicapidir)/controls/selectors
-publicapishadowviewdir = $(publicapidir)/controls/shadow-view
-publicapibubbleemitterdir = $(publicapidir)/controls/bubble-effect
-publicapisuperblurviewdir = $(publicapidir)/controls/super-blur-view
-publicapiviewdir = $(publicapidir)/controls/view
-publicapinavigationframedir = $(publicapidir)/controls/navigation-frame
-publicapifactorydir = $(publicapidir)/factory
-publicapifocusmanagerdir = $(publicapidir)/focus-manager
-publicapimarkupprocessordir = $(publicapidir)/markup-processor
-publicapishadereffectsdir = $(publicapidir)/shader-effects
-publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
-publicapistyledtextutilitiesdir = $(publicapidir)/styled-text-utilities
-publicapibuilderdir = $(publicapidir)/builder
-publicapiutilitiesdir = $(publicapidir)/utilities
-publicapitransitioneffectsdir = $(publicapidir)/transition-effects
-
-publicapi_HEADERS = $(public_api_header_files)
-publicapicontrols_HEADERS = $(public_api_controls_header_files)
-publicapialignment_HEADERS = $(public_api_alignment_header_files)
-publicapibloomview_HEADERS = $(public_api_bloom_view_header_files)
-publicapibuttons_HEADERS = $(public_api_buttons_header_files)
-publicapicluster_HEADERS = $(public_api_cluster_header_files)
-publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files)
-publicapieffectsview_HEADERS = $(public_api_effects_view_header_files)
-publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files)
-publicapiimageview_HEADERS = $(public_api_image_view_header_files)
-publicapiitemview_HEADERS = $(public_api_item_view_header_files)
-publicapimagnifier_HEADERS = $(public_api_magnifier_header_files)
-publicapipopup_HEADERS = $(public_api_popup_header_files)
-publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files)
-publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files)
-publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files)
-publicapiscrollable_HEADERS = $(public_api_scrollable_header_files)
-publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files)
-publicapislider_HEADERS = $(public_api_slider_header_files)
-publicapitableview_HEADERS = $(public_api_table_view_header_files)
-publicapitextview_HEADERS = $(public_api_text_view_header_files)
-publicapitextinput_HEADERS = $(public_api_text_input_header_files)
-publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
-publicapiselectors_HEADERS = $(public_api_selectors_header_files)
-publicapishadowview_HEADERS = $(public_api_shadow_view_header_files)
-publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files)
-publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
-publicapiview_HEADERS = $(public_api_view_header_files)
-publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files)
-publicapifactory_HEADERS = $(public_api_factory_header_files)
-publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files)
-publicapimarkupprocessor_HEADERS = $(public_api_markup_processor_header_files)
-publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files)
-publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
-publicapistyledtextutilities_HEADERS = $(public_api_styled_text_utilities_header_files)
-publicapibuilder_HEADERS = $(public_api_builder_header_files)
-publicapiutilities_HEADERS = $(public_api_utilities_header_files)
-publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
+# Install Base headers
+
+toplevelbasedir = $(devincludepath)/dali-toolkit
+
+publicapibasedir = $(toplevelbasedir)/public-api
+publicapibasecontrolsdir = $(publicapibasedir)/controls
+publicapibasealignmentdir = $(publicapibasedir)/controls/alignment
+publicapibasebuttonsdir = $(publicapibasedir)/controls/buttons
+publicapibasedefaultcontrolsdir = $(publicapibasedir)/controls/default-controls
+publicapibaseitemviewdir = $(publicapibasedir)/controls/scrollable/item-view
+publicapibasepopupdir = $(publicapibasedir)/controls/popup
+publicapibasescrollbardir = $(publicapibasedir)/controls/scroll-bar
+publicapibasescrollcomponentdir = $(publicapibasedir)/controls/scroll-component
+publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
+publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
+publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
+publicapibasetextviewdir = $(publicapibasedir)/controls/text-view
+publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
+publicapibasefactorydir = $(publicapibasedir)/factory
+publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
+publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
+publicapibaseshadereffectsdir = $(publicapibasedir)/shader-effects
+publicapibasestylingdir = $(publicapibasedir)/styling
+publicapibasebuilderdir = $(publicapibasedir)/builder
+
+publicapibase_HEADERS = $(public_api_base_header_files)
+publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
+publicapibasealignment_HEADERS = $(public_api_base_alignment_header_files)
+publicapibasebuttons_HEADERS = $(public_api_base_buttons_header_files)
+publicapibasedefaultcontrols_HEADERS = $(public_api_base_default_controls_header_files)
+publicapibaseitemview_HEADERS = $(public_api_base_item_view_header_files)
+publicapibasepopup_HEADERS = $(public_api_base_popup_header_files)
+publicapibasescrollbar_HEADERS = $(public_api_base_scroll_bar_header_files)
+publicapibasescrollcomponent_HEADERS = $(public_api_base_scroll_component_header_files)
+publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
+publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
+publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
+publicapibasetextview_HEADERS = $(public_api_base_text_view_header_files)
+publicapibasetextinput_HEADERS = $(public_api_base_text_input_header_files)
+publicapibasefactory_HEADERS = $(public_api_base_factory_header_files)
+publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
+publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
+publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)
+publicapibasestyling_HEADERS = $(public_api_base_styling_header_files)
+publicapibasebuilder_HEADERS = $(public_api_base_builder_header_files)