Ubuntu UI Toolkit

Merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up into lp:ubuntu-ui-toolkit/staging

uitk-header-inclusion-clean-up
Merge into staging

Proposed by Loïc Molinari on 2016-09-09

Status:	Merged
Approved by:	Zsombor Egri on 2016-09-12
Approved revision:	2097
Merged at revision:	2097
Proposed branch:	lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	7969 lines (+1701/-1492) 318 files modified CODING (+63/-0) src/UbuntuGestures/UbuntuGestures.pro (+1/-3) src/UbuntuGestures/candidateinactivitytimer.cpp (+1/-1) src/UbuntuGestures/candidateinactivitytimer_p.h (+7/-7) src/UbuntuGestures/damper.cpp (+2/-1) src/UbuntuGestures/damper_p.h (+3/-3) src/UbuntuGestures/debughelpers.cpp (+4/-3) src/UbuntuGestures/debughelpers_p.h (+5/-7) src/UbuntuGestures/pool_p.h (+7/-7) src/UbuntuGestures/timer.cpp (+1/-1) src/UbuntuGestures/timer_p.h (+9/-9) src/UbuntuGestures/timesource.cpp (+2/-2) src/UbuntuGestures/timesource_p.h (+7/-6) src/UbuntuGestures/touchownershipevent.cpp (+1/-1) src/UbuntuGestures/touchownershipevent_p.h (+7/-6) src/UbuntuGestures/touchregistry.cpp (+11/-12) src/UbuntuGestures/touchregistry_p.h (+9/-11) src/UbuntuGestures/ubuntugesturesmodule.cpp (+3/-2) src/UbuntuGestures/ubuntugesturesmodule.h (+1/-1) src/UbuntuGestures/ucswipearea.cpp (+9/-12) src/UbuntuGestures/ucswipearea_p.h (+5/-9) src/UbuntuGestures/ucswipearea_p_p.h (+7/-7) src/UbuntuGestures/unownedtouchevent.cpp (+1/-1) src/UbuntuGestures/unownedtouchevent_p.h (+8/-7) src/UbuntuMetrics/applicationmonitor.cpp (+1/-0) src/UbuntuMetrics/applicationmonitor.h (+3/-2) src/UbuntuMetrics/applicationmonitor_p.h (+6/-4) src/UbuntuMetrics/bitmaptext.cpp (+5/-3) src/UbuntuMetrics/bitmaptext_p.h (+2/-1) src/UbuntuMetrics/events.cpp (+6/-3) src/UbuntuMetrics/events_p.h (+6/-3) src/UbuntuMetrics/gputimer.cpp (+3/-1) src/UbuntuMetrics/gputimer_p.h (+3/-1) src/UbuntuMetrics/logger.cpp (+5/-4) src/UbuntuMetrics/logger.h (+2/-1) src/UbuntuMetrics/logger_p.h (+5/-3) src/UbuntuMetrics/overlay.cpp (+6/-3) src/UbuntuMetrics/overlay_p.h (+4/-3) src/UbuntuMetrics/ubuntumetricsglobal.h (+1/-1) src/UbuntuMetrics/ubuntumetricsglobal_p.h (+1/-1) src/UbuntuToolkit/UbuntuToolkit.pro (+3/-8) src/UbuntuToolkit/actionlist.cpp (+1/-0) src/UbuntuToolkit/actionlist_p.h (+6/-5) src/UbuntuToolkit/adapters/actionsproxy_p.cpp (+4/-3) src/UbuntuToolkit/adapters/actionsproxy_p.h (+2/-1) src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp (+5/-5) src/UbuntuToolkit/adapters/alarmsadapter_p.h (+7/-6) src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp (+7/-4) src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h (+1/-1) src/UbuntuToolkit/alarmmanager_p.cpp (+1/-0) src/UbuntuToolkit/alarmmanager_p.h (+5/-5) src/UbuntuToolkit/alarmmanager_p_p.h (+8/-6) src/UbuntuToolkit/asyncloader_p.h (+5/-4) src/UbuntuToolkit/asyncloader_p_p.h (+7/-6) src/UbuntuToolkit/colorutils.cpp (+2/-1) src/UbuntuToolkit/colorutils_p.h (+8/-6) src/UbuntuToolkit/exclusivegroup.cpp (+3/-3) src/UbuntuToolkit/exclusivegroup_p.h (+9/-10) src/UbuntuToolkit/filterbehavior_p.h (+7/-6) src/UbuntuToolkit/i18n.cpp (+4/-3) src/UbuntuToolkit/i18n_p.h (+5/-4) src/UbuntuToolkit/inversemouseareatype.cpp (+2/-0) src/UbuntuToolkit/inversemouseareatype_p.h (+8/-6) src/UbuntuToolkit/label_p.h (+3/-3) src/UbuntuToolkit/listener.cpp (+1/-1) src/UbuntuToolkit/listener_p.h (+5/-4) src/UbuntuToolkit/livetimer_p.cpp (+3/-2) src/UbuntuToolkit/livetimer_p.h (+8/-7) src/UbuntuToolkit/livetimer_p_p.h (+7/-7) src/UbuntuToolkit/menu.cpp (+11/-12) src/UbuntuToolkit/menu_p.h (+5/-6) src/UbuntuToolkit/menu_p_p.h (+3/-3) src/UbuntuToolkit/menubar.cpp (+4/-7) src/UbuntuToolkit/menubar_p.h (+3/-4) src/UbuntuToolkit/menubar_p_p.h (+3/-3) src/UbuntuToolkit/menugroup.cpp (+1/-0) src/UbuntuToolkit/menugroup_p.h (+4/-4) src/UbuntuToolkit/mousetouchadaptor.cpp (+5/-6) src/UbuntuToolkit/mousetouchadaptor_p.h (+5/-5) src/UbuntuToolkit/mousetouchadaptor_p_p.h (+9/-8) src/UbuntuToolkit/mousetouchadaptor_x11.cpp (+4/-5) src/UbuntuToolkit/privates/appheaderbase.cpp (+1/-0) src/UbuntuToolkit/privates/appheaderbase_p.h (+4/-4) src/UbuntuToolkit/privates/frame.cpp (+4/-2) src/UbuntuToolkit/privates/frame_p.h (+5/-4) src/UbuntuToolkit/privates/listitemdragarea.cpp (+6/-4) src/UbuntuToolkit/privates/listitemdragarea_p.h (+6/-5) src/UbuntuToolkit/privates/listitemdraghandler.cpp (+5/-4) src/UbuntuToolkit/privates/listitemdraghandler_p.h (+5/-4) src/UbuntuToolkit/privates/listitemselection.cpp (+2/-1) src/UbuntuToolkit/privates/listitemselection_p.h (+5/-4) src/UbuntuToolkit/privates/listviewextensions.cpp (+5/-3) src/UbuntuToolkit/privates/listviewextensions_p.h (+5/-4) src/UbuntuToolkit/privates/splitviewhandler.cpp (+6/-4) src/UbuntuToolkit/privates/splitviewhandler_p.h (+6/-5) src/UbuntuToolkit/privates/threelabelsslot_p.cpp (+2/-1) src/UbuntuToolkit/privates/threelabelsslot_p.h (+7/-7) src/UbuntuToolkit/privates/ucpagewrapper.cpp (+6/-5) src/UbuntuToolkit/privates/ucpagewrapper_p.h (+4/-4) src/UbuntuToolkit/privates/ucpagewrapper_p_p.h (+8/-7) src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp (+4/-3) src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h (+10/-9) src/UbuntuToolkit/privates/ucscrollbarutils.cpp (+2/-1) src/UbuntuToolkit/privates/ucscrollbarutils_p.h (+7/-6) src/UbuntuToolkit/propertychange_p.h (+5/-5) src/UbuntuToolkit/qquickclipboard.cpp (+2/-1) src/UbuntuToolkit/qquickclipboard_p.h (+5/-4) src/UbuntuToolkit/qquickclipboard_p_p.h (+7/-6) src/UbuntuToolkit/qquickmimedata.cpp (+5/-5) src/UbuntuToolkit/qquickmimedata_p.h (+6/-5) src/UbuntuToolkit/quickutils.cpp (+6/-8) src/UbuntuToolkit/quickutils_p.h (+2/-2) src/UbuntuToolkit/sortbehavior_p.h (+7/-6) src/UbuntuToolkit/sortfiltermodel_p.h (+8/-7) src/UbuntuToolkit/splitview.cpp (+5/-6) src/UbuntuToolkit/splitview_p.h (+1/-1) src/UbuntuToolkit/splitview_p_p.h (+2/-1) src/UbuntuToolkit/splitviewlayout.cpp (+3/-3) src/UbuntuToolkit/statesaverbackend_p.cpp (+8/-7) src/UbuntuToolkit/statesaverbackend_p.h (+4/-3) src/UbuntuToolkit/timeutils_p.h (+5/-5) src/UbuntuToolkit/tree.cpp (+2/-2) src/UbuntuToolkit/tree_p.h (+8/-7) src/UbuntuToolkit/ubuntutoolkitglobal.h (+1/-1) src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+76/-78) src/UbuntuToolkit/ubuntutoolkitmodule.h (+4/-3) src/UbuntuToolkit/ucabstractbutton.cpp (+6/-4) src/UbuntuToolkit/ucabstractbutton_p.h (+6/-5) src/UbuntuToolkit/ucabstractbutton_p_p.h (+7/-6) src/UbuntuToolkit/ucaction.cpp (+8/-7) src/UbuntuToolkit/ucaction_p.h (+7/-6) src/UbuntuToolkit/ucactioncontext.cpp (+4/-2) src/UbuntuToolkit/ucactioncontext_p.h (+7/-6) src/UbuntuToolkit/ucactionitem.cpp (+4/-2) src/UbuntuToolkit/ucactionitem_p.h (+6/-5) src/UbuntuToolkit/ucactionitem_p_p.h (+7/-6) src/UbuntuToolkit/ucactionmanager.cpp (+2/-1) src/UbuntuToolkit/ucactionmanager_p.h (+5/-4) src/UbuntuToolkit/ucalarm.cpp (+3/-1) src/UbuntuToolkit/ucalarm_p.h (+6/-5) src/UbuntuToolkit/ucalarm_p_p.h (+7/-5) src/UbuntuToolkit/ucalarmmodel.cpp (+6/-4) src/UbuntuToolkit/ucalarmmodel_p.h (+5/-4) src/UbuntuToolkit/ucapplication.cpp (+3/-3) src/UbuntuToolkit/ucapplication_p.h (+5/-4) src/UbuntuToolkit/ucargument_p.h (+5/-4) src/UbuntuToolkit/ucarguments.cpp (+5/-3) src/UbuntuToolkit/ucarguments_p.h (+7/-6) src/UbuntuToolkit/ucbottomedge.cpp (+12/-11) src/UbuntuToolkit/ucbottomedge_p.h (+6/-5) src/UbuntuToolkit/ucbottomedge_p_p.h (+8/-7) src/UbuntuToolkit/ucbottomedgehint.cpp (+8/-6) src/UbuntuToolkit/ucbottomedgehint_p.h (+7/-6) src/UbuntuToolkit/ucbottomedgehint_p_p.h (+7/-7) src/UbuntuToolkit/ucbottomedgeregion.cpp (+3/-2) src/UbuntuToolkit/ucbottomedgeregion_p.h (+7/-6) src/UbuntuToolkit/ucbottomedgeregion_p_p.h (+8/-6) src/UbuntuToolkit/ucbottomedgestyle.cpp (+1/-0) src/UbuntuToolkit/ucbottomedgestyle_p.h (+5/-4) src/UbuntuToolkit/ucdefaulttheme.cpp (+3/-2) src/UbuntuToolkit/ucdefaulttheme_p.h (+6/-5) src/UbuntuToolkit/ucdeprecatedtheme.cpp (+6/-4) src/UbuntuToolkit/ucdeprecatedtheme_p.h (+6/-5) src/UbuntuToolkit/ucfontutils.cpp (+1/-1) src/UbuntuToolkit/ucfontutils_p.h (+5/-5) src/UbuntuToolkit/uchaptics.cpp (+4/-2) src/UbuntuToolkit/uchaptics_p.h (+4/-3) src/UbuntuToolkit/ucheader.cpp (+4/-2) src/UbuntuToolkit/ucheader_p.h (+5/-4) src/UbuntuToolkit/ucimportversionchecker_p.cpp (+3/-3) src/UbuntuToolkit/ucimportversionchecker_p.h (+3/-2) src/UbuntuToolkit/ucinversemouse_p.h (+8/-8) src/UbuntuToolkit/uclabel.cpp (+3/-2) src/UbuntuToolkit/uclabel_p.h (+8/-7) src/UbuntuToolkit/uclistitem.cpp (+21/-19) src/UbuntuToolkit/uclistitem_p.h (+5/-4) src/UbuntuToolkit/uclistitem_p_p.h (+9/-7) src/UbuntuToolkit/uclistitemactions.cpp (+6/-4) src/UbuntuToolkit/uclistitemactions_p.h (+5/-4) src/UbuntuToolkit/uclistitemactions_p_p.h (+7/-6) src/UbuntuToolkit/uclistitemlayout.cpp (+3/-2) src/UbuntuToolkit/uclistitemlayout_p.h (+5/-5) src/UbuntuToolkit/uclistitemstyle.cpp (+5/-3) src/UbuntuToolkit/uclistitemstyle_p.h (+6/-4) src/UbuntuToolkit/ucmainviewbase.cpp (+6/-7) src/UbuntuToolkit/ucmainviewbase_p.h (+4/-4) src/UbuntuToolkit/ucmainviewbase_p_p.h (+9/-7) src/UbuntuToolkit/ucmargins_p.h (+5/-4) src/UbuntuToolkit/ucmathutils.cpp (+2/-2) src/UbuntuToolkit/ucmathutils_p.h (+7/-7) src/UbuntuToolkit/ucmouse_p.h (+8/-8) src/UbuntuToolkit/ucmousefilters.cpp (+6/-6) src/UbuntuToolkit/ucpagetreenode.cpp (+1/-1) src/UbuntuToolkit/ucpagetreenode_p.h (+6/-5) src/UbuntuToolkit/ucpagetreenode_p_p.h (+8/-6) src/UbuntuToolkit/ucperformancemonitor.cpp (+1/-0) src/UbuntuToolkit/ucperformancemonitor_p.h (+7/-6) src/UbuntuToolkit/ucproportionalshape_p.h (+4/-4) src/UbuntuToolkit/ucqquickimageextension.cpp (+3/-3) src/UbuntuToolkit/ucqquickimageextension_p.h (+9/-8) src/UbuntuToolkit/ucscalingimageprovider_p.h (+6/-5) src/UbuntuToolkit/ucserviceproperties.cpp (+4/-2) src/UbuntuToolkit/ucserviceproperties_p.h (+5/-4) src/UbuntuToolkit/ucserviceproperties_p_p.h (+6/-5) src/UbuntuToolkit/ucslotslayout.cpp (+2/-1) src/UbuntuToolkit/ucslotslayout_p.h (+5/-4) src/UbuntuToolkit/ucslotslayout_p_p.h (+7/-7) src/UbuntuToolkit/ucstatesaver.cpp (+10/-8) src/UbuntuToolkit/ucstatesaver_p.h (+6/-5) src/UbuntuToolkit/ucstatesaver_p_p.h (+7/-7) src/UbuntuToolkit/ucstyleditembase.cpp (+5/-3) src/UbuntuToolkit/ucstyleditembase_p.h (+6/-5) src/UbuntuToolkit/ucstyleditembase_p_p.h (+8/-6) src/UbuntuToolkit/ucstylehints.cpp (+4/-2) src/UbuntuToolkit/ucstylehints_p.h (+7/-6) src/UbuntuToolkit/uctheme.cpp (+14/-14) src/UbuntuToolkit/uctheme_p.h (+6/-7) src/UbuntuToolkit/ucthemingextension.cpp (+5/-3) src/UbuntuToolkit/ucthemingextension_p.h (+7/-7) src/UbuntuToolkit/ucubuntuanimation.cpp (+1/-1) src/UbuntuToolkit/ucubuntuanimation_p.h (+6/-6) src/UbuntuToolkit/ucubuntushape.cpp (+7/-4) src/UbuntuToolkit/ucubuntushape_p.h (+7/-6) src/UbuntuToolkit/ucubuntushapeoverlay_p.h (+3/-3) src/UbuntuToolkit/ucunits.cpp (+4/-5) src/UbuntuToolkit/ucunits_p.h (+6/-5) src/UbuntuToolkit/ucurihandler.cpp (+4/-1) src/UbuntuToolkit/ucurihandler_p.h (+6/-4) src/UbuntuToolkit/ucviewitemsattached.cpp (+13/-12) src/UbuntuToolkit/unitythemeiconprovider.cpp (+6/-6) src/UbuntuToolkit/unitythemeiconprovider_p.h (+7/-6) src/UbuntuToolkit/unixsignalhandler_p.cpp (+3/-2) src/UbuntuToolkit/unixsignalhandler_p.h (+6/-4) src/imports/Components/plugin/plugin.cpp (+5/-4) src/imports/Components/plugin/plugin.h (+4/-4) src/imports/Components/plugin/plugin.pri (+3/-6) src/imports/Components/plugin/ucnamespace.h (+1/-2) src/imports/Layouts/plugin/plugin.pri (+5/-8) src/imports/Layouts/plugin/propertychanges.cpp (+5/-4) src/imports/Layouts/plugin/propertychanges_p.h (+3/-4) src/imports/Layouts/plugin/ulconditionallayout.cpp (+3/-4) src/imports/Layouts/plugin/ulconditionallayout.h (+1/-1) src/imports/Layouts/plugin/ullayouts.cpp (+4/-3) src/imports/Layouts/plugin/ullayouts.h (+1/-0) src/imports/Layouts/plugin/ullayouts_p.h (+2/-0) src/imports/Layouts/plugin/ullayoutsattached.cpp (+2/-2) src/imports/Layouts/plugin/ulplugin.cpp (+3/-2) src/imports/Layouts/plugin/ulplugin.h (+4/-5) src/imports/PerformanceMetrics/plugin/rendertimer.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmcpuusage.cpp (+1/-0) src/imports/PerformanceMetrics/plugin/upmcpuusage.h (+4/-2) src/imports/PerformanceMetrics/plugin/upmgraphmodel.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmplugin.cpp (+5/-4) src/imports/PerformanceMetrics/plugin/upmplugin.h (+4/-5) src/imports/PerformanceMetrics/plugin/upmrenderingtimes.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmrenderingtimes.h (+5/-4) src/imports/PerformanceMetrics/plugin/upmtexturefromimage.cpp (+2/-1) src/imports/Test/plugin/plugin.pri (+2/-3) src/imports/Test/plugin/testplugin.cpp (+4/-2) src/imports/Test/plugin/testplugin.h (+1/-1) src/imports/Test/plugin/uctestcase.cpp (+2/-2) src/imports/Test/plugin/uctestcase.h (+4/-4) src/imports/Test/plugin/uctestextras.cpp (+7/-8) src/imports/Test/plugin/uctestextras.h (+3/-3) tests/api/Extinct/Animals/plugin/pangaea.h (+3/-3) tests/api/Extinct/Animals/plugin/plugin.cpp (+6/-5) tests/api/Extinct/Animals/plugin/plugin.h (+3/-3) tests/api/Extinct/Animals/plugin/plugin.pri (+1/-2) tests/api/Extinct/Animals/plugin/rune.cpp (+2/-3) tests/api/Extinct/Animals/plugin/rune.h (+5/-5) tests/api/Extinct/Animals/plugin/smilodon.h (+3/-3) tests/api/Extinct/Animals/plugin/tarpan.h (+3/-3) tests/unit/alarms/tst_alarms.cpp (+10/-11) tests/unit/animator/tst_animator.cpp (+7/-8) tests/unit/argument/tst_argument.cpp (+2/-3) tests/unit/arguments/tst_arguments.cpp (+7/-8) tests/unit/asyncloader/tst_asyncloader.cpp (+5/-4) tests/unit/bottomedge/tst_bottomedge.cpp (+10/-10) tests/unit/components/tst_components.cpp (+3/-2) tests/unit/components_benchmark/tst_components_benchmark.cpp (+5/-5) tests/unit/custom_qpa/main.cpp (+1/-1) tests/unit/custom_qpa/qcustombackingstore.cpp (+5/-5) tests/unit/custom_qpa/qcustombackingstore.h (+2/-2) tests/unit/custom_qpa/qcustomintegration.cpp (+6/-6) tests/unit/custom_qpa/qcustomintegration.h (+2/-2) tests/unit/deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+4/-4) tests/unit/i18n/LocalizedApp/src/tst_i18n_LocalizedApp.cpp (+15/-17) tests/unit/i18n/RelativeTime/src/tst_i18n_RelativeTime.cpp (+15/-18) tests/unit/iconprovider/tst_iconprovider.cpp (+0/-1) tests/unit/inversemousearea/tst_inversemouseareatest.cpp (+7/-8) tests/unit/layouts/tst_layouts.cpp (+10/-13) tests/unit/mainview/tst_mainview.cpp (+14/-14) tests/unit/mousefilters/tst_mousefilterstest.cpp (+9/-11) tests/unit/orientation/tst_orientation.cpp (+8/-9) tests/unit/page/tst_page.cpp (+4/-4) tests/unit/performance/tst_performance.cpp (+3/-4) tests/unit/qmltemplate/tst_qmltemplate.cpp (+3/-2) tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp (+3/-5) tests/unit/quickutils/tst_quickutils.cpp (+3/-3) tests/unit/recreateview/tst_recreateview.cpp (+2/-3) tests/unit/serviceproperties/tst_serviceproperties.cpp (+5/-5) tests/unit/statesaver/tst_statesaver.cpp (+16/-16) tests/unit/subtheming/tst_subtheming.cpp (+9/-9) tests/unit/swipearea/GestureTest.cpp (+8/-9) tests/unit/swipearea/GestureTest.h (+7/-9) tests/unit/swipearea/tst_swipearea.cpp (+7/-9) tests/unit/test-include.pri (+1/-3) tests/unit/test/tst_test.cpp (+3/-2) tests/unit/testparser/main.cpp (+7/-8) tests/unit/theme/tst_theme.cpp (+3/-2) tests/unit/touchregistry/touchregistry.pro (+1/-1) tests/unit/touchregistry/tst_TouchRegistry.cpp (+4/-4) tests/unit/tree/tst_tree.cpp (+2/-3) tests/unit/ubuntu_shape/tst_ubuntu_shape.cpp (+2/-2) tests/unit/units/scale/tst_units_scale.cpp (+1/-2) tests/unit/visual/tabsmodel.cpp (+0/-1) tests/unit/visual/tabsmodel.h (+2/-3) tests/unit/visual/tst_visual.cpp (+3/-3)
To merge this branch:	bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-09-12
Zsombor Egri		2016-09-09	Approve on 2016-09-12
Review via email: mp+305368@code.launchpad.net

Commit message

Fixed, cleaned up and standardised header inclusions.

Apart from the clean up and the readability improvements, this fixes a bunch of broken private header inclusions (#include "foo_p.h" in private headers instead of "private/foo_p.h" or better <Project/private/foo_p.h>), now all the private headers of the UITK can be included by the users withour compilation issues. It also removes a bunch of direct includes from sources and a few INCLUDEPATHs hacks.

See the CODING file for more details.

Description of the change

Fixed, cleaned up and standardised header inclusions.

Here are the proposed rules detailed in the new CODING file:

1/ When including Qt or UITK headers, always prefix with the project name. Use:

#include <QtCore/QMap>
#include <UbuntuMetrics/applicationmonitor.h>

not

#include <QMap>
#include <applicationmonitor.h>

2/ For readability reasons and to avoid hidden dependencies, headers should be
included in ordered sections, separated by an empty line, as follows:

// The project's related header (for instance here for foo.cpp).
#include "foo.h"

    // C standard library headers.
    #include <sys/types.h>
    #include <unistd.h>

    // C++ standard library headers.
    #include <functional>
    #include <hash_map>
    #include <vector>

    // Qt and UITK headers. Try to first list QtCore and QtGui headers. Private
    // headers come right after public headers of the same project.
    #include <QtCore/QDebug>
    #include <QtCore/QHash>
    #include <QtCore/private/qobject_p.h>
    #include <QtGui/QWindow>
    #include <QtGui/private/qcolor_p.h>
    #include <UbuntuMetrics/applicationmonitor.h>

    // Other libraries headers.
    #include <gst/gst.h>
    #include <boost/call_traits.hpp>

    // The project's headers.
    #include "bar.h"
    #include "baz_p.h"

3/ For libraries, the "foo" inclusion variant must be used in C++
   source files for the project's headers. The <Project/foo.h> and
   <Project/private/foo_p.h> inclusion variant must be used for the
   project's headers in private and public headers, wherever the
   header is located in the source tree. That ensures the inclusion of
   private headers by external projects (or by our unit tests) won't
   break.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2092
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1126/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6171/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1126/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2092
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1160/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6172/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1160/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2092
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1376/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6173/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1376/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2092
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1369/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6174/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1369/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/728/rebuild

review: Needs Fixing (continuous-integration)

lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up updated on 2016-09-09

2093. By Loïc Molinari on 2016-09-09: i386-gles build fix attempt.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2093
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1127/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6176/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1127/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2093
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1161/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6177/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1161/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2093
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1377/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6178/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1377/rebuild

review: Approve (continuous-integration)

lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up updated on 2016-09-09

2094. By Loïc Molinari on 2016-09-09: i386-gles build fix attempt (2).

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2093
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1370/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6179/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1370/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/729/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2094
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1128/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6181/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1128/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2094
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1162/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6182/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1162/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2094
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1378/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6183/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1378/rebuild

review: Approve (continuous-integration)

lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up updated on 2016-09-09

2095. By Loïc Molinari on 2016-09-09: i386-gles build fix attempt (3).

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2094
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1371/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6184/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1371/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/730/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2095
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1129/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6186/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1129/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2095
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1163/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6187/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1163/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2095
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/731/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6188/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/731/rebuild

review: Needs Fixing (continuous-integration)

lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up updated on 2016-09-09

2096. By Loïc Molinari on 2016-09-09: i386-gles build fix attempt (4).

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1130/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6189/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1130/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1164/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6190/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1164/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/732/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6191/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/732/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2095
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1379/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6192/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1379/rebuild

review: Approve (continuous-integration)

lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up updated on 2016-09-09

2097. By Loïc Molinari on 2016-09-09: i386-gles build fix attempt (5).

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2095
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1372/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6193/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1372/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1165/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6194/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1165/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1380/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6195/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1380/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1373/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6196/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1373/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1381/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6197/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1381/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1131/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6198/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1131/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1374/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6199/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1374/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/733/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-09-12:

Looks fine, thanks for the guideline!

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-12:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1173/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6234/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1173/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-12:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1389/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6237/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1389/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-12:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1139/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6239/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1139/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-09-12:

PASSED: Continuous integration, rev:2097
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1382/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6241/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1382/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Loïc Molinari

Tom Mirmar

Ubuntu SDK team

 === added file 'CODING'
 --- CODING	1970-01-01 00:00:00 +0000
 +++ CODING	2016-09-09 22:15:37 +0000
@@ -0,0 +1,63 @@
++C++ coding style
++================
++
++The Ubuntu UI Toolkit follows the Qt conventions, see:
++
++  - https://wiki.qt.io/Coding_Conventions
++  - https://wiki.qt.io/Qt_Coding_Style
++
++On top of it we add the few clarifications listed below.
++
++
++Header inclusion
++----------------
++
++1/ When including Qt or UITK headers, always prefix with the project name. Use:
++
++    #include <QtCore/QMap>
++    #include <UbuntuMetrics/applicationmonitor.h>
++
++   not
++
++    #include <QMap>
++    #include <applicationmonitor.h>
++
++2/ For readability reasons and to avoid hidden dependencies, headers should be
++   included in ordered sections, separated by an empty line, as follows:
++
++    // The project's related header (for instance here for foo.cpp).
++    #include "foo.h"
++
++    // C standard library headers.
++    #include <sys/types.h>
++    #include <unistd.h>
++
++    // C++ standard library headers.
++    #include <functional>
++    #include <hash_map>
++    #include <vector>
++
++    // Qt and UITK headers. Try to first list QtCore and QtGui headers. Private
++    // headers come right after public headers of the same project.
++    #include <QtCore/QDebug>
++    #include <QtCore/QHash>
++    #include <QtCore/private/qobject_p.h>
++    #include <QtGui/QWindow>
++    #include <QtGui/private/qcolor_p.h>
++    #include <UbuntuMetrics/applicationmonitor.h>
++
++    // Other libraries headers.
++    #include <gst/gst.h>
++    #include <boost/call_traits.hpp>
++
++    // The project's headers.
++    #include "bar.h"
++    #include "baz_p.h"
++
++3/ For libraries, the "foo" inclusion variant must be used in C++
++   source files for the project's headers. The <Project/foo.h> and
++   <Project/private/foo_p.h> inclusion variant must be used for the
++   project's headers in private and public headers, wherever the
++   header is located in the source tree. That ensures the inclusion of
++   private headers by external projects (or by our unit tests) won't
++   break.
 === modified file 'src/UbuntuGestures/UbuntuGestures.pro'
 --- src/UbuntuGestures/UbuntuGestures.pro	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/UbuntuGestures.pro	2016-09-09 22:15:37 +0000
@@ -1,12 +1,10 @@
  TEMPLATE=lib
  TARGET=UbuntuGestures
--QT *= core-private gui-private qml qml-private quick quick-private
++QT *= core-private gui-private qml-private quick-private
  CONFIG += dll no_keywords c++11
--INCLUDEPATH+=$$PWD
--
  DEFINES += UBUNTUGESTURES_LIBRARY
  load(qt_build_config)
 === modified file 'src/UbuntuGestures/candidateinactivitytimer.cpp'
 --- src/UbuntuGestures/candidateinactivitytimer.cpp	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/candidateinactivitytimer.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
++#include "candidateinactivitytimer_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/candidateinactivitytimer_p.h'
 --- src/UbuntuGestures/candidateinactivitytimer_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/candidateinactivitytimer_p.h	2016-09-09 22:15:37 +0000
@@ -14,15 +14,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
--#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
--
--#include <QObject>
++#ifndef CANDIDATEINACTIVITYTIMER_P_H
++#define CANDIDATEINACTIVITYTIMER_P_H
++
++#include <QtCore/QObject>
++
++#include <UbuntuGestures/private/timer_p.h>
  class QQuickItem;
--#include <UbuntuGestures/private/timer_p.h>
--
  UG_NAMESPACE_BEGIN
  class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
@@ -48,4 +48,4 @@
  UG_NAMESPACE_END
--#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
++#endif // CANDIDATEINACTIVITYTIMER_P_H
 === modified file 'src/UbuntuGestures/damper.cpp'
 --- src/UbuntuGestures/damper.cpp	2015-12-17 15:23:26 +0000
 +++ src/UbuntuGestures/damper.cpp	2016-09-09 22:15:37 +0000
@@ -15,7 +15,8 @@
   */
  #include "damper_p.h"
--#include <QDebug>
++
++#include <QtCore/QDebug>
  QDebug operator<<(QDebug dbg, const DampedPointF &p)
+ {
 === modified file 'src/UbuntuGestures/damper_p.h'
 --- src/UbuntuGestures/damper_p.h	2015-12-17 15:23:26 +0000
 +++ src/UbuntuGestures/damper_p.h	2016-09-09 22:15:37 +0000
@@ -14,8 +14,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTU_GESTURES_DAMPER_H
--#define UBUNTU_GESTURES_DAMPER_H
++#ifndef DAMPER_P_H
++#define DAMPER_P_H
  #include <QtCore/QPointF>
@@ -86,4 +86,4 @@
  QDebug operator<<(QDebug dbg, const DampedPointF &p);
--#endif // UBUNTU_GESTURES_DAMPER_H
++#endif // DAMPER_P_H
 === modified file 'src/UbuntuGestures/debughelpers.cpp'
 --- src/UbuntuGestures/debughelpers.cpp	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/debughelpers.cpp	2016-09-09 22:15:37 +0000
@@ -14,9 +14,10 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/debughelpers_p.h>
--#include <QTouchEvent>
--#include <QMouseEvent>
++#include "debughelpers_p.h"
++
++#include <QtGui/QMouseEvent>
++#include <QtGui/QTouchEvent>
  QString touchPointStateToString(Qt::TouchPointState state)
+ {
 === modified file 'src/UbuntuGestures/debughelpers_p.h'
 --- src/UbuntuGestures/debughelpers_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/debughelpers_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,10 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTUGESTURES_DEBUG_HELPER_H
--#define UBUNTUGESTURES_DEBUG_HELPER_H
--
--#include <QString>
--
--#include "ubuntugesturesglobal.h"
++#ifndef DEBUGHELPERS_P_H
++#define DEBUGHELPERS_P_H
++
++#include <QtCore/QString>
  class QMouseEvent;
  class QTouchEvent;
@@ -28,4 +26,4 @@
  QString touchEventToString(const QTouchEvent *ev);
  QString mouseEventToString(const QMouseEvent *ev);
--#endif // UBUNTUGESTURES_DEBUG_HELPER_H
++#endif // DEBUGHELPERS_P_H
 === modified file 'src/UbuntuGestures/pool_p.h'
 --- src/UbuntuGestures/pool_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/pool_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTUGESTURES_POOL_H
--#define UBUNTUGESTURES_POOL_H
--
--#include <QVector>
--
--#include "ubuntugesturesglobal.h"
++#ifndef POOL_P_H
++#define POOL_P_H
++
++#include <QtCore/QVector>
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  /*
    An object pool.
@@ -129,4 +129,4 @@
      int m_lastUsedIndex;
  };
--#endif // UBUNTUGESTURES_POOL_H
++#endif // POOL_P_H
 === modified file 'src/UbuntuGestures/timer.cpp'
 --- src/UbuntuGestures/timer.cpp	2016-07-25 14:02:18 +0000
 +++ src/UbuntuGestures/timer.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/timer_p.h>
++#include "timer_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/timer_p.h'
 --- src/UbuntuGestures/timer_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/timer_p.h	2016-09-09 22:15:37 +0000
@@ -14,16 +14,16 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTUGESTURES_TIMER_H
--#define UBUNTUGESTURES_TIMER_H
--
--#include "ubuntugesturesglobal.h"
++#ifndef TIMER_P_H
++#define TIMER_P_H
++
++#include <QtCore/QObject>
++#include <QtCore/QPointer>
++#include <QtCore/QTimer>
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  #include <UbuntuGestures/private/timesource_p.h>
--#include <QObject>
--#include <QPointer>
--#include <QTimer>
--
  UG_NAMESPACE_BEGIN
  /* Defines an interface for a Timer. */
@@ -114,4 +114,4 @@
  UG_NAMESPACE_END
--#endif // UBUNTUGESTURES_TIMER_H
++#endif // TIMER_P_H
 === modified file 'src/UbuntuGestures/timesource.cpp'
 --- src/UbuntuGestures/timesource.cpp	2016-07-25 14:02:18 +0000
 +++ src/UbuntuGestures/timesource.cpp	2016-09-09 22:15:37 +0000
@@ -16,9 +16,9 @@
   * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#include <UbuntuGestures/private/timesource_p.h>
++#include "timesource_p.h"
--#include <QElapsedTimer>
++#include <QtCore/QElapsedTimer>
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/timesource_p.h'
 --- src/UbuntuGestures/timesource_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/timesource_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#ifndef UBUNTUGESTURES_TIMESOURCE_H
--#define UBUNTUGESTURES_TIMESOURCE_H
--
--#include "ubuntugesturesglobal.h"
--#include <QSharedPointer>
++#ifndef TIMESOURCE_P_H
++#define TIMESOURCE_P_H
++
++#include <QtCore/QSharedPointer>
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  UG_NAMESPACE_BEGIN
  /*
@@ -59,4 +60,4 @@
  UG_NAMESPACE_END
--#endif // UBUNTUGESTURES_TIMESOURCE_H
++#endif // TIMESOURCE_P_H
 === modified file 'src/UbuntuGestures/touchownershipevent.cpp'
 --- src/UbuntuGestures/touchownershipevent.cpp	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/touchownershipevent.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/touchownershipevent_p.h>
++#include "touchownershipevent_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/touchownershipevent_p.h'
 --- src/UbuntuGestures/touchownershipevent_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/touchownershipevent_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H
--#define UBUNTU_TOUCHOWNERSHIPEVENT_H
--
--#include <QEvent>
--#include "ubuntugesturesglobal.h"
++#ifndef TOUCHOWNERSHIPEVENT_P_H
++#define TOUCHOWNERSHIPEVENT_P_H
++
++#include <QtCore/QEvent>
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  UG_NAMESPACE_BEGIN
  /*
@@ -50,4 +51,4 @@
  UG_NAMESPACE_END
--#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H
++#endif // TOUCHOWNERSHIPEVENT_P_H
 === modified file 'src/UbuntuGestures/touchregistry.cpp'
 --- src/UbuntuGestures/touchregistry.cpp	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/touchregistry.cpp	2016-09-09 22:15:37 +0000
@@ -14,21 +14,20 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/touchregistry_p.h>
--
--#include <QCoreApplication>
--#include <QDebug>
--
--#include <private/qquickitem_p.h>
--
--#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
--#include <UbuntuGestures/private/timer_p.h>
--#include <UbuntuGestures/private/touchownershipevent_p.h>
--#include <UbuntuGestures/private/unownedtouchevent_p.h>
++#include "touchregistry_p.h"
++
++#include <QtCore/QCoreApplication>
++#include <QtCore/QDebug>
++#include <QtQuick/private/qquickitem_p.h>
++
++#include "candidateinactivitytimer_p.h"
++#include "debughelpers_p.h"
++#include "timer_p.h"
++#include "touchownershipevent_p.h"
++#include "unownedtouchevent_p.h"
  Q_LOGGING_CATEGORY(ugTouchRegistry, "libubuntugestures.TouchRegistry", QtMsgType::QtWarningMsg)
--#include <UbuntuGestures/private/debughelpers_p.h>
  #define UG_DEBUG qCDebug(ugTouchRegistry) << "[TouchRegistry]"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/touchregistry_p.h'
 --- src/UbuntuGestures/touchregistry_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/touchregistry_p.h	2016-09-09 22:15:37 +0000
@@ -14,23 +14,21 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UNITY_TOUCHREGISTRY_H
--#define UNITY_TOUCHREGISTRY_H
++#ifndef TOUCHREGISTRY_P_H
++#define TOUCHREGISTRY_P_H
++#include <QtCore/QLoggingCategory>
++#include <QtCore/QObject>
++#include <QtCore/QPointer>
++#include <QtCore/QVector>
++#include <QtGui/QTouchEvent>
  #include <QtQuick/QQuickItem>
--#include <QObject>
--#include <QPointer>
--#include <QTouchEvent>
--#include <QVector>
--#include "ubuntugesturesglobal.h"
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  #include <UbuntuGestures/private/candidateinactivitytimer_p.h>
  #include <UbuntuGestures/private/timer_p.h>
  #include <UbuntuGestures/private/pool_p.h>
--// logging
--#include <QtCore/QLoggingCategory>
--
  UG_FORWARD_DECLARE_CLASS(AbstractTimerFactory)
  /*
@@ -206,4 +204,4 @@
  Q_DECLARE_LOGGING_CATEGORY(ugTouchRegistry)
--#endif // UNITY_TOUCHREGISTRY_H
++#endif // TOUCHREGISTRY_P_H
 === modified file 'src/UbuntuGestures/ubuntugesturesmodule.cpp'
 --- src/UbuntuGestures/ubuntugesturesmodule.cpp	2016-06-21 14:21:46 +0000
 +++ src/UbuntuGestures/ubuntugesturesmodule.cpp	2016-09-09 22:15:37 +0000
@@ -16,10 +16,11 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
++#include <QtQml/QtQml>
  #include <QtQml/QQmlEngine>
--#include <QtQml>
++
  #include "ubuntugesturesmodule.h"
--#include <private/ucswipearea_p.h>
++#include "ucswipearea_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/ubuntugesturesmodule.h'
 --- src/UbuntuGestures/ubuntugesturesmodule.h	2016-07-06 09:51:06 +0000
 +++ src/UbuntuGestures/ubuntugesturesmodule.h	2016-09-09 22:15:37 +0000
@@ -19,7 +19,7 @@
  #ifndef UBUNTUGESTURESMODULE_H
  #define UBUNTUGESTURESMODULE_H
--#include <ubuntugesturesglobal.h>
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/ucswipearea.cpp'
 --- src/UbuntuGestures/ucswipearea.cpp	2016-07-25 14:02:18 +0000
 +++ src/UbuntuGestures/ucswipearea.cpp	2016-09-09 22:15:37 +0000
@@ -12,22 +12,19 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "ucswipearea_p_p.h"
--#include <QQuickWindow>
--#include <QtCore/qmath.h>
--#include <QScreen>
--#include <QDebug>
--
--#include <private/qquickwindow_p.h>
--
--// local
--#include <UbuntuGestures/private/touchownershipevent_p.h>
--#include <UbuntuGestures/private/touchregistry_p.h>
--#include <UbuntuGestures/private/unownedtouchevent_p.h>
++#include <QtCore/QDebug>
++#include <QtGui/QScreen>
++#include <QtCore/QtMath>
++#include <QtQuick/QQuickWindow>
++#include <QtQuick/private/qquickwindow_p.h>
++
++#include "touchownershipevent_p.h"
++#include "touchregistry_p.h"
++#include "unownedtouchevent_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/ucswipearea_p.h'
 --- src/UbuntuGestures/ucswipearea_p.h	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/ucswipearea_p.h	2016-09-09 22:15:37 +0000
@@ -12,22 +12,18 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCSWIPEAREA_H
--#define UCSWIPEAREA_H
++#ifndef UCSWIPEAREA_P_H
++#define UCSWIPEAREA_P_H
++#include <QtCore/QLoggingCategory>
  #include <QtQuick/QQuickItem>
--#include "ubuntugesturesglobal.h"
--// lib UbuntuGestures
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  #include <UbuntuGestures/private/pool_p.h>
  #include <UbuntuGestures/private/timer_p.h>
--// logging
--#include <QtCore/QLoggingCategory>
--
  UG_NAMESPACE_BEGIN
  class TouchOwnershipEvent;
@@ -106,4 +102,4 @@
  Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea)
  Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo)
--#endif // UCSWIPEAREA_H
++#endif // UCSWIPEAREA_P_H
 === modified file 'src/UbuntuGestures/ucswipearea_p_p.h'
 --- src/UbuntuGestures/ucswipearea_p_p.h	2016-07-25 14:02:18 +0000
 +++ src/UbuntuGestures/ucswipearea_p_p.h	2016-09-09 22:15:37 +0000
@@ -12,16 +12,16 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCSWIPEAREAPRIVATE_H
--#define UCSWIPEAREAPRIVATE_H
--
--#include "ucswipearea_p.h"
++#ifndef UCSWIPEAREA_P_P_H
++#define UCSWIPEAREA_P_P_H
++
++#include <UbuntuGestures/private/ucswipearea_p.h>
++
  #include <QtQuick/private/qquickitem_p.h>
--#include "damper_p.h"
++#include <UbuntuGestures/private/damper_p.h>
  UG_NAMESPACE_BEGIN
@@ -175,4 +175,4 @@
  UG_NAMESPACE_END
--#endif // UCSWIPEAREAPRIVATE_H
++#endif // UCSWIPEAREA_P_P_H
 === modified file 'src/UbuntuGestures/unownedtouchevent.cpp'
 --- src/UbuntuGestures/unownedtouchevent.cpp	2016-07-06 11:27:11 +0000
 +++ src/UbuntuGestures/unownedtouchevent.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include <UbuntuGestures/private/unownedtouchevent_p.h>
++#include "unownedtouchevent_p.h"
  UG_NAMESPACE_BEGIN
 === modified file 'src/UbuntuGestures/unownedtouchevent_p.h'
 --- src/UbuntuGestures/unownedtouchevent_p.h	2016-08-09 07:12:07 +0000
 +++ src/UbuntuGestures/unownedtouchevent_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H
--#define UBUNTU_UNOWNEDTOUCHEVENT_H
--
--#include <QTouchEvent>
--#include <QScopedPointer>
--#include "ubuntugesturesglobal.h"
++#ifndef UNOWNEDTOUCHEVENT_P_H
++#define UNOWNEDTOUCHEVENT_P_H
++
++#include <QtCore/QScopedPointer>
++#include <QtGui/QTouchEvent>
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
  UG_NAMESPACE_BEGIN
  /*
@@ -45,4 +46,4 @@
  UG_NAMESPACE_END
--#endif // UBUNTU_UNOWNEDTOUCHEVENT_H
++#endif // UNOWNEDTOUCHEVENT_P_H
 === modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
 --- src/UbuntuMetrics/applicationmonitor.cpp	2016-08-22 06:18:26 +0000
 +++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-09 22:15:37 +0000
@@ -16,6 +16,7 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include "applicationmonitor_p.h"
++
  #include <QtCore/QTimer>
  #include <QtGui/QGuiApplication>
  #include <QtQuick/QQuickWindow>
 === modified file 'src/UbuntuMetrics/applicationmonitor.h'
 --- src/UbuntuMetrics/applicationmonitor.h	2016-08-05 00:11:54 +0000
 +++ src/UbuntuMetrics/applicationmonitor.h	2016-09-09 22:15:37 +0000
@@ -18,10 +18,11 @@
  #ifndef APPLICATIONMONITOR_H
  #define APPLICATIONMONITOR_H
--#include <UbuntuMetrics/ubuntumetricsglobal.h>
++#include <QtCore/QList>
++
  #include <UbuntuMetrics/logger.h>
  #include <UbuntuMetrics/events.h>
--#include <QtCore/QList>
++#include <UbuntuMetrics/ubuntumetricsglobal.h>
  class UMApplicationMonitorPrivate;
 === modified file 'src/UbuntuMetrics/applicationmonitor_p.h'
 --- src/UbuntuMetrics/applicationmonitor_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/applicationmonitor_p.h	2016-09-09 22:15:37 +0000
@@ -18,10 +18,8 @@
  #ifndef APPLICATIONMONITOR_P_H
  #define APPLICATIONMONITOR_P_H
--#include "applicationmonitor.h"
--#include "overlay_p.h"
--#include "gputimer_p.h"
--#include "ubuntumetricsglobal_p.h"
++#include <UbuntuMetrics/applicationmonitor.h>
++
  #include <QtCore/QTimer>
  #include <QtCore/QThread>
  #include <QtCore/QMutex>
@@ -30,6 +28,10 @@
  #include <QtCore/QRunnable>
  #include <QtCore/QAtomicInteger>
++#include <UbuntuMetrics/private/overlay_p.h>
++#include <UbuntuMetrics/private/gputimer_p.h>
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
++
  class LoggingThread;
  class WindowMonitor;
  class QQuickWindow;
 === modified file 'src/UbuntuMetrics/bitmaptext.cpp'
 --- src/UbuntuMetrics/bitmaptext.cpp	2016-08-19 03:35:49 +0000
 +++ src/UbuntuMetrics/bitmaptext.cpp	2016-09-09 22:15:37 +0000
@@ -16,12 +16,14 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include <math.h>
++
++#include <QtCore/QtGlobal>
++#include <QtCore/QPoint>
++#include <QtCore/QSize>
++
  #include "bitmaptext_p.h"
  #include "bitmaptextfont_p.h"
  #include "ubuntumetricsglobal_p.h"
--#include <QtCore/QtGlobal>
--#include <QtCore/QSize>
--#include <QtCore/QPoint>
  static const GLchar* bitmapTextVertexShaderSource =
  #if !defined(QT_OPENGL_ES_2)
 === modified file 'src/UbuntuMetrics/bitmaptext_p.h'
 --- src/UbuntuMetrics/bitmaptext_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/bitmaptext_p.h	2016-09-09 22:15:37 +0000
@@ -18,9 +18,10 @@
  #ifndef BITMAPTEXT_P_H
  #define BITMAPTEXT_P_H
--#include "ubuntumetricsglobal_p.h"
  #include <QtGui/QOpenGLFunctions>
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
++
  // BitmapText renders a monospaced bitmap Latin-1 encoded text (128 characters)
  // stored in a single texture atlas using OpenGL. The font is generated by
  // bitmap-text-builder and stored in the bitmaptextfont_p.h header.
 === modified file 'src/UbuntuMetrics/events.cpp'
 --- src/UbuntuMetrics/events.cpp	2016-08-18 17:42:55 +0000
 +++ src/UbuntuMetrics/events.cpp	2016-09-09 22:15:37 +0000
@@ -16,12 +16,15 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include "events_p.h"
--#include "ubuntumetricsglobal_p.h"
--#include <QtCore/QElapsedTimer>
++
  #include <string.h>
  #include <unistd.h>
  #include <fcntl.h>
--#include <cstdio>
++#include <stdio.h>
++
++#include <QtCore/QElapsedTimer>
++
++#include "ubuntumetricsglobal_p.h"
  const int bufferSize = 128;
  const int bufferAlignment = 64;
 === modified file 'src/UbuntuMetrics/events_p.h'
 --- src/UbuntuMetrics/events_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/events_p.h	2016-09-09 22:15:37 +0000
@@ -18,10 +18,13 @@
  #ifndef EVENTS_P_H
  #define EVENTS_P_H
--#include "events.h"
--#include "ubuntumetricsglobal_p.h"
++#include <UbuntuMetrics/events.h>
++
++#include <sys/times.h>
++
  #include <QtCore/QElapsedTimer>
--#include <sys/times.h>
++
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
  class UBUNTU_METRICS_PRIVATE_EXPORT EventUtilsPrivate
+ {
 === modified file 'src/UbuntuMetrics/gputimer.cpp'
 --- src/UbuntuMetrics/gputimer.cpp	2016-07-26 13:41:18 +0000
 +++ src/UbuntuMetrics/gputimer.cpp	2016-09-09 22:15:37 +0000
@@ -16,8 +16,10 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include "gputimer_p.h"
++
++#include <QtCore/QElapsedTimer>
++
  #include "ubuntumetricsglobal_p.h"
--#include <QtCore/QElapsedTimer>
  #if !defined(QT_OPENGL_ES) && !defined(GL_TIME_ELAPSED)
  #define GL_TIME_ELAPSED 0x88BF  // For GL_EXT_timer_query.
 === modified file 'src/UbuntuMetrics/gputimer_p.h'
 --- src/UbuntuMetrics/gputimer_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/gputimer_p.h	2016-09-09 22:15:37 +0000
@@ -18,13 +18,15 @@
  #ifndef GPUTIMER_P_H
  #define GPUTIMER_P_H
--#include "ubuntumetricsglobal_p.h"
  #include <QtGui/QOpenGLFunctions>
++
  #if defined(QT_OPENGL_ES)
  #include <EGL/egl.h>
  #include <EGL/eglext.h>
  #endif
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
++
  // GPUTimer is used to measure the amount of time taken by the GPU to fully
  // complete a set of graphics commands. As opposed to a basic timer which would
  // determine the time taken by the graphics driver to push the graphics commands
 === modified file 'src/UbuntuMetrics/logger.cpp'
 --- src/UbuntuMetrics/logger.cpp	2016-08-06 00:54:30 +0000
 +++ src/UbuntuMetrics/logger.cpp	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include "logger_p.h"
--#include "ubuntumetricsglobal_p.h"
--#include "events.h"
++
++#include <dlfcn.h>
++
  #include <QtCore/QDir>
  #include <QtCore/QTime>
--// LTTng shared object runtime loading.
--#include <dlfcn.h>
++#include "events.h"
++#include "ubuntumetricsglobal_p.h"
  #define TRACEPOINT_DEFINE
  #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
  #include "lttng/lttng_p.h"
 === modified file 'src/UbuntuMetrics/logger.h'
 --- src/UbuntuMetrics/logger.h	2016-08-04 22:54:21 +0000
 +++ src/UbuntuMetrics/logger.h	2016-09-09 22:15:37 +0000
@@ -18,8 +18,9 @@
  #ifndef LOGGER_H
  #define LOGGER_H
++#include <QtCore/QFile>
++
  #include <UbuntuMetrics/ubuntumetricsglobal.h>
--#include <QtCore/QFile>
  class UMEvent;
  class UMFileLoggerPrivate;
 === modified file 'src/UbuntuMetrics/logger_p.h'
 --- src/UbuntuMetrics/logger_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/logger_p.h	2016-09-09 22:15:37 +0000
@@ -18,12 +18,14 @@
  #ifndef LOGGER_P_H
  #define LOGGER_P_H
--#include "logger.h"
--#include "ubuntumetricsglobal_p.h"
--#include "events.h"
++#include <UbuntuMetrics/logger.h>
++
  #include <QtCore/QFile>
  #include <QtCore/QTextStream>
++#include <UbuntuMetrics/events.h>
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
++
  class UBUNTU_METRICS_PRIVATE_EXPORT UMFileLoggerPrivate
+ {
  public:
 === modified file 'src/UbuntuMetrics/overlay.cpp'
 --- src/UbuntuMetrics/overlay.cpp	2016-07-26 13:41:18 +0000
 +++ src/UbuntuMetrics/overlay.cpp	2016-09-09 22:15:37 +0000
@@ -16,11 +16,14 @@
  // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
  #include "overlay_p.h"
--#include "ubuntumetricsglobal_p.h"
++
++#include <unistd.h>
++#include <fcntl.h>
++
  #include <QtCore/QSysInfo>
  #include <QtGui/QGuiApplication>
--#include <unistd.h>
--#include <fcntl.h>
++
++#include "ubuntumetricsglobal_p.h"
  static const QPointF position = QPointF(5.0f, 5.0f);
  static const float opacity = 0.85f;
 === modified file 'src/UbuntuMetrics/overlay_p.h'
 --- src/UbuntuMetrics/overlay_p.h	2016-08-05 15:07:39 +0000
 +++ src/UbuntuMetrics/overlay_p.h	2016-09-09 22:15:37 +0000
@@ -18,11 +18,12 @@
  #ifndef OVERLAY_P_H
  #define OVERLAY_P_H
--#include "ubuntumetricsglobal_p.h"
--#include "bitmaptext_p.h"
--#include "events.h"
  #include <QtCore/QSize>
++#include <UbuntuMetrics/events.h>
++#include <UbuntuMetrics/private/bitmaptext_p.h>
++#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
++
  #if !defined QT_NO_DEBUG
  class QOpenGLContext;
  #endif
 === modified file 'src/UbuntuMetrics/ubuntumetricsglobal.h'
 --- src/UbuntuMetrics/ubuntumetricsglobal.h	2016-07-22 10:47:24 +0000
 +++ src/UbuntuMetrics/ubuntumetricsglobal.h	2016-09-09 22:15:37 +0000
@@ -18,7 +18,7 @@
  #ifndef UBUNTUMETRICSGLOBAL_H
  #define UBUNTUMETRICSGLOBAL_H
--#include <QtCore/qglobal.h>
++#include <QtCore/QtGlobal>
  #if defined(QT_BUILD_UBUNTUMETRICS_LIB)
  #define UBUNTU_METRICS_EXPORT Q_DECL_EXPORT
 === modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
 --- src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-08-04 16:50:30 +0000
 +++ src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-09 22:15:37 +0000
@@ -18,7 +18,7 @@
  #ifndef UBUNTUMETRICSGLOBAL_P_H
  #define UBUNTUMETRICSGLOBAL_P_H
--#include "ubuntumetricsglobal.h"
++#include <UbuntuMetrics/ubuntumetricsglobal.h>
  // Logging macros, debug macros are compiled out for release builds.
  #define LOG(...) qDebug(__VA_ARGS__)
 === modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
 --- src/UbuntuToolkit/UbuntuToolkit.pro	2016-08-26 12:03:35 +0000
 +++ src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-09 22:15:37 +0000
@@ -1,16 +1,13 @@
  TEMPLATE=lib
  TARGET=UbuntuToolkit
--QT *= core-private gui-private qml qml-private quick quick-private testlib
++QT *= core-private gui-private qml-private quick-private testlib dbus svg organizer \
++      UbuntuGestures-private UbuntuMetrics
  unix {
      CONFIG += link_pkgconfig
      PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus
+ }
--QT *= dbus svg UbuntuGestures UbuntuGestures_private UbuntuMetrics
--
--# QOrganizer for Alarm API
--QT *= organizer
  !contains(QT_ARCH, arm) {
      DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
@@ -21,8 +18,6 @@
  CONFIG += dll no_keywords c++11
--INCLUDEPATH+=$$PWD
--
  DEFINES += UBUNTUTOOLKIT_LIBRARY
  #comment in the following line to disable traces
  #DEFINES += QT_NO_DEBUG_OUTPUT
@@ -47,7 +42,7 @@
      ubuntutoolkitmodule.h \
      splitview_p.h \
      splitview_p_p.h \
--    privates/splitviewhandler_p_p.h \
++    privates/splitviewhandler_p.h \
      menu_p_p.h \
      menubar_p_p.h \
      menu_p.h \
 === modified file 'src/UbuntuToolkit/actionlist.cpp'
 --- src/UbuntuToolkit/actionlist.cpp	2016-07-18 14:54:46 +0000
 +++ src/UbuntuToolkit/actionlist.cpp	2016-09-09 22:15:37 +0000
@@ -15,6 +15,7 @@
   */
  #include "actionlist_p.h"
++
  #include "ucaction_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/actionlist_p.h'
 --- src/UbuntuToolkit/actionlist_p.h	2016-07-18 14:54:46 +0000
 +++ src/UbuntuToolkit/actionlist_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef ACTIONLIST_H
--#define ACTIONLIST_H
++#ifndef ACTIONLIST_P_H
++#define ACTIONLIST_P_H
--#include <QObject>
++#include <QtCore/QObject>
  #include <QtQml/QQmlListProperty>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -55,4 +56,4 @@
  UT_NAMESPACE_END
--#endif // ACTIONLIST_H
++#endif // ACTIONLIST_P_H
 === modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.cpp'
 --- src/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "actionsproxy_p.h"
++#include "adapters/actionsproxy_p.h"
++
++#include <QtCore/QDebug>
++
  #include "ucactioncontext_p.h"
--#include <QDebug>
--
  Q_LOGGING_CATEGORY(ucActionProxy, "ubuntu.components.ActionProxy", QtMsgType::QtWarningMsg)
  #define AP_TRACE(params) qCDebug(ucActionProxy) << params
 === modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.h'
 --- src/UbuntuToolkit/adapters/actionsproxy_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/adapters/actionsproxy_p.h	2016-09-09 22:15:37 +0000
@@ -20,7 +20,8 @@
  #include <QtCore/QObject>
  #include <QtCore/QSet>
  #include <QtCore/QPointer>
--#include "ucaction_p.h"
++
++#include <UbuntuToolkit/private/ucaction_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp'
 --- src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-09-09 22:15:37 +0000
@@ -16,11 +16,7 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#include "ucalarm_p.h"
--#include "ucalarm_p_p.h"
--#include "alarmmanager_p_p.h"
--#include "alarmsadapter_p.h"
--#include <qorganizertodooccurrence.h>
++#include "adapters/alarmsadapter_p.h"
  #include <QtCore/QFile>
  #include <QtCore/QDir>
@@ -30,6 +26,10 @@
  #include <QtCore/QJsonObject>
  #include <QtCore/QJsonArray>
  #include <QtCore/QDebug>
++#include <QtOrganizer/QtOrganizer>
++
++#include "alarmmanager_p_p.h"
++#include "ucalarm_p_p.h"
  #define ALARM_DATABASE          "%1/alarms.json"
  /*
 === modified file 'src/UbuntuToolkit/adapters/alarmsadapter_p.h'
 --- src/UbuntuToolkit/adapters/alarmsadapter_p.h	2016-07-07 15:33:34 +0000
 +++ src/UbuntuToolkit/adapters/alarmsadapter_p.h	2016-09-09 22:15:37 +0000
@@ -19,13 +19,14 @@
  #ifndef ALARMSADAPTER_P_H
  #define ALARMSADAPTER_P_H
--#include "private/ucalarm_p_p.h"
--#include "private/alarmmanager_p_p.h"
++#include <QtOrganizer/QOrganizerManager>
++#include <QtOrganizer/QOrganizerAbstractRequest>
++#include <QtOrganizer/QOrganizerItemFetchRequest>
++#include <QtOrganizer/QOrganizerTodo>
--#include <qorganizer.h>
--#include <qorganizermanager.h>
--#include <qorganizertodo.h>
--#include <ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucalarm_p_p.h>
++#include <UbuntuToolkit/private/alarmmanager_p_p.h>
  QTORGANIZER_USE_NAMESPACE
 === modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp'
 --- src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-09-09 22:15:37 +0000
@@ -14,12 +14,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "dbuspropertywatcher_p.h"
++#include "adapters/dbuspropertywatcher_p.h"
++
++#include <sys/types.h>
++#include <unistd.h>
++
  #include <QtDBus/QDBusReply>
--#include <unistd.h>
--#include <sys/types.h>
++#include <QtQml/QQmlInfo>
++
  #include "i18n_p.h"
--#include <QtQml/QQmlInfo>
  #define DYNAMIC_PROPERTY    "__q_property"
 === modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h'
 --- src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h	2016-09-09 22:15:37 +0000
@@ -22,7 +22,7 @@
  #include <QtDBus/QDBusServiceWatcher>
  #include <QtDBus/QDBusInterface>
--#include "ucserviceproperties_p_p.h"
++#include <UbuntuToolkit/private/ucserviceproperties_p_p.h>
  class QDBusPendingCallWatcher;
 === modified file 'src/UbuntuToolkit/alarmmanager_p.cpp'
 --- src/UbuntuToolkit/alarmmanager_p.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/alarmmanager_p.cpp	2016-09-09 22:15:37 +0000
@@ -17,6 +17,7 @@
   */
  #include "alarmmanager_p_p.h"
++
  #include "ucalarm_p_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/alarmmanager_p.h'
 --- src/UbuntuToolkit/alarmmanager_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/alarmmanager_p.h	2016-09-09 22:15:37 +0000
@@ -16,14 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef ALARMMANAGER_H
--#define ALARMMANAGER_H
++#ifndef ALARMMANAGER_P_H
++#define ALARMMANAGER_P_H
  #include <QtCore/QObject>
++#include <QtCore/QSet>
  #include <QtQml/QQmlListProperty>
--#include <QtCore/QSet>
--#include "ucalarm_p.h"
++#include <UbuntuToolkit/private/ucalarm_p.h>
  UT_NAMESPACE_BEGIN
@@ -126,4 +126,4 @@
  UT_NAMESPACE_END
--#endif // ALARMMANAGER_H
++#endif // ALARMMANAGER_P_H
 === modified file 'src/UbuntuToolkit/alarmmanager_p_p.h'
 --- src/UbuntuToolkit/alarmmanager_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/alarmmanager_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,15 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef ALARMMANAGER_P_H
--#define ALARMMANAGER_P_H
--
--#include "ucalarm_p.h"
--#include "alarmmanager_p.h"
++#ifndef ALARMMANAGER_P_P_H
++#define ALARMMANAGER_P_P_H
++
++#include <UbuntuToolkit/private/alarmmanager_p.h>
++
  #include <QtCore/QUrl>
++#include <UbuntuToolkit/private/ucalarm_p.h>
++
  UT_NAMESPACE_BEGIN
  class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
@@ -61,4 +63,4 @@
  UT_NAMESPACE_END
--#endif // ALARMMANAGER_P_H
++#endif // ALARMMANAGER_P_P_H
 === modified file 'src/UbuntuToolkit/asyncloader_p.h'
 --- src/UbuntuToolkit/asyncloader_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/asyncloader_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef ASYNCLOADER_H
--#define ASYNCLOADER_H
++#ifndef ASYNCLOADER_P_H
++#define ASYNCLOADER_P_H
  #include <QtQml/QQmlComponent>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
  class QQmlContext;
@@ -60,4 +61,4 @@
  UT_NAMESPACE_END
--#endif // ASYNCLOADER_H
++#endif // ASYNCLOADER_P_H
 === modified file 'src/UbuntuToolkit/asyncloader_p_p.h'
 --- src/UbuntuToolkit/asyncloader_p_p.h	2016-07-07 15:33:34 +0000
 +++ src/UbuntuToolkit/asyncloader_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,14 +16,15 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef ASYNCLOADER_P_H
--#define ASYNCLOADER_P_H
++#ifndef ASYNCLOADER_P_P_H
++#define ASYNCLOADER_P_P_H
++
++#include <UbuntuToolkit/private/asyncloader_p.h>
  #include <QtCore/private/qobject_p.h>
  #include <QtQml/QQmlIncubator>
--#include <ubuntutoolkitglobal.h>
--#include <UbuntuToolkit/private/asyncloader_p.h>
--#include <UbuntuToolkit/private/asyncloader_p_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -52,4 +53,4 @@
  UT_NAMESPACE_END
--#endif // ASYNCLOADER_P_H
++#endif // ASYNCLOADER_P_P_H
 === modified file 'src/UbuntuToolkit/colorutils.cpp'
 --- src/UbuntuToolkit/colorutils.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/colorutils.cpp	2016-09-09 22:15:37 +0000
@@ -15,7 +15,8 @@
   */
  #include "colorutils_p.h"
--#include <QColor>
++
++#include <QtGui/QColor>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/colorutils_p.h'
 --- src/UbuntuToolkit/colorutils_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/colorutils_p.h	2016-09-09 22:15:37 +0000
@@ -13,11 +13,13 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef COLORUTILS_H
--#define COLORUTILS_H
--
--#include <QObject>
--#include "ubuntutoolkitglobal.h"
++
++#ifndef COLORUTILS_P_H
++#define COLORUTILS_P_H
++
++#include <QtCore/QObject>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -31,4 +33,4 @@
  UT_NAMESPACE_END
--#endif // COLORUTILS_H
++#endif // COLORUTILS_P_H
 === modified file 'src/UbuntuToolkit/exclusivegroup.cpp'
 --- src/UbuntuToolkit/exclusivegroup.cpp	2016-07-18 14:54:46 +0000
 +++ src/UbuntuToolkit/exclusivegroup.cpp	2016-09-09 22:15:37 +0000
@@ -12,14 +12,14 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "exclusivegroup_p.h"
++
++#include <QtCore/QSignalMapper>
++
  #include "ucaction_p.h"
--#include <QSignalMapper>
--
  #define CHECKED_PROPERTY "checked"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/exclusivegroup_p.h'
 --- src/UbuntuToolkit/exclusivegroup_p.h	2016-08-22 08:23:50 +0000
 +++ src/UbuntuToolkit/exclusivegroup_p.h	2016-09-09 22:15:37 +0000
@@ -12,17 +12,16 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef EXCLUSIVEGROUP_H
--#define EXCLUSIVEGROUP_H
--
--#include "actionlist_p.h"
--#include "ubuntutoolkitglobal.h"
--
--#include <QMetaMethod>
--#include <QPointer>
++#ifndef EXCLUSIVEGROUP_P_H
++#define EXCLUSIVEGROUP_P_H
++
++#include <QtCore/QMetaMethod>
++#include <QtCore/QPointer>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/actionlist_p.h>
  class QSignalMapper;
@@ -59,4 +58,4 @@
  UT_NAMESPACE_END
--#endif // EXCLUSIVEGROUP_H
++#endif // EXCLUSIVEGROUP_P_H
 === modified file 'src/UbuntuToolkit/filterbehavior_p.h'
 --- src/UbuntuToolkit/filterbehavior_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/filterbehavior_p.h	2016-09-09 22:15:37 +0000
@@ -17,11 +17,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef FILTERBEHAVIOR_H
--#define FILTERBEHAVIOR_H
--
--#include <QSortFilterProxyModel>
--#include <ubuntutoolkitglobal.h>
++#ifndef FILTERBEHAVIOR_P_H
++#define FILTERBEHAVIOR_P_H
++
++#include <QtCore/QSortFilterProxyModel>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -50,4 +51,4 @@
  UT_NAMESPACE_END
--#endif // FILTERBEHAVIOR_H
++#endif // FILTERBEHAVIOR_P_H
 === modified file 'src/UbuntuToolkit/i18n.cpp'
 --- src/UbuntuToolkit/i18n.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/i18n.cpp	2016-09-09 22:15:37 +0000
@@ -17,18 +17,19 @@
   */
  #include "i18n_p.h"
--#include "timeutils_p.h"
--#include <QtCore/QDir>
  namespace C {
  #include <libintl.h>
  #include <glib.h>
  #include <glib/gi18n.h>
+ }
--
  #include <stdlib.h>
  #include <locale.h>
++#include <QtCore/QDir>
++
++#include "timeutils_p.h"
++
  UT_NAMESPACE_BEGIN
  /*!
   * \qmltype i18n
 === modified file 'src/UbuntuToolkit/i18n_p.h'
 --- src/UbuntuToolkit/i18n_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/i18n_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Tim Peeters <tim.peeters@canonical.com>
   */
--#ifndef UBUNTU_COMPONENTS_I18N_H
--#define UBUNTU_COMPONENTS_I18N_H
++#ifndef I18N_P_H
++#define I18N_P_H
  #include <QtCore/QObject>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlContext;
  class QQmlEngine;
@@ -80,4 +81,4 @@
  UT_NAMESPACE_END
--#endif // UBUNTU_COMPONENTS_I18N_H
++#endif // I18N_P_H
 === modified file 'src/UbuntuToolkit/inversemouseareatype.cpp'
 --- src/UbuntuToolkit/inversemouseareatype.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/inversemouseareatype.cpp	2016-09-09 22:15:37 +0000
@@ -15,7 +15,9 @@
   */
  #include "inversemouseareatype_p.h"
++
  #include <QtGui/QGuiApplication>
++
  #include "quickutils_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/inversemouseareatype_p.h'
 --- src/UbuntuToolkit/inversemouseareatype_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/inversemouseareatype_p.h	2016-09-09 22:15:37 +0000
@@ -13,12 +13,14 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef INVERSEMOUSEAREATYPE_H
--#define INVERSEMOUSEAREATYPE_H
--
--#include <private/qquickmousearea_p.h>
++
++#ifndef INVERSEMOUSEAREATYPE_P_H
++#define INVERSEMOUSEAREATYPE_P_H
++
  #include <QtCore/QPointer>
--#include <ubuntutoolkitglobal.h>
++#include <QtQuick/private/qquickmousearea_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
@@ -73,4 +75,4 @@
  UT_NAMESPACE_END
--#endif // INVERSEMOUSEAREATYPE_H
++#endif // INVERSEMOUSEAREATYPE_P_H
 === modified file 'src/UbuntuToolkit/label_p.h'
 --- src/UbuntuToolkit/label_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/label_p.h	2016-09-09 22:15:37 +0000
@@ -14,8 +14,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LABEL_P
--#define LABEL_P
++#ifndef LABEL_P_H
++#define LABEL_P_H
  #include "uclabel_p.h"
@@ -59,4 +59,4 @@
  UT_NAMESPACE_END
--#endif // LABEL_P
++#endif // LABEL_P_H
 === modified file 'src/UbuntuToolkit/listener.cpp'
 --- src/UbuntuToolkit/listener.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/listener.cpp	2016-09-09 22:15:37 +0000
@@ -16,7 +16,7 @@
  #include "listener_p.h"
--#include <QQmlContext>
++#include <QtQml/QQmlContext>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/listener_p.h'
 --- src/UbuntuToolkit/listener_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/listener_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UBUNTU_COMPONENTS_LISTENER_H
--#define UBUNTU_COMPONENTS_LISTENER_H
++#ifndef LISTENER_P_H
++#define LISTENER_P_H
  #include <QtCore/QObject>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlContext;
@@ -36,4 +37,4 @@
  UT_NAMESPACE_END
--#endif // UBUNTU_COMPONENTS_PLUGIN_H
++#endif // LISTENER_P_H
 === modified file 'src/UbuntuToolkit/livetimer_p.cpp'
 --- src/UbuntuToolkit/livetimer_p.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/livetimer_p.cpp	2016-09-09 22:15:37 +0000
@@ -15,10 +15,11 @@
   */
  #include "livetimer_p_p.h"
++
++#include <QtDBus/QDBusConnection>
++
  #include "timeutils_p.h"
--#include <QDBusConnection>
--
  UT_NAMESPACE_BEGIN
  SharedLiveTimer::SharedLiveTimer(QObject* parent)
 === modified file 'src/UbuntuToolkit/livetimer_p.h'
 --- src/UbuntuToolkit/livetimer_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/livetimer_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LIVETIMER_H
--#define LIVETIMER_H
--
--#include <QObject>
--#include <QDateTime>
--#include <ubuntutoolkitglobal.h>
++#ifndef LIVETIMER_P_H
++#define LIVETIMER_P_H
++
++#include <QtCore/QDateTime>
++#include <QtCore/QObject>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -70,4 +71,4 @@
  UT_NAMESPACE_END
--#endif // LIVETIMER_H
++#endif // LIVETIMER_P_H
 === modified file 'src/UbuntuToolkit/livetimer_p_p.h'
 --- src/UbuntuToolkit/livetimer_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/livetimer_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LIVETIMER_P_H
--#define LIVETIMER_P_H
--
--#include "livetimer_p.h"
--
--#include <QTimer>
++#ifndef LIVETIMER_P_P_H
++#define LIVETIMER_P_P_H
++
++#include <UbuntuToolkit/private/livetimer_p.h>
++
++#include <QtCore/QTimer>
  UT_NAMESPACE_BEGIN
@@ -59,4 +59,4 @@
  UT_NAMESPACE_END
--#endif // LIVETIMER_P_H
++#endif // LIVETIMER_P_P_H
 === modified file 'src/UbuntuToolkit/menu.cpp'
 --- src/UbuntuToolkit/menu.cpp	2016-09-02 12:11:02 +0000
 +++ src/UbuntuToolkit/menu.cpp	2016-09-09 22:15:37 +0000
@@ -14,23 +14,22 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "menu_p.h"
  #include "menu_p_p.h"
++
++#include <functional>
++
++#include <QtCore/QPointer>
++#include <QtCore/QLoggingCategory>
++#include <QtGui/qpa/qplatformtheme.h>
++#include <QtGui/qpa/qplatformmenu.h>
++#include <QtGui/private/qguiapplication_p.h>
++#include <QtQuick/QQuickItem>
++#include <QtQuick/private/qquickitem_p.h>
++
  #include "menubar_p.h"
  #include "actionlist_p.h"
  #include "menugroup_p.h"
--// Qt
--#include <QPointer>
--#include <QQuickItem>
--#include <QLoggingCategory>
--#include <QtGui/qpa/qplatformtheme.h>
--#include <QtGui/qpa/qplatformmenu.h>
--#include <private/qguiapplication_p.h>
--#include <private/qquickitem_p.h>
--
--#include <functional>
--
  Q_LOGGING_CATEGORY(ucMenu, "ubuntu.components.Menu", QtMsgType::QtWarningMsg)
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/menu_p.h'
 --- src/UbuntuToolkit/menu_p.h	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menu_p.h	2016-09-09 22:15:37 +0000
@@ -12,18 +12,17 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #ifndef MENU_P_H
  #define MENU_P_H
--#include <QQmlListProperty>
--#include <QLoggingCategory>
--#include <QPointer>
--#include <ubuntutoolkitglobal.h>
++#include <QtCore/QLoggingCategory>
++#include <QtCore/QPointer>
++#include <QtQml/QQmlListProperty>
--#include "ucaction_p.h"
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucaction_p.h>
  Q_DECLARE_LOGGING_CATEGORY(ucMenu);
 === modified file 'src/UbuntuToolkit/menu_p_p.h'
 --- src/UbuntuToolkit/menu_p_p.h	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menu_p_p.h	2016-09-09 22:15:37 +0000
@@ -12,14 +12,14 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #ifndef MENU_P_P_H
  #define MENU_P_P_H
--#include "menu_p.h"
--#include <ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/menu_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QObject;
  class QQmlComponent;
 === modified file 'src/UbuntuToolkit/menubar.cpp'
 --- src/UbuntuToolkit/menubar.cpp	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menubar.cpp	2016-09-09 22:15:37 +0000
@@ -12,19 +12,16 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#include "menubar_p.h"
  #include "menubar_p_p.h"
--// Qt
--#include <QQuickItem>
--#include <QQuickWindow>
--#include <QLoggingCategory>
--#include <private/qguiapplication_p.h>
++#include <QtCore/QLoggingCategory>
++#include <QtQuick/QQuickItem>
++#include <QtQuick/QQuickWindow>
  #include <QtGui/qpa/qplatformtheme.h>
  #include <QtGui/qpa/qplatformmenu.h>
++#include <QtGui/private/qguiapplication_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/menubar_p.h'
 --- src/UbuntuToolkit/menubar_p.h	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menubar_p.h	2016-09-09 22:15:37 +0000
@@ -12,16 +12,15 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #ifndef MENUBAR_P_H
  #define MENUBAR_P_H
--#include "menu_p.h"
--#include <ubuntutoolkitglobal.h>
++#include <QtQml/QQmlParserStatus>
--#include <QQmlParserStatus>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/menu_p.h>
  class QPlatformMenuBar;
 === modified file 'src/UbuntuToolkit/menubar_p_p.h'
 --- src/UbuntuToolkit/menubar_p_p.h	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menubar_p_p.h	2016-09-09 22:15:37 +0000
@@ -12,14 +12,14 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #ifndef MENUBAR_P_P_H
  #define MENUBAR_P_P_H
--#include "menubar_p.h"
--#include <ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/menubar_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QPlatformMenuBar;
 === modified file 'src/UbuntuToolkit/menugroup.cpp'
 --- src/UbuntuToolkit/menugroup.cpp	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menugroup.cpp	2016-09-09 22:15:37 +0000
@@ -15,6 +15,7 @@
   */
  #include "menugroup_p.h"
++
  #include "actionlist_p.h"
  #include "ucaction_p.h"
 === modified file 'src/UbuntuToolkit/menugroup_p.h'
 --- src/UbuntuToolkit/menugroup_p.h	2016-08-25 14:06:06 +0000
 +++ src/UbuntuToolkit/menugroup_p.h	2016-09-09 22:15:37 +0000
@@ -17,11 +17,11 @@
  #ifndef MENUGROUP_P_H
  #define MENUGROUP_P_H
--#include <ubuntutoolkitglobal.h>
++#include <QtCore/QObject>
++#include <QtCore/QVector>
++#include <QtQml/QQmlListProperty>
--#include <QObject>
--#include <QVector>
--#include <QQmlListProperty>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/mousetouchadaptor.cpp'
 --- src/UbuntuToolkit/mousetouchadaptor.cpp	2016-07-07 07:56:34 +0000
 +++ src/UbuntuToolkit/mousetouchadaptor.cpp	2016-09-09 22:15:37 +0000
@@ -19,12 +19,11 @@
  #include "mousetouchadaptor_p_p.h"
--#include <qpa/qplatformnativeinterface.h>
--#include <qpa/qwindowsysteminterface.h>
--
--#include <QCoreApplication>
--#include <QMouseEvent>
--#include <QTest>
++#include <QtCore/QDebug>
++#include <QtGui/QGuiApplication>
++#include <QtGui/QMouseEvent>
++#include <QtGui/qpa/qplatformnativeinterface.h>
++#include <QtGui/qpa/qwindowsysteminterface.h>
  #ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
      #define ENABLE_TOUCH_EMULATION
 === modified file 'src/UbuntuToolkit/mousetouchadaptor_p.h'
 --- src/UbuntuToolkit/mousetouchadaptor_p.h	2016-07-07 18:17:56 +0000
 +++ src/UbuntuToolkit/mousetouchadaptor_p.h	2016-09-09 22:15:37 +0000
@@ -17,13 +17,13 @@
   *              Zsombor Egri <zsomboir.egri@canonical.com>
   */
--#ifndef MOUSE_TOUCH_ADAPTOR_H
--#define MOUSE_TOUCH_ADAPTOR_H
--
--#include "ubuntutoolkitglobal.h"
++#ifndef MOUSETOUCHADAPTOR_P_H
++#define MOUSETOUCHADAPTOR_P_H
  #include <QtCore/QObject>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++
  class QMouseEvent;
  class QTouchDevice;
  class QQmlEngine;
@@ -60,4 +60,4 @@
  UT_NAMESPACE_END
--#endif // MOUSE_TOUCH_ADAPTOR_H
++#endif // MOUSETOUCHADAPTOR_P_H
 === modified file 'src/UbuntuToolkit/mousetouchadaptor_p_p.h'
 --- src/UbuntuToolkit/mousetouchadaptor_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/mousetouchadaptor_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,15 @@
   * Authored by: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef MOUSETOUCHADAPTOR_P
--#define MOUSETOUCHADAPTOR_P
--
--#include "mousetouchadaptor_p.h"
++#ifndef MOUSETOUCHADAPTOR_P_P_H
++#define MOUSETOUCHADAPTOR_P_P_H
++
++#include <UbuntuToolkit/private/mousetouchadaptor_p.h>
++
++#include <QtCore/QAbstractNativeEventFilter>
  #include <QtCore/private/qobject_p.h>
--#include <QtCore/QAbstractNativeEventFilter>
--#include <QWindow>
++#include <QtGui/QWindow>
++
  #include <xcb/xcb.h>
  UT_NAMESPACE_BEGIN
@@ -73,5 +75,4 @@
  UT_NAMESPACE_END
--#endif // MOUSETOUCHADAPTOR_P
--
++#endif // MOUSETOUCHADAPTOR_P_P_H
 === modified file 'src/UbuntuToolkit/mousetouchadaptor_x11.cpp'
 --- src/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-09-09 22:15:37 +0000
@@ -55,11 +55,10 @@
  #include "mousetouchadaptor_p_p.h"
--#include <qpa/qplatformnativeinterface.h>
--
--#include <QCoreApplication>
--#include <QMouseEvent>
--#include <QTest>
++#include <QtGui/QGuiApplication>
++#include <QtGui/QMouseEvent>
++#include <QtGui/qpa/qplatformnativeinterface.h>
++#include <QtTest/qtesttouch.h>
  #include <X11/extensions/XInput2.h>
  #include <X11/extensions/XI2proto.h>
 === modified file 'src/UbuntuToolkit/privates/appheaderbase.cpp'
 --- src/UbuntuToolkit/privates/appheaderbase.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/appheaderbase.cpp	2016-09-09 22:15:37 +0000
@@ -15,6 +15,7 @@
   */
  #include "appheaderbase_p.h"
++
  #include "ucstyleditembase_p_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/appheaderbase_p.h'
 --- src/UbuntuToolkit/privates/appheaderbase_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/appheaderbase_p.h	2016-09-09 22:15:37 +0000
@@ -14,10 +14,10 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef APPHEADERBASE_H
--#define APPHEADERBASE_H
++#ifndef APPHEADERBASE_P_H
++#define APPHEADERBASE_P_H
--#include "ucheader_p.h"
++#include <UbuntuToolkit/private/ucheader_p.h>
  UT_NAMESPACE_BEGIN
@@ -62,4 +62,4 @@
  UT_NAMESPACE_END
--#endif // APPHEADERBASE_H
++#endif // APPHEADERBASE_P_H
 === modified file 'src/UbuntuToolkit/privates/frame.cpp'
 --- src/UbuntuToolkit/privates/frame.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/frame.cpp	2016-09-09 22:15:37 +0000
@@ -16,11 +16,13 @@
   * Author: Loïc Molinari <loic.molinari@canonical.com>
   */
--#include "frame_p.h"
--#include "textures_p.h"
++#include "privates/frame_p.h"
++
  #include <QtGui/QOpenGLContext>
  #include <QtGui/QOpenGLFunctions>
++#include "privates/textures_p.h"
++
  UT_NAMESPACE_BEGIN
  const QRgb defaultColor = qRgba(255, 255, 255, 255);
 === modified file 'src/UbuntuToolkit/privates/frame_p.h'
 --- src/UbuntuToolkit/privates/frame_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/frame_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Loïc Molinari <loic.molinari@canonical.com>
   */
--#ifndef FRAME_H
--#define FRAME_H
++#ifndef FRAME_P_H
++#define FRAME_P_H
  #include <QtQuick/QQuickItem>
  #include <QtQuick/QSGMaterial>
  #include <QtQuick/QSGNode>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -101,4 +102,4 @@
  UT_NAMESPACE_END
--#endif  // FRAME_H
++#endif  // FRAME_P_H
 === modified file 'src/UbuntuToolkit/privates/listitemdragarea.cpp'
 --- src/UbuntuToolkit/privates/listitemdragarea.cpp	2016-08-14 09:06:34 +0000
 +++ src/UbuntuToolkit/privates/listitemdragarea.cpp	2016-09-09 22:15:37 +0000
@@ -15,15 +15,17 @@
   */
  #include "listitemdragarea_p.h"
--#include "listitemdraghandler_p.h"
--#include "uclistitem_p_p.h"
--#include "ucunits_p.h"
--#include "i18n_p.h"
++
  #include <QtCore/QtMath>
  #include <QtQml/QQmlInfo>
  #include <QtQuick/private/qquickitem_p.h>
  #include <QtQuick/private/qquickflickable_p.h>
++#include "privates/listitemdraghandler_p.h"
++#include "uclistitem_p_p.h"
++#include "ucunits_p.h"
++#include "i18n_p.h"
++
  #define IMPLICIT_DRAG_WIDTH_GU  5
  #define DRAG_SCROLL_TIMEOUT     15
 === modified file 'src/UbuntuToolkit/privates/listitemdragarea_p.h'
 --- src/UbuntuToolkit/privates/listitemdragarea_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listitemdragarea_p.h	2016-09-09 22:15:37 +0000
@@ -14,14 +14,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LISTITEMDRAGAREA_H
--#define LISTITEMDRAGAREA_H
++#ifndef LISTITEMDRAGAREA_P_H
++#define LISTITEMDRAGAREA_P_H
--#include <ubuntutoolkitglobal.h>
--#include "uclistitem_p.h"
  #include <QtCore/QBasicTimer>
  #include <QtCore/QPointer>
++#include <UbuntuToolkit/private/uclistitem_p.h>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++
  class QQuickFlickable;
  UT_NAMESPACE_BEGIN
@@ -58,4 +59,4 @@
  UT_NAMESPACE_END
--#endif // LISTITEMDRAGAREA_H
++#endif // LISTITEMDRAGAREA_P_H
 === modified file 'src/UbuntuToolkit/privates/listitemdraghandler.cpp'
 --- src/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "listitemdraghandler_p.h"
--#include "uclistitem_p.h"
++#include "privates/listitemdraghandler_p.h"
++
++#include <QtQuick/private/qquickanimation_p.h>
++
  #include "uclistitem_p_p.h"
--#include <propertychange_p.h>
--#include <QtQuick/private/qquickanimation_p.h>
++#include "propertychange_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/listitemdraghandler_p.h'
 --- src/UbuntuToolkit/privates/listitemdraghandler_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listitemdraghandler_p.h	2016-09-09 22:15:37 +0000
@@ -14,13 +14,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LISTITEMDRAGHANDLER_H
--#define LISTITEMDRAGHANDLER_H
++#ifndef LISTITEMDRAGHANDLER_P_H
++#define LISTITEMDRAGHANDLER_P_H
  #include <QtCore/QObject>
  #include <QtCore/QPointer>
  #include <QtCore/QPointF>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -49,4 +50,4 @@
  UT_NAMESPACE_END
--#endif // LISTITEMDRAGHANDLER_H
++#endif // LISTITEMDRAGHANDLER_P_H
 === modified file 'src/UbuntuToolkit/privates/listitemselection.cpp'
 --- src/UbuntuToolkit/privates/listitemselection.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listitemselection.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "listitemselection_p.h"
++#include "privates/listitemselection_p.h"
++
  #include "uclistitem_p_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/listitemselection_p.h'
 --- src/UbuntuToolkit/privates/listitemselection_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listitemselection_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef LISTITEMSELECTION_H
--#define LISTITEMSELECTION_H
++#ifndef LISTITEMSELECTION_P_H
++#define LISTITEMSELECTION_P_H
  #include <QtCore/QObject>
  #include <QtCore/QPointer>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -58,4 +59,4 @@
  UT_NAMESPACE_END
--#endif // LISTITEMSELECTION_H
++#endif // LISTITEMSELECTION_P_H
 === modified file 'src/UbuntuToolkit/privates/listviewextensions.cpp'
 --- src/UbuntuToolkit/privates/listviewextensions.cpp	2016-08-01 13:19:05 +0000
 +++ src/UbuntuToolkit/privates/listviewextensions.cpp	2016-09-09 22:15:37 +0000
@@ -16,13 +16,15 @@
   * Author Zsombor Egri <zsombor.egri@canonical.com>
   */
--#include "listviewextensions_p.h"
--#include "uclistitem_p_p.h"
--#include "quickutils_p.h"
++#include "privates/listviewextensions_p.h"
++
  #include <QtQuick/QQuickItem>
  #include <QtQuick/private/qquickflickable_p.h>
  #include <QtQuick/private/qquickitemview_p.h> // for QQuickItemView::BottomToTop
++#include "uclistitem_p_p.h"
++#include "quickutils_p.h"
++
  UT_NAMESPACE_BEGIN
  ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent)
 === modified file 'src/UbuntuToolkit/privates/listviewextensions_p.h'
 --- src/UbuntuToolkit/privates/listviewextensions_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/listviewextensions_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef LISTVIEWEXTENSIONS_H
--#define LISTVIEWEXTENSIONS_H
++#ifndef LISTVIEWEXTENSIONS_P_H
++#define LISTVIEWEXTENSIONS_P_H
  #include <QtCore/QObject>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickFlickable;
  class QQuickItem;
@@ -63,4 +64,4 @@
  UT_NAMESPACE_END
--#endif // LISTVIEWEXTENSIONS_H
++#endif // LISTVIEWEXTENSIONS_P_H
 === modified file 'src/UbuntuToolkit/privates/splitviewhandler.cpp'
 --- src/UbuntuToolkit/privates/splitviewhandler.cpp	2016-08-26 05:40:23 +0000
 +++ src/UbuntuToolkit/privates/splitviewhandler.cpp	2016-09-09 22:15:37 +0000
@@ -16,13 +16,15 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#include "splitviewhandler_p_p.h"
++#include "privates/splitviewhandler_p.h"
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlInfo>
  #include <QtQuick/private/qquickanchors_p.h>
  #include <QtQuick/private/qquickitem_p.h>
  #include <QtQuick/private/qquickevents_p_p.h>
--#include <QtQml/QQmlEngine>
--#include <QtQml/QQmlInfo>
--#include <splitview_p_p.h>
++
++#include "splitview_p_p.h"
  UT_NAMESPACE_BEGIN
 === renamed file 'src/UbuntuToolkit/privates/splitviewhandler_p_p.h' => 'src/UbuntuToolkit/privates/splitviewhandler_p.h'
 --- src/UbuntuToolkit/privates/splitviewhandler_p_p.h	2016-08-26 05:40:23 +0000
 +++ src/UbuntuToolkit/privates/splitviewhandler_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef SPLITVIEWHANDLER_H
--#define SPLITVIEWHANDLER_H
++#ifndef SPLITVIEWHANDLER_P_H
++#define SPLITVIEWHANDLER_P_H
++#include <QtCore/QPointer>
  #include <QtQuick/QQuickItem>
--#include <QtCore/QPointer>
  #include <QtQuick/private/qquickmousearea_p.h>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -49,4 +50,4 @@
  UT_NAMESPACE_END
--#endif // SPLITVIEWHANDLER_H
++#endif // SPLITVIEWHANDLER_P_H
 === modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.cpp'
 --- src/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-07-18 17:18:13 +0000
 +++ src/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-09-09 22:15:37 +0000
@@ -14,7 +14,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "threelabelsslot_p.h"
++#include "privates/threelabelsslot_p.h"
++
  #include "label_p.h"
  #include "ucunits_p.h"
  #include "ucfontutils_p.h"
 === modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.h'
 --- src/UbuntuToolkit/privates/threelabelsslot_p.h	2016-06-21 13:16:07 +0000
 +++ src/UbuntuToolkit/privates/threelabelsslot_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef THREELABELSSLOT_H
--#define THREELABELSSLOT_H
--
--#include <QQuickItem>
--#include <private/qquickitem_p.h>
--#include <ubuntutoolkitglobal.h>
++#ifndef THREELABELSSLOT_P_H
++#define THREELABELSSLOT_P_H
++
++#include <QtQuick/private/qquickitem_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  //The padding between title and the string below it (i.e. subtitle, or
  //summary, when subtitle is empty)
@@ -89,4 +89,4 @@
  UT_NAMESPACE_END
--#endif // THREELABELSSLOT_H
++#endif // THREELABELSSLOT_P_H
 === modified file 'src/UbuntuToolkit/privates/ucpagewrapper.cpp'
 --- src/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-08-08 11:51:22 +0000
 +++ src/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "ucpagewrapper_p_p.h"
--#include "ucpagewrapperincubator_p.h"
--
--#include <QQmlEngine>
--#include <QQmlContext>
++#include "privates/ucpagewrapper_p_p.h"
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlContext>
++
++#include "privates/ucpagewrapperincubator_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p.h'
 --- src/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,11 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCPAGEWRAPPER_H
--#define UCPAGEWRAPPER_H
++#ifndef UCPAGEWRAPPER_P_H
++#define UCPAGEWRAPPER_P_H
--#include <ubuntutoolkitglobal.h>
--#include "ucpagetreenode_p.h"
++#include <UbuntuToolkit/private/ucpagetreenode_p.h>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p_p.h'
 --- src/UbuntuToolkit/privates/ucpagewrapper_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/privates/ucpagewrapper_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCPAGEWRAPPER_P_H
--#define UCPAGEWRAPPER_P_H
--
--#include <ubuntutoolkitglobal.h>
--#include "ucpagetreenode_p_p.h"
--#include "ucpagewrapper_p.h"
++#ifndef UCPAGEWRAPPER_P_P_H
++#define UCPAGEWRAPPER_P_P_H
++
++#include <UbuntuToolkit/private/ucpagewrapper_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucpagetreenode_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -80,4 +81,4 @@
  UT_NAMESPACE_END
--#endif // UCPAGEWRAPPER_P_H
++#endif // UCPAGEWRAPPER_P_P_H
 === modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp'
 --- src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp	2016-06-17 11:26:12 +0000
 +++ src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp	2016-09-09 22:15:37 +0000
@@ -14,9 +14,10 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "ucpagewrapperincubator_p.h"
--#include <QVariantMap>
--#include <QQmlInfo>
++#include "privates/ucpagewrapperincubator_p.h"
++
++#include <QtCore/QVariantMap>
++#include <QtQml/QQmlInfo>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h'
 --- src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h	2016-06-17 11:26:12 +0000
 +++ src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h	2016-09-09 22:15:37 +0000
@@ -14,14 +14,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCPAGEWRAPPERINCUBATOR_H
--#define UCPAGEWRAPPERINCUBATOR_H
--
--#include <QObject>
--#include <QQmlIncubator>
--#include <QJSValue>
--#include <QVariant>
--#include <ubuntutoolkitglobal.h>
++#ifndef UCPAGEWRAPPERINCUBATOR_P_H
++#define UCPAGEWRAPPERINCUBATOR_P_H
++
++#include <QtCore/QObject>
++#include <QtCore/QVariant>
++#include <QtQml/QQmlIncubator>
++#include <QtQml/QJSValue>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -61,4 +62,4 @@
  UT_NAMESPACE_END
--#endif // UCPAGEWRAPPERINCUBATOR_H
++#endif // UCPAGEWRAPPERINCUBATOR_P_H
 === modified file 'src/UbuntuToolkit/privates/ucscrollbarutils.cpp'
 --- src/UbuntuToolkit/privates/ucscrollbarutils.cpp	2016-08-01 13:48:02 +0000
 +++ src/UbuntuToolkit/privates/ucscrollbarutils.cpp	2016-09-09 22:15:37 +0000
@@ -16,7 +16,8 @@
   * Author: Andrea Bernabei <andrea.bernabei@canonical.com>
   */
--#include "ucscrollbarutils_p.h"
++#include "privates/ucscrollbarutils_p.h"
++
  #include <QtQuick/private/qquickitem_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/privates/ucscrollbarutils_p.h'
 --- src/UbuntuToolkit/privates/ucscrollbarutils_p.h	2016-08-01 13:48:02 +0000
 +++ src/UbuntuToolkit/privates/ucscrollbarutils_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Andrea Bernabei <andrea.bernabei@canonical.com>
   */
--#ifndef UCSCROLLBARUTILS_H
--#define UCSCROLLBARUTILS_H
--
--#include <QObject>
--#include <ubuntutoolkitglobal.h>
++#ifndef UCSCROLLBARUTILS_P_H
++#define UCSCROLLBARUTILS_P_H
++
++#include <QtCore/QObject>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
@@ -38,4 +39,4 @@
  UT_NAMESPACE_END
--#endif // UCSCROLLBARUTILS_H
++#endif // UCSCROLLBARUTILS_P_H
 === modified file 'src/UbuntuToolkit/propertychange_p.h'
 --- src/UbuntuToolkit/propertychange_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/propertychange_p.h	2016-09-09 22:15:37 +0000
@@ -17,14 +17,14 @@
  #ifndef PROPERTYCHANGE_P_H
  #define PROPERTYCHANGE_P_H
++#include <QtCore/QObject>
  #include <QtCore/QVariant>
--#include <QtCore/QObject>
++#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
++#include <QtCore/QExplicitlySharedDataPointer>
++#endif
  #include <QtQml/QQmlProperty>
--#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
--#include <QtCore/QExplicitlySharedDataPointer>
--#endif
--#include <ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlAbstractBinding;
 === modified file 'src/UbuntuToolkit/qquickclipboard.cpp'
 --- src/UbuntuToolkit/qquickclipboard.cpp	2016-07-07 18:17:56 +0000
 +++ src/UbuntuToolkit/qquickclipboard.cpp	2016-09-09 22:15:37 +0000
@@ -16,10 +16,11 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
++#include "qquickclipboard_p_p.h"
++
  #include <QtGui/QClipboard>
  #include <QtGui/QGuiApplication>
--#include "qquickclipboard_p_p.h"
  #include "qquickmimedata_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/qquickclipboard_p.h'
 --- src/UbuntuToolkit/qquickclipboard_p.h	2016-07-07 18:17:56 +0000
 +++ src/UbuntuToolkit/qquickclipboard_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef QQUICKCLIPBOARD_H
--#define QQUICKCLIPBOARD_H
++#ifndef QQUICKCLIPBOARD_P_H
++#define QQUICKCLIPBOARD_P_H
  #include <QtCore/QObject>
  #include <QtQml/QJSEngine>
  #include <QtQml/QQmlEngine>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlEngine;
  class QJSEngine;
@@ -60,4 +61,4 @@
  UT_NAMESPACE_END
--#endif // QQUICKCLIPBOARD_H
++#endif // QQUICKCLIPBOARD_P_H
 === modified file 'src/UbuntuToolkit/qquickclipboard_p_p.h'
 --- src/UbuntuToolkit/qquickclipboard_p_p.h	2016-07-07 18:17:56 +0000
 +++ src/UbuntuToolkit/qquickclipboard_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,13 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef QQUICKCLIPBOARD_P_H
--#define QQUICKCLIPBOARD_P_H
--
--#include "qquickclipboard_p.h"
++#ifndef QQUICKCLIPBOARD_P_P_H
++#define QQUICKCLIPBOARD_P_P_H
++
++#include <UbuntuToolkit/private/qquickclipboard_p.h>
++
++#include <QtCore/private/qobject_p.h>
  #include <QtGui/QClipboard>
--#include <QtCore/private/qobject_p.h>
  UT_NAMESPACE_BEGIN
@@ -41,4 +42,4 @@
  UT_NAMESPACE_END
--#endif // QQUICKCLIPBOARD_P_H
++#endif // QQUICKCLIPBOARD_P_P_H
 === modified file 'src/UbuntuToolkit/qquickmimedata.cpp'
 --- src/UbuntuToolkit/qquickmimedata.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/qquickmimedata.cpp	2016-09-09 22:15:37 +0000
@@ -16,14 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#include <QtGui/QClipboard>
--#include <QtGui/QGuiApplication>
++#include "qquickmimedata_p.h"
++
  #include <QtCore/QMimeData>
  #include <QtCore/QMimeDatabase>
  #include <QtCore/QMimeType>
--#include "qquickmimedata_p.h"
--
--#include <QDebug>
++#include <QtCore/QDebug>
++#include <QtGui/QClipboard>
++#include <QtGui/QGuiApplication>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/qquickmimedata_p.h'
 --- src/UbuntuToolkit/qquickmimedata_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/qquickmimedata_p.h	2016-09-09 22:15:37 +0000
@@ -16,14 +16,15 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef QQUICKMIMEDATA_H
--#define QQUICKMIMEDATA_H
++#ifndef QQUICKMIMEDATA_P_H
++#define QQUICKMIMEDATA_P_H
  #include <QtCore/QMimeData>
  #include <QtCore/QStringList>
++#include <QtCore/QUrl>
  #include <QtGui/QColor>
--#include <QtCore/QUrl>
--#include "qquickclipboard_p.h"
++
++#include <UbuntuToolkit/private/qquickclipboard_p.h>
  UT_NAMESPACE_BEGIN
@@ -74,4 +75,4 @@
  UT_NAMESPACE_END
--#endif // QQUICKMIMEDATA_H
++#endif // QQUICKMIMEDATA_P_H
 === modified file 'src/UbuntuToolkit/quickutils.cpp'
 --- src/UbuntuToolkit/quickutils.cpp	2016-08-29 10:19:17 +0000
 +++ src/UbuntuToolkit/quickutils.cpp	2016-09-09 22:15:37 +0000
@@ -12,23 +12,21 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "quickutils_p.h"
--#include <QGuiApplication>
--#include <QtQuick/QQuickView>
--#include <QtQuick/QQuickItem>
--#include <QtQml/QQmlContext>
  #include <QtCore/QAbstractListModel>
  #include <QtCore/QAbstractProxyModel>
++#include <QtGui/QGuiApplication>
++#include <QtQml/QQmlContext>
  #include <QtQml/QQmlPropertyMap>
  #include <QtQml/QQmlInfo>
  #include <QtQml/QQmlEngine>
--
--#include <private/qquicktextinput_p.h>
--#include <private/qquicktextedit_p.h>
++#include <QtQuick/QQuickView>
++#include <QtQuick/QQuickItem>
++#include <QtQuick/private/qquicktextinput_p.h>
++#include <QtQuick/private/qquicktextedit_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/quickutils_p.h'
 --- src/UbuntuToolkit/quickutils_p.h	2016-08-29 10:19:17 +0000
 +++ src/UbuntuToolkit/quickutils_p.h	2016-09-09 22:15:37 +0000
@@ -12,7 +12,6 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #ifndef QUICKUTILS_P_H
@@ -21,7 +20,8 @@
  #include <QtCore/QObject>
  #include <QtCore/QPointer>
  #include <QtQuick/QQuickView>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
  class QQmlEngine;
 === modified file 'src/UbuntuToolkit/sortbehavior_p.h'
 --- src/UbuntuToolkit/sortbehavior_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/sortbehavior_p.h	2016-09-09 22:15:37 +0000
@@ -17,11 +17,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef SORTBEHAVIOR_H
--#define SORTBEHAVIOR_H
--
--#include <QSortFilterProxyModel>
--#include <ubuntutoolkitglobal.h>
++#ifndef SORTBEHAVIOR_P_H
++#define SORTBEHAVIOR_P_H
++
++#include <QtCore/QSortFilterProxyModel>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -50,4 +51,4 @@
  UT_NAMESPACE_END
--#endif // SORTBEHAVIOR_H
++#endif // SORTBEHAVIOR_P_H
 === modified file 'src/UbuntuToolkit/sortfiltermodel_p.h'
 --- src/UbuntuToolkit/sortfiltermodel_p.h	2016-08-16 08:43:28 +0000
 +++ src/UbuntuToolkit/sortfiltermodel_p.h	2016-09-09 22:15:37 +0000
@@ -18,12 +18,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef QSORTFILTERPROXYMODELQML_H
--#define QSORTFILTERPROXYMODELQML_H
--
--#include <QSortFilterProxyModel>
--#include "sortbehavior_p.h"
--#include "filterbehavior_p.h"
++#ifndef SORTFILTERMODEL_P_H
++#define SORTFILTERMODEL_P_H
++
++#include <QtCore/QSortFilterProxyModel>
++
++#include <UbuntuToolkit/private/sortbehavior_p.h>
++#include <UbuntuToolkit/private/filterbehavior_p.h>
  UT_NAMESPACE_BEGIN
@@ -73,4 +74,4 @@
  UT_NAMESPACE_END
--#endif // QSORTFILTERPROXYMODELQML_H
++#endif // SORTFILTERMODEL_P_H
 === modified file 'src/UbuntuToolkit/splitview.cpp'
 --- src/UbuntuToolkit/splitview.cpp	2016-08-11 14:47:05 +0000
 +++ src/UbuntuToolkit/splitview.cpp	2016-09-09 22:15:37 +0000
@@ -16,16 +16,15 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
++#include "splitview_p_p.h"
++
++#include <QtQml/QQmlInfo>
++#include <QtQuick/private/qquickanchors_p.h>
  #include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickanchors_p.h>
--#include <QtQml/QQmlInfo>
--#include "splitview_p.h"
--#include "splitview_p_p.h"
  #include "ucunits_p.h"
  #include "ucpagetreenode_p.h"
--
--#include "privates/splitviewhandler_p_p.h"
++#include "privates/splitviewhandler_p.h"
  #define DEFAULT_SPACING_DP      4
 === modified file 'src/UbuntuToolkit/splitview_p.h'
 --- src/UbuntuToolkit/splitview_p.h	2016-08-09 13:23:04 +0000
 +++ src/UbuntuToolkit/splitview_p.h	2016-09-09 22:15:37 +0000
@@ -21,7 +21,7 @@
  #include <QtQuick/private/qquickpositioners_p.h>
--#include "ubuntutoolkitglobal.h"
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/splitview_p_p.h'
 --- src/UbuntuToolkit/splitview_p_p.h	2016-08-10 07:34:04 +0000
 +++ src/UbuntuToolkit/splitview_p_p.h	2016-09-09 22:15:37 +0000
@@ -19,7 +19,8 @@
  #ifndef SPLITVIEW_P_P_H
  #define SPLITVIEW_P_P_H
--#include "splitview_p.h"
++#include <UbuntuToolkit/private/splitview_p.h>
++
  #include <QtCore/private/qobject_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/splitviewlayout.cpp'
 --- src/UbuntuToolkit/splitviewlayout.cpp	2016-08-11 14:07:52 +0000
 +++ src/UbuntuToolkit/splitviewlayout.cpp	2016-09-09 22:15:37 +0000
@@ -15,12 +15,12 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
++#include "splitview_p_p.h"
++
++#include <QtQuick/private/qquickanchors_p.h>
  #include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickanchors_p.h>
  #include <QtQml/QQmlInfo>
--#include "splitview_p.h"
--#include "splitview_p_p.h"
  #include "ucmathutils_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/statesaverbackend_p.cpp'
 --- src/UbuntuToolkit/statesaverbackend_p.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/statesaverbackend_p.cpp	2016-09-09 22:15:37 +0000
@@ -17,18 +17,19 @@
   */
  #include "statesaverbackend_p.h"
--#include "ucapplication_p.h"
--#include <QtQml/QQmlContext>
--#include <QtQml/QQmlProperty>
--#include <QtQml/qqmlinfo.h>
--#include <QtQml/qqml.h>
++
  #include <QtCore/QCoreApplication>
  #include <QtCore/QFile>
++#include <QtCore/QStandardPaths>
  #include <QtCore/QStringList>
++#include <QtQml/QtQml>
++#include <QtQml/QQmlContext>
++#include <QtQml/QQmlInfo>
++#include <QtQml/QQmlProperty>
++
  #include "i18n_p.h"
  #include "quickutils_p.h"
--#include <QtCore/QStandardPaths>
--
++#include "ucapplication_p.h"
  #include "unixsignalhandler_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/statesaverbackend_p.h'
 --- src/UbuntuToolkit/statesaverbackend_p.h	2016-07-06 09:51:06 +0000
 +++ src/UbuntuToolkit/statesaverbackend_p.h	2016-09-09 22:15:37 +0000
@@ -20,12 +20,13 @@
  #define STATESAVERBACKEND_P_H
  #include <QtCore/QObject>
--#include <QtCore/QSettings>
  #include <QtCore/QPointer>
  #include <QtCore/QSet>
++#include <QtCore/QSettings>
++#include <QtCore/QStack>
  #include <QtCore/QTimer>
--#include <QtCore/QStack>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/timeutils_p.h'
 --- src/UbuntuToolkit/timeutils_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/timeutils_p.h	2016-09-09 22:15:37 +0000
@@ -17,12 +17,12 @@
  #ifndef TIMEUTILS_P_H
  #define TIMEUTILS_P_H
--#include "livetimer_p.h"
++#include <QtCore/QDateTime>
++#include <QtCore/QLocale>
++#include <QtCore/QObject>
++#include <QtCore/QTimer>
--#include <QDateTime>
--#include <QLocale>
--#include <QObject>
--#include <QTimer>
++#include <UbuntuToolkit/private/livetimer_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/tree.cpp'
 --- src/UbuntuToolkit/tree.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/tree.cpp	2016-09-09 22:15:37 +0000
@@ -16,8 +16,8 @@
  #include "tree_p.h"
--#include <private/qobject_p.h>
--#include <QQmlEngine>
++#include <QtCore/private/qobject_p.h>
++#include <QtQml/QQmlEngine>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/tree_p.h'
 --- src/UbuntuToolkit/tree_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/tree_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef TREE_H
--#define TREE_H
--
--#include <QObject>
--#include <QVariant>
--#include "ubuntutoolkitglobal.h"
++#ifndef TREE_P_H
++#define TREE_P_H
++
++#include <QtCore/QObject>
++#include <QtCore/QVariant>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -45,4 +46,4 @@
  UT_NAMESPACE_END
--#endif // TREE_H
++#endif // TREE_P_H
 === modified file 'src/UbuntuToolkit/ubuntutoolkitglobal.h'
 --- src/UbuntuToolkit/ubuntutoolkitglobal.h	2016-07-08 14:28:48 +0000
 +++ src/UbuntuToolkit/ubuntutoolkitglobal.h	2016-09-09 22:15:37 +0000
@@ -13,6 +13,7 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
++
  #ifndef UBUNTUTOOLKITGLOBAL_H
  #define UBUNTUTOOLKITGLOBAL_H
@@ -54,4 +55,3 @@
  #endif
  #endif // UBUNTUTOOLKITGLOBAL_H
--
 === modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
 --- src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-08-26 12:03:35 +0000
 +++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-09 22:15:37 +0000
@@ -17,91 +17,89 @@
   */
  #include "ubuntutoolkitmodule.h"
++
++#include <sys/types.h>
++#include <unistd.h>
++
++#include <stdexcept>
++
++#include <QtQml/QQmlContext>
  #include <QtQml/QQmlEngine>
--#include <QtQml/QQmlContext>
  #include <QtQml/QQmlExtensionPlugin>
  #include <QtQuick/private/qquickimagebase_p.h>
--#include <QDBusConnection>
++#include <QtDBus/QDBusConnection>
  #include <QtGui/QGuiApplication>
  #include <QtGui/QScreen>
--
--#include <sys/types.h>
--#include <unistd.h>
--#include <stdexcept>
--
--#include <ucunits_p.h>
--#include <quickutils_p.h>
--#include <i18n_p.h>
--#include <ucapplication_p.h>
--#include <ucfontutils_p.h>
--#include <uctheme_p.h>
--#include <ucdeprecatedtheme_p.h>
--#include <listener_p.h>
--#include <ucfontutils_p.h>
--#include <ucmathutils_p.h>
--#include <ucmargins_p.h>
--#include <ucmainviewbase_p.h>
--#include <ucabstractbutton_p.h>
--#include <ucaction_p.h>
--#include <ucactioncontext_p.h>
--#include <ucactionitem_p.h>
--#include <ucactionmanager_p.h>
--#include <ucalarm_p.h>
--#include <ucalarmmodel_p.h>
--#include <ucarguments_p.h>
--#include <ucargument_p.h>
--#include <ucbottomedgehint_p.h>
--#include <ucbottomedgeregion_p.h>
--#include <ucbottomedge_p.h>
--#include <uchaptics_p.h>
--#include <ucheader_p.h>
--#include <ucinversemouse_p.h>
--#include <ucmouse_p.h>
--#include <uclistitem_p.h>
--#include <uclistitemactions_p.h>
--#include <uclistitemlayout_p.h>
--#include <uclabel_p.h>
--#include <ucpagetreenode_p.h>
--#include <ucperformancemonitor_p.h>
--#include <ucproportionalshape_p.h>
--#include <ucscalingimageprovider_p.h>
--#include <ucserviceproperties_p.h>
--#include <ucslotslayout_p.h>
--#include <ucstatesaver_p.h>
--#include <ucstyleditembase_p.h>
--#include <ucstylehints_p.h>
--#include <uctheme_p.h>
--#include <ucubuntuanimation_p.h>
--#include <ucubuntushapeoverlay_p.h>
--#include <ucubuntushape_p.h>
--#include <ucurihandler_p.h>
--#include <ucqquickimageextension_p.h>
--#include <inversemouseareatype_p.h>
--#include <qquickclipboard_p.h>
--#include <qquickmimedata_p.h>
--#include <colorutils_p.h>
--#include <tree_p.h>
--#include <unitythemeiconprovider_p.h>
--#include <sortbehavior_p.h>
--#include <sortfiltermodel_p.h>
--#include <livetimer_p.h>
--#include <privates/frame_p.h>
--#include <privates/ucpagewrapper_p.h>
--#include <privates/appheaderbase_p.h>
--#include <privates/ucscrollbarutils_p.h>
--#include <actionlist_p.h>
--#include <exclusivegroup_p.h>
--#include <menu_p.h>
--#include <menubar_p.h>
--#include <menugroup_p.h>
--
--#include <splitview_p.h>
--
--// styles
--#include <ucbottomedgestyle_p.h>
--
  #include <UbuntuMetrics/applicationmonitor.h>
++#include "actionlist_p.h"
++#include "colorutils_p.h"
++#include "exclusivegroup_p.h"
++#include "i18n_p.h"
++#include "inversemouseareatype_p.h"
++#include "listener_p.h"
++#include "livetimer_p.h"
++#include "menu_p.h"
++#include "menubar_p.h"
++#include "menugroup_p.h"
++#include "privates/appheaderbase_p.h"
++#include "privates/frame_p.h"
++#include "privates/ucpagewrapper_p.h"
++#include "privates/ucscrollbarutils_p.h"
++#include "qquickclipboard_p.h"
++#include "qquickmimedata_p.h"
++#include "quickutils_p.h"
++#include "sortbehavior_p.h"
++#include "sortfiltermodel_p.h"
++#include "splitview_p.h"
++#include "tree_p.h"
++#include "ucabstractbutton_p.h"
++#include "ucaction_p.h"
++#include "ucactioncontext_p.h"
++#include "ucactionitem_p.h"
++#include "ucactionmanager_p.h"
++#include "ucalarm_p.h"
++#include "ucalarmmodel_p.h"
++#include "ucapplication_p.h"
++#include "ucargument_p.h"
++#include "ucarguments_p.h"
++#include "ucbottomedge_p.h"
++#include "ucbottomedgehint_p.h"
++#include "ucbottomedgeregion_p.h"
++#include "ucbottomedgestyle_p.h"
++#include "ucdeprecatedtheme_p.h"
++#include "ucfontutils_p.h"
++#include "ucfontutils_p.h"
++#include "uchaptics_p.h"
++#include "ucheader_p.h"
++#include "ucinversemouse_p.h"
++#include "uclabel_p.h"
++#include "uclistitem_p.h"
++#include "uclistitemactions_p.h"
++#include "uclistitemlayout_p.h"
++#include "ucmainviewbase_p.h"
++#include "ucmargins_p.h"
++#include "ucmathutils_p.h"
++#include "ucmouse_p.h"
++#include "ucpagetreenode_p.h"
++#include "ucperformancemonitor_p.h"
++#include "ucproportionalshape_p.h"
++#include "ucqquickimageextension_p.h"
++#include "ucscalingimageprovider_p.h"
++#include "ucserviceproperties_p.h"
++#include "ucslotslayout_p.h"
++#include "ucstatesaver_p.h"
++#include "ucstyleditembase_p.h"
++#include "ucstylehints_p.h"
++#include "uctheme_p.h"
++#include "uctheme_p.h"
++#include "ucubuntuanimation_p.h"
++#include "ucubuntushape_p.h"
++#include "ucubuntushapeoverlay_p.h"
++#include "ucunits_p.h"
++#include "ucurihandler_p.h"
++#include "unitythemeiconprovider_p.h"
++
  UT_NAMESPACE_BEGIN
  const char *EngineProperty("__ubuntu_toolkit_plugin_data");
 === modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.h'
 --- src/UbuntuToolkit/ubuntutoolkitmodule.h	2016-07-06 09:51:06 +0000
 +++ src/UbuntuToolkit/ubuntutoolkitmodule.h	2016-09-09 22:15:37 +0000
@@ -20,10 +20,11 @@
  #define UBUNTUTOOLKITMODULE_H
  #include <QtCore/QObject>
++#include <QtQml/QtQml>
++#include <QtQml/QJSEngine>
  #include <QtQml/QQmlEngine>
--#include <QtQml/QJSEngine>
--#include <qqml.h>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlEngine;
  class QWindow;
 === modified file 'src/UbuntuToolkit/ucabstractbutton.cpp'
 --- src/UbuntuToolkit/ucabstractbutton.cpp	2016-08-17 10:06:06 +0000
 +++ src/UbuntuToolkit/ucabstractbutton.cpp	2016-09-09 22:15:37 +0000
@@ -15,12 +15,14 @@
   */
  #include "ucabstractbutton_p_p.h"
++
++#include <QtQml/private/qqmlglobal_p.h>
++#include <QtQuick/private/qquickitem_p.h>
++#include <QtQuick/private/qquickmousearea_p.h>
++
++#include "ucaction_p.h"
  #include "uchaptics_p.h"
  #include "ucunits_p.h"
--#include "ucaction_p.h"
--#include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickmousearea_p.h>
--#include <QtQml/private/qqmlglobal_p.h>
  #define MIN_SENSING_WIDTH_GU    4
  #define MIN_SENSING_HEIGHT_GU   4
 === modified file 'src/UbuntuToolkit/ucabstractbutton_p.h'
 --- src/UbuntuToolkit/ucabstractbutton_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucabstractbutton_p.h	2016-09-09 22:15:37 +0000
@@ -14,13 +14,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCABSTRACTBUTTON_H
--#define UCABSTRACTBUTTON_H
++#ifndef UCABSTRACTBUTTON_P_H
++#define UCABSTRACTBUTTON_P_H
--#include "ucactionitem_p.h"
--#include "ucmargins_p.h"
  #include <QtQuick/private/qquickevents_p_p.h>
++#include <UbuntuToolkit/private/ucactionitem_p.h>
++#include <UbuntuToolkit/private/ucmargins_p.h>
++
  class QQuickMouseArea;
  class QQuickMouseEvent;
@@ -84,4 +85,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCMargins))
--#endif // UCABSTRACTBUTTON_H
++#endif // UCABSTRACTBUTTON_P_H
 === modified file 'src/UbuntuToolkit/ucabstractbutton_p_p.h'
 --- src/UbuntuToolkit/ucabstractbutton_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucabstractbutton_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCABSTRACTBUTTON_P
--#define UCABSTRACTBUTTON_P
--
--#include "ucabstractbutton_p.h"
--#include "ucactionitem_p_p.h"
++#ifndef UCABSTRACTBUTTON_P_P_H
++#define UCABSTRACTBUTTON_P_P_H
++
++#include <UbuntuToolkit/private/ucabstractbutton_p.h>
++
++#include <UbuntuToolkit/private/ucactionitem_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -54,4 +55,4 @@
  UT_NAMESPACE_END
--#endif // UCABSTRACTBUTTON_P
++#endif // UCABSTRACTBUTTON_P_P_H
 === modified file 'src/UbuntuToolkit/ucaction.cpp'
 --- src/UbuntuToolkit/ucaction.cpp	2016-09-05 17:04:31 +0000
 +++ src/UbuntuToolkit/ucaction.cpp	2016-09-09 22:15:37 +0000
@@ -15,15 +15,16 @@
   */
  #include "ucaction_p.h"
++
++#include <QtCore/QtDebug>
++#include <QtGui/private/qguiapplication_p.h>
++#include <QtQml/QQmlInfo>
++#include <QtQuick/QQuickItem>
++#include <QtQuick/QQuickWindow>
++
++#include "exclusivegroup_p.h"
  #include "quickutils_p.h"
  #include "ucactioncontext_p.h"
--#include "exclusivegroup_p.h"
--
--#include <QtDebug>
--#include <QtQml/QQmlInfo>
--#include <QtQuick/qquickitem.h>
--#include <QtQuick/qquickwindow.h>
--#include <private/qguiapplication_p.h>
  Q_LOGGING_CATEGORY(ucAction, "ubuntu.components.Action", QtMsgType::QtWarningMsg)
 === modified file 'src/UbuntuToolkit/ucaction_p.h'
 --- src/UbuntuToolkit/ucaction_p.h	2016-08-25 14:00:43 +0000
 +++ src/UbuntuToolkit/ucaction_p.h	2016-09-09 22:15:37 +0000
@@ -14,17 +14,18 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCACTION_H
--#define UCACTION_H
++#ifndef UCACTION_P_H
++#define UCACTION_P_H
  #include <QtCore/QObject>
++#include <QtCore/QUrl>
  #include <QtCore/QVariant>
--#include <QtCore/QUrl>
  #include <QtGui/QKeySequence>
--#include <QtQml>
++#include <QtQml/QtQml>
  #include <QtQml/QQmlListProperty>
  #include <QtQml/private/qpodvector_p.h>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlComponent;
  class QQuickItem;
@@ -191,4 +192,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCAction))
--#endif // UCACTION_H
++#endif // UCACTION_P_H
 === modified file 'src/UbuntuToolkit/ucactioncontext.cpp'
 --- src/UbuntuToolkit/ucactioncontext.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactioncontext.cpp	2016-09-09 22:15:37 +0000
@@ -15,9 +15,11 @@
   */
  #include "ucactioncontext_p.h"
++
++#include <QtQuick/QQuickItem>
++
++#include "adapters/actionsproxy_p.h"
  #include "ucaction_p.h"
--#include "adapters/actionsproxy_p.h"
--#include <QtQuick/QQuickItem>
  Q_LOGGING_CATEGORY(ucActionContext, "ubuntu.components.ActionContext", QtMsgType::QtWarningMsg)
 === modified file 'src/UbuntuToolkit/ucactioncontext_p.h'
 --- src/UbuntuToolkit/ucactioncontext_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactioncontext_p.h	2016-09-09 22:15:37 +0000
@@ -14,15 +14,16 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCACTIONCONTEXT_H
--#define UCACTIONCONTEXT_H
++#ifndef UCACTIONCONTEXT_P_H
++#define UCACTIONCONTEXT_P_H
  #include <QtCore/QObject>
++#include <QtCore/QSet>
++#include <QtQml/QtQml>
  #include <QtQml/QQmlListProperty>
  #include <QtQml/QQmlParserStatus>
--#include <QtCore/QSet>
--#include <QtQml>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
@@ -111,4 +112,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCActionContext))
  QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCActionContext), QML_HAS_ATTACHED_PROPERTIES)
--#endif // UCACTIONCONTEXT_H
++#endif // UCACTIONCONTEXT_P_H
 === modified file 'src/UbuntuToolkit/ucactionitem.cpp'
 --- src/UbuntuToolkit/ucactionitem.cpp	2016-07-07 08:42:42 +0000
 +++ src/UbuntuToolkit/ucactionitem.cpp	2016-09-09 22:15:37 +0000
@@ -15,12 +15,14 @@
   */
  #include "ucactionitem_p_p.h"
--#include "ucaction_p.h"
--#include "ucstyleditembase_p_p.h"
++
  #define foreach Q_FOREACH
  #include <QtQml/private/qqmlbinding_p.h>
  #undef foreach
++#include "ucaction_p.h"
++#include "ucstyleditembase_p_p.h"
++
  UT_NAMESPACE_BEGIN
  UCActionItemPrivate::UCActionItemPrivate()
 === modified file 'src/UbuntuToolkit/ucactionitem_p.h'
 --- src/UbuntuToolkit/ucactionitem_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactionitem_p.h	2016-09-09 22:15:37 +0000
@@ -13,10 +13,11 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCACTIONITEM_H
--#define UCACTIONITEM_H
--
--#include "ucstyleditembase_p.h"
++
++#ifndef UCACTIONITEM_P_H
++#define UCACTIONITEM_P_H
++
++#include <UbuntuToolkit/private/ucstyleditembase_p.h>
  UT_NAMESPACE_BEGIN
@@ -79,4 +80,4 @@
  UT_NAMESPACE_END
--#endif // UCACTIONITEM_H
++#endif // UCACTIONITEM_P_H
 === modified file 'src/UbuntuToolkit/ucactionitem_p_p.h'
 --- src/UbuntuToolkit/ucactionitem_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactionitem_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCACTIONITEM_P
--#define UCACTIONITEM_P
--
--#include "ucactionitem_p.h"
--#include "ucstyleditembase_p_p.h"
++#ifndef UCACTIONITEM_P_P_H
++#define UCACTIONITEM_P_P_H
++
++#include <UbuntuToolkit/private/ucactionitem_p.h>
++
++#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -61,5 +62,5 @@
  UT_NAMESPACE_END
--#endif // UCACTIONITEM_P
++#endif // UCACTIONITEM_P_P_H
 === modified file 'src/UbuntuToolkit/ucactionmanager.cpp'
 --- src/UbuntuToolkit/ucactionmanager.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactionmanager.cpp	2016-09-09 22:15:37 +0000
@@ -15,9 +15,10 @@
   */
  #include "ucactionmanager_p.h"
++
  #include "adapters/actionsproxy_p.h"
++#include "ucaction_p.h"
  #include "ucactioncontext_p.h"
--#include "ucaction_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucactionmanager_p.h'
 --- src/UbuntuToolkit/ucactionmanager_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucactionmanager_p.h	2016-09-09 22:15:37 +0000
@@ -14,13 +14,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCACTIONMANAGER_H
--#define UCACTIONMANAGER_H
++#ifndef UCACTIONMANAGER_P_H
++#define UCACTIONMANAGER_P_H
  #include <QtCore/QObject>
  #include <QtQml/QQmlListProperty>
  #include <QtQml/QQmlParserStatus>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -65,4 +66,4 @@
  UT_NAMESPACE_END
--#endif // UCACTIONMANAGER_H
++#endif // UCACTIONMANAGER_P_H
 === modified file 'src/UbuntuToolkit/ucalarm.cpp'
 --- src/UbuntuToolkit/ucalarm.cpp	2016-07-07 07:56:34 +0000
 +++ src/UbuntuToolkit/ucalarm.cpp	2016-09-09 22:15:37 +0000
@@ -17,9 +17,11 @@
   */
  #include "ucalarm_p_p.h"
++
++#include <QtQml/QQmlInfo>
++
  #include "alarmmanager_p_p.h"
  #include "i18n_p.h"
--#include <QtQml/QQmlInfo>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucalarm_p.h'
 --- src/UbuntuToolkit/ucalarm_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucalarm_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCALARM_H
--#define UCALARM_H
++#ifndef UCALARM_P_H
++#define UCALARM_P_H
++#include <QtCore/QDateTime>
  #include <QtCore/QObject>
--#include <QtCore/QDateTime>
  #include <QtCore/QUrl>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -143,4 +144,4 @@
  UT_NAMESPACE_END
--#endif // UUALARM_H
++#endif // UUALARM_P_H
 === modified file 'src/UbuntuToolkit/ucalarm_p_p.h'
 --- src/UbuntuToolkit/ucalarm_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucalarm_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,15 +16,17 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCALARM_P_H
--#define UCALARM_P_H
--
--#include "ucalarm_p.h"
--#include "alarmmanager_p_p.h"
++#ifndef UCALARM_P_P_H
++#define UCALARM_P_P_H
++
++#include <UbuntuToolkit/private/ucalarm_p.h>
++
  #include <QtCore/QDateTime>
  #include <QtCore/QPointer>
  #include <QtQml/QQmlListProperty>
++#include <UbuntuToolkit/private/alarmmanager_p_p.h>
++
  UT_NAMESPACE_BEGIN
  class UBUNTUTOOLKIT_EXPORT UCAlarmPrivate
 === modified file 'src/UbuntuToolkit/ucalarmmodel.cpp'
 --- src/UbuntuToolkit/ucalarmmodel.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucalarmmodel.cpp	2016-09-09 22:15:37 +0000
@@ -17,11 +17,13 @@
   */
  #include "ucalarmmodel_p.h"
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlInfo>
++#include <QtQml/QQmlPropertyMap>
++
++#include "alarmmanager_p_p.h"
  #include "ucalarm_p_p.h"
--#include "alarmmanager_p_p.h"
--#include <QtQml/QQmlPropertyMap>
--#include <QtQml/QQmlInfo>
--#include <QtQml/QQmlEngine>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucalarmmodel_p.h'
 --- src/UbuntuToolkit/ucalarmmodel_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucalarmmodel_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,13 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCALARMSMODEL_H
--#define UCALARMSMODEL_H
++#ifndef UCALARMSMODEL_P_H
++#define UCALARMSMODEL_P_H
  #include <QtCore/QAbstractListModel>
  #include <QtQml/QQmlParserStatus>
--#include "ucalarm_p_p.h"
++
++#include <UbuntuToolkit/private/ucalarm_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -72,4 +73,4 @@
  UT_NAMESPACE_END
--#endif // UCALARMSMODEL_H
++#endif // UCALARMSMODEL_P_H
 === modified file 'src/UbuntuToolkit/ucapplication.cpp'
 --- src/UbuntuToolkit/ucapplication.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucapplication.cpp	2016-09-09 22:15:37 +0000
@@ -19,11 +19,11 @@
  #include "ucapplication_p.h"
  #include <QtCore/QCoreApplication>
--#include <QDebug>
++#include <QtCore/QDebug>
++#include <QtCore/QStandardPaths>
++#include <QtGui/QGuiApplication>
  #include <QtQml/QQmlContext>
  #include <QtQml/QQmlEngine>
--#include <QtCore/QStandardPaths>
--#include <QtGui/QGuiApplication>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucapplication_p.h'
 --- src/UbuntuToolkit/ucapplication_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucapplication_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Christian Dywan <christian.dywan@canonical.om>
   */
--#ifndef UBUNTU_COMPONENTS_APPLICATION_H
--#define UBUNTU_COMPONENTS_APPLICATION_H
++#ifndef UCAPPLICATION_P_H
++#define UCAPPLICATION_P_H
  #include <QtCore/QObject>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlContext;
  class QQmlEngine;
@@ -70,4 +71,4 @@
  UT_NAMESPACE_END
--#endif // UBUNTU_COMPONENTS_I18N_H
++#endif // UCAPPLICATION_P_H
 === modified file 'src/UbuntuToolkit/ucargument_p.h'
 --- src/UbuntuToolkit/ucargument_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucargument_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Florian Boucault <florian.boucault@canonical.com>
   */
--#ifndef UCARGUMENT_H
--#define UCARGUMENT_H
++#ifndef UCARGUMENT_P_H
++#define UCARGUMENT_P_H
  #include <QtCore/QObject>
  #include <QtCore/QStringList>
  #include <QtCore/QVariant>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -75,4 +76,4 @@
  UT_NAMESPACE_END
--#endif // UCARGUMENT_H
++#endif // UCARGUMENT_P_H
 === modified file 'src/UbuntuToolkit/ucarguments.cpp'
 --- src/UbuntuToolkit/ucarguments.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucarguments.cpp	2016-09-09 22:15:37 +0000
@@ -17,13 +17,15 @@
   */
  #include "ucarguments_p.h"
--#include "i18n_p.h"
++
  #include <QtCore/QCoreApplication>
  #include <QtCore/QDebug>
++#include <QtCore/QFileInfo>
  #include <QtCore/QTextStream>
--#include <QtCore/QFileInfo>
++#include <QtQml/QtQml>
  #include <QtQml/QQmlProperty>
--#include <QtQml/qqml.h>
++
++#include "i18n_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucarguments_p.h'
 --- src/UbuntuToolkit/ucarguments_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucarguments_p.h	2016-09-09 22:15:37 +0000
@@ -16,17 +16,18 @@
   * Author: Florian Boucault <florian.boucault@canonical.com>
   */
--#ifndef UCARGUMENTS_H
--#define UCARGUMENTS_H
++#ifndef UCARGUMENTS_P_H
++#define UCARGUMENTS_P_H
--#include "ucargument_p.h"
++#include <QtCore/QHash>
++#include <QtCore/QList>
  #include <QtCore/QObject>
--#include <QtCore/QList>
  #include <QtCore/QStringList>
--#include <QtCore/QHash>
--#include <QtQml/QQmlPropertyMap>
  #include <QtQml/QQmlListProperty>
  #include <QtQml/QQmlParserStatus>
++#include <QtQml/QQmlPropertyMap>
++
++#include <UbuntuToolkit/private/ucargument_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucbottomedge.cpp'
 --- src/UbuntuToolkit/ucbottomedge.cpp	2016-08-14 09:06:34 +0000
 +++ src/UbuntuToolkit/ucbottomedge.cpp	2016-09-09 22:15:37 +0000
@@ -17,24 +17,25 @@
   */
  #include "ucbottomedge_p_p.h"
++
++#include <QtCore/QtMath>
++#include <QtGui/QGuiApplication>
++#include <QtGui/QScreen>
++#include <QtGui/QStyleHints>
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlProperty>
++#include <QtQuick/private/qquickanimation_p.h>
++#include <QtQuick/private/qquickflickable_p.h>
++#include <QtQuick/private/qquickitem_p.h>
++#include <UbuntuGestures/private/ucswipearea_p_p.h>
++
  #include "ucbottomedgestyle_p.h"
  #include "ucbottomedgeregion_p_p.h"
  #include "ucbottomedgehint_p_p.h"
  #include "ucstyleditembase_p_p.h"
--#include <QtCore/QtMath>
--#include <QtQml/QQmlEngine>
--#include <QtGui/QScreen>
--#include <QtQml/QQmlProperty>
--#include <QtGui/QGuiApplication>
--#include <QtGui/QStyleHints>
--#include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickflickable_p.h>
--
  #include "ucheader_p.h"
  #include "ucaction_p.h"
  #include "quickutils_p.h"
--#include "private/ucswipearea_p_p.h"
--#include <QtQuick/private/qquickanimation_p.h>
  Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)
 === modified file 'src/UbuntuToolkit/ucbottomedge_p.h'
 --- src/UbuntuToolkit/ucbottomedge_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedge_p.h	2016-09-09 22:15:37 +0000
@@ -16,13 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGE_H
--#define UCBOTTOMEDGE_H
++#ifndef UCBOTTOMEDGE_P_H
++#define UCBOTTOMEDGE_P_H
--#include "ucstyleditembase_p.h"
++#include <QtCore/QLoggingCategory>
  #include <QtCore/QPointer>
  #include <QtQuick/private/qquickitemchangelistener_p.h>
--#include <QtCore/QLoggingCategory>
++
++#include <UbuntuToolkit/private/ucstyleditembase_p.h>
  class QQuickAbstractAnimation;
@@ -129,4 +130,4 @@
  #define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
--#endif // UCBOTTOMEDGE_H
++#endif // UCBOTTOMEDGE_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedge_p_p.h'
 --- src/UbuntuToolkit/ucbottomedge_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedge_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,13 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGE_P_H
--#define UCBOTTOMEDGE_P_H
--
--#include "ucbottomedge_p.h"
--#include "ucstyleditembase_p_p.h"
--#include "ucaction_p.h"
++#ifndef UCBOTTOMEDGE_P_P_H
++#define UCBOTTOMEDGE_P_P_H
++
++#include <UbuntuToolkit/private/ucbottomedge_p.h>
++
++#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
++#include <UbuntuToolkit/private/ucaction_p.h>
  UT_NAMESPACE_BEGIN
@@ -116,4 +117,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGE_P_H
++#endif // UCBOTTOMEDGE_P_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedgehint.cpp'
 --- src/UbuntuToolkit/ucbottomedgehint.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-09 22:15:37 +0000
@@ -17,14 +17,16 @@
   */
  #include "ucbottomedgehint_p_p.h"
++
++#include <QtQml/private/qqmlproperty_p.h>
++#include <QtQuick/private/qquickflickable_p.h>
++#include <UbuntuGestures/private/ucswipearea_p_p.h>
++
++#include "propertychange_p.h"
++#include "quickutils_p.h"
++#include "ucaction_p.h"
  #include "ucstyleditembase_p_p.h"
--#include "quickutils_p.h"
  #include "ucunits_p.h"
--#include "ucaction_p.h"
--#include "private/ucswipearea_p_p.h"
--#include <propertychange_p.h>
--#include <QtQml/private/qqmlproperty_p.h>
--#include <QtQuick/private/qquickflickable_p.h>
  #define SWIPE_AREA_HEIGHT_GU    3
 === modified file 'src/UbuntuToolkit/ucbottomedgehint_p.h'
 --- src/UbuntuToolkit/ucbottomedgehint_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgehint_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Authors: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGEHINT_H
--#define UCBOTTOMEDGEHINT_H
--
--#include "ucactionitem_p.h"
--#include <ubuntugesturesglobal.h>
++#ifndef UCBOTTOMEDGEHINT_P_H
++#define UCBOTTOMEDGEHINT_P_H
++
++#include <UbuntuGestures/ubuntugesturesglobal.h>
++
++#include <UbuntuToolkit/private/ucactionitem_p.h>
  class QQuickFlickable;
  UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
@@ -102,4 +103,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGEHINT_H
++#endif // UCBOTTOMEDGEHINT_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedgehint_p_p.h'
 --- src/UbuntuToolkit/ucbottomedgehint_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgehint_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,12 @@
   * Authors: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGEHINT_P
--#define UCBOTTOMEDGEHINT_P
--
--#include "ucbottomedgehint_p.h"
--#include "ucactionitem_p_p.h"
--#include <ubuntugesturesglobal.h>
++#ifndef UCBOTTOMEDGEHINT_P_P_H
++#define UCBOTTOMEDGEHINT_P_P_H
++
++#include <UbuntuToolkit/private/ucbottomedgehint_p.h>
++
++#include <UbuntuToolkit/private/ucactionitem_p_p.h>
  UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
@@ -50,4 +50,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGEHINT_P
++#endif // UCBOTTOMEDGEHINT_P_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedgeregion.cpp'
 --- src/UbuntuToolkit/ucbottomedgeregion.cpp	2016-07-19 18:12:33 +0000
 +++ src/UbuntuToolkit/ucbottomedgeregion.cpp	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#include "ucbottomedge_p_p.h"
  #include "ucbottomedgeregion_p_p.h"
--#include <propertychange_p.h>
++
  #include <QtQml/private/qqmlproperty_p.h>
++#include "propertychange_p.h"
++#include "ucbottomedge_p_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucbottomedgeregion_p.h'
 --- src/UbuntuToolkit/ucbottomedgeregion_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgeregion_p.h	2016-09-09 22:15:37 +0000
@@ -16,15 +16,16 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGEREGION_H
--#define UCBOTTOMEDGEREGION_H
++#ifndef UCBOTTOMEDGEREGION_P_H
++#define UCBOTTOMEDGEREGION_P_H
  #include <QtCore/QObject>
--#include <QtQml/QQmlParserStatus>
++#include <QtCore/QPointer>
  #include <QtCore/QUrl>
--#include <QtCore/QPointer>
  #include <QtQml/QQmlIncubator>
--#include <ubuntutoolkitglobal.h>
++#include <QtQml/QQmlParserStatus>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlComponent;
@@ -85,4 +86,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGEREGION_H
++#endif // UCBOTTOMEDGEREGION_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedgeregion_p_p.h'
 --- src/UbuntuToolkit/ucbottomedgeregion_p_p.h	2016-07-07 15:33:34 +0000
 +++ src/UbuntuToolkit/ucbottomedgeregion_p_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,14 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGEREGION_P
--#define UCBOTTOMEDGEREGION_P
--
--#include "ucbottomedgeregion_p.h"
++#ifndef UCBOTTOMEDGEREGION_P_P_H
++#define UCBOTTOMEDGEREGION_P_P_H
++
++#include <UbuntuToolkit/private/ucbottomedgeregion_p.h>
++
++#include <QtCore/private/qobject_p.h>
++
  #include <UbuntuToolkit/private/asyncloader_p_p.h>
--#include <QtCore/private/qobject_p.h>
  UT_NAMESPACE_BEGIN
@@ -82,4 +84,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGEREGION_P
++#endif // UCBOTTOMEDGEREGION_P_P_H
 === modified file 'src/UbuntuToolkit/ucbottomedgestyle.cpp'
 --- src/UbuntuToolkit/ucbottomedgestyle.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgestyle.cpp	2016-09-09 22:15:37 +0000
@@ -17,6 +17,7 @@
   */
  #include "ucbottomedgestyle_p.h"
++
  #include "ucbottomedge_p_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucbottomedgestyle_p.h'
 --- src/UbuntuToolkit/ucbottomedgestyle_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucbottomedgestyle_p.h	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCBOTTOMEDGESTYLE_H
--#define UCBOTTOMEDGESTYLE_H
++#ifndef UCBOTTOMEDGESTYLE_P_H
++#define UCBOTTOMEDGESTYLE_P_H
  #include <QtQuick/QQuickItem>
--#include "ubuntutoolkitglobal.h"
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQuickItem;
  class QQuickAbstractAnimation;
@@ -63,4 +64,4 @@
  UT_NAMESPACE_END
--#endif // UCBOTTOMEDGESTYLE_H
++#endif // UCBOTTOMEDGESTYLE_P_H
 === modified file 'src/UbuntuToolkit/ucdefaulttheme.cpp'
 --- src/UbuntuToolkit/ucdefaulttheme.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucdefaulttheme.cpp	2016-09-09 22:15:37 +0000
@@ -18,13 +18,14 @@
   */
  #include "ucdefaulttheme_p.h"
--#include "uctheme_p.h"
--#include <QDebug>
++#include <QtCore/QDebug>
  #include <QtCore/QDir>
  #include <QtCore/QFile>
  #include <QtCore/QStandardPaths>
++#include "uctheme_p.h"
++
  UT_NAMESPACE_BEGIN
  /*
 === modified file 'src/UbuntuToolkit/ucdefaulttheme_p.h'
 --- src/UbuntuToolkit/ucdefaulttheme_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucdefaulttheme_p.h	2016-09-09 22:15:37 +0000
@@ -17,13 +17,14 @@
   *          Florian Boucault <florian.boucault@canonical.com>
   */
--#ifndef UCDEFAULTTHEME_H
--#define UCDEFAULTTHEME_H
++#ifndef UCDEFAULTTHEME_P_H
++#define UCDEFAULTTHEME_P_H
  #include <QtCore/QFileSystemWatcher>
++#include <QtCore/QObject>
  #include <QtCore/QSettings>
--#include <QtCore/QObject>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -52,4 +53,4 @@
  UT_NAMESPACE_END
--#endif // UCDEFAULTTHEME_H
++#endif // UCDEFAULTTHEME_P_H
 === modified file 'src/UbuntuToolkit/ucdeprecatedtheme.cpp'
 --- src/UbuntuToolkit/ucdeprecatedtheme.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucdeprecatedtheme.cpp	2016-09-09 22:15:37 +0000
@@ -17,13 +17,15 @@
   */
  #include "ucdeprecatedtheme_p.h"
--#include "uctheme_p.h"
--#include "quickutils_p.h"
--#include "listener_p.h"
++
  #include <QtQml/QQmlComponent>
  #include <QtQml/QQmlContext>
++#include <QtQml/QQmlEngine>
  #include <QtQml/QQmlInfo>
--#include <QtQml/QQmlEngine>
++
++#include "listener_p.h"
++#include "quickutils_p.h"
++#include "uctheme_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucdeprecatedtheme_p.h'
 --- src/UbuntuToolkit/ucdeprecatedtheme_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucdeprecatedtheme_p.h	2016-09-09 22:15:37 +0000
@@ -16,12 +16,13 @@
   * Authors: Zsombor Egri <zsombor.egri@canonical.com>
   */
--#ifndef UCDEPRECATEDTHEME_H
--#define UCDEPRECATEDTHEME_H
++#ifndef UCDEPRECATEDTHEME_P_H
++#define UCDEPRECATEDTHEME_P_H
++#include <QtCore/QHash>
  #include <QtCore/QObject>
--#include <QtCore/QHash>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlComponent;
  class QQmlContext;
@@ -59,4 +60,4 @@
  UT_NAMESPACE_END
--#endif // UCDEPRECATEDTHEME_H
++#endif // UCDEPRECATEDTHEME_P_H
 === modified file 'src/UbuntuToolkit/ucfontutils.cpp'
 --- src/UbuntuToolkit/ucfontutils.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucfontutils.cpp	2016-09-09 22:15:37 +0000
@@ -12,10 +12,10 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "ucfontutils_p.h"
++
  #include "ucunits_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucfontutils_p.h'
 --- src/UbuntuToolkit/ucfontutils_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucfontutils_p.h	2016-09-09 22:15:37 +0000
@@ -12,14 +12,14 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCFONTUTILS_H
--#define UCFONTUTILS_H
++#ifndef UCFONTUTILS_P_H
++#define UCFONTUTILS_P_H
  #include <QtCore/QObject>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -68,4 +68,4 @@
  #define SCALE_XSMALL        0x6d732d78 // "x-sm"
  #define SCALE_XXSMALL       0x732d7878 // "xx-s"
--#endif // UCFONTUTILS_H
++#endif // UCFONTUTILS_P_H
 === modified file 'src/UbuntuToolkit/uchaptics.cpp'
 --- src/UbuntuToolkit/uchaptics.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uchaptics.cpp	2016-09-09 22:15:37 +0000
@@ -15,9 +15,11 @@
   */
  #include "uchaptics_p.h"
++
++#include <QtCore/QUrl>
++#include <QtCore/QDebug>
  #include <QtQml/QQmlComponent>
--#include <QtCore/QUrl>
--#include <QDebug>
++
  #include "ubuntutoolkitmodule.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/uchaptics_p.h'
 --- src/UbuntuToolkit/uchaptics_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uchaptics_p.h	2016-09-09 22:15:37 +0000
@@ -14,13 +14,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCHAPTICS_H
--#define UCHAPTICS_H
++#ifndef UCHAPTICS_P_H
++#define UCHAPTICS_P_H
  #include <QtCore/QObject>
  #include <QtCore/QVariant>
  #include <QtQml/QQmlEngine>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlEngine;
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucheader.cpp'
 --- src/UbuntuToolkit/ucheader.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucheader.cpp	2016-09-09 22:15:37 +0000
@@ -15,10 +15,12 @@
   */
  #include "ucheader_p.h"
--#include <QDebug>
--#include <QtQuick/private/qquickflickable_p.h>
++
++#include <QtCore/QDebug>
  #include <QtQuick/private/qquickanchors_p.h>
  #include <QtQuick/private/qquickanimation_p.h>
++#include <QtQuick/private/qquickflickable_p.h>
++
  #include "ucubuntuanimation_p.h"
  #include "ucunits_p.h"
 === modified file 'src/UbuntuToolkit/ucheader_p.h'
 --- src/UbuntuToolkit/ucheader_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucheader_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCHEADER_H
--#define UCHEADER_H
++#ifndef UCHEADER_P_H
++#define UCHEADER_P_H
--#include "ucstyleditembase_p.h"
  #include <QtCore/QPointer>
++#include <UbuntuToolkit/private/ucstyleditembase_p.h>
++
  class QQuickFlickable;
  class QQuickNumberAnimation;
@@ -80,4 +81,4 @@
  UT_NAMESPACE_END
--#endif // UCHEADER_H
++#endif // UCHEADER_P_H
 === modified file 'src/UbuntuToolkit/ucimportversionchecker_p.cpp'
 --- src/UbuntuToolkit/ucimportversionchecker_p.cpp	2016-06-17 11:26:12 +0000
 +++ src/UbuntuToolkit/ucimportversionchecker_p.cpp	2016-09-09 22:15:37 +0000
@@ -18,11 +18,11 @@
  #include "ucimportversionchecker_p.h"
--#include <QtQuick>
++#include <QtQml/private/qqmlcontext_p.h>
  #include <QtQml/private/qqmldata_p.h>
--#include <QtQml/private/qqmlcontext_p.h>
++#include <QtQml/private/qqmlmetatype_p.h>
  #include <QtQml/private/qqmlpropertycache_p.h>
--#include <QtQml/private/qqmlmetatype_p.h>
++#include <QtQuick/QtQuick>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucimportversionchecker_p.h'
 --- src/UbuntuToolkit/ucimportversionchecker_p.h	2016-07-06 09:51:06 +0000
 +++ src/UbuntuToolkit/ucimportversionchecker_p.h	2016-09-09 22:15:37 +0000
@@ -19,8 +19,9 @@
  #ifndef UCIMPORTVERSIONCHECKER_P_H
  #define UCIMPORTVERSIONCHECKER_P_H
--#include <QtCore>
--#include <ubuntutoolkitglobal.h>
++#include <QtCore/QtCore>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucinversemouse_p.h'
 --- src/UbuntuToolkit/ucinversemouse_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucinversemouse_p.h	2016-09-09 22:15:37 +0000
@@ -12,15 +12,15 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCINVERSEMOUSE_H
--#define UCINVERSEMOUSE_H
--
--#include "ucmouse_p.h"
--#include <QtQml>
--#include <ubuntutoolkitglobal.h>
++#ifndef UCINVERSEMOUSE_P_H
++#define UCINVERSEMOUSE_P_H
++
++#include <QtQml/QtQml>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucmouse_p.h>
  UT_NAMESPACE_BEGIN
@@ -52,4 +52,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCInverseMouse))
  QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCInverseMouse), QML_HAS_ATTACHED_PROPERTIES)
--#endif // UCINVERSEMOUSE_H
++#endif // UCINVERSEMOUSE_P_H
 === modified file 'src/UbuntuToolkit/uclabel.cpp'
 --- src/UbuntuToolkit/uclabel.cpp	2016-07-07 08:42:42 +0000
 +++ src/UbuntuToolkit/uclabel.cpp	2016-09-09 22:15:37 +0000
@@ -15,10 +15,11 @@
   */
  #include "label_p.h"
++
++#include "quickutils_p.h"
  #include "ucfontutils_p.h"
++#include "uctheme_p.h"
  #include "ucunits_p.h"
--#include "uctheme_p.h"
--#include <quickutils_p.h>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/uclabel_p.h'
 --- src/UbuntuToolkit/uclabel_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclabel_p.h	2016-09-09 22:15:37 +0000
@@ -14,14 +14,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLABEL_H
--#define UCLABEL_H
++#ifndef UCLABEL_P_H
++#define UCLABEL_P_H
++
++#include <functional>  // std::function
  #include <QtQuick/private/qquicktext_p.h>
--#include "ucthemingextension_p.h"
--// C++ std lib for std::function declaration
--#include <functional>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucthemingextension_p.h>
  UT_NAMESPACE_BEGIN
@@ -101,4 +102,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCLabel))
--#endif  // UCLABEL_H
++#endif  // UCLABEL_P_H
 === modified file 'src/UbuntuToolkit/uclistitem.cpp'
 --- src/UbuntuToolkit/uclistitem.cpp	2016-08-22 13:37:46 +0000
 +++ src/UbuntuToolkit/uclistitem.cpp	2016-09-09 22:15:37 +0000
@@ -14,31 +14,33 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "ucunits_p.h"
--#include "uctheme_p.h"
  #include "uclistitem_p_p.h"
--#include "uclistitemactions_p_p.h"
--#include "privates/listitemselection_p.h"
--#include "ucubuntuanimation_p.h"
--#include <propertychange_p.h>
--#include "i18n_p.h"
--#include "quickutils_p.h"
--#include "ucaction_p.h"
--#include "privates/listviewextensions_p.h"
--#include <QtQml/QQmlInfo>
--#include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickflickable_p.h>
--#include <QtQuick/private/qquickpositioners_p.h>
++
++#include <QtCore/QFileInfo>
++#include <QtCore/QLibraryInfo>
  #include <QtGui/QGuiApplication>
  #include <QtGui/QStyleHints>
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlInfo>
  #include <QtQuick/private/qquickanimation_p.h>
++#include <QtQuick/private/qquickbehavior_p.h>
++#include <QtQuick/private/qquickflickable_p.h>
++#include <QtQuick/private/qquickitem_p.h>
  #include <QtQuick/private/qquickmousearea_p.h>
++#include <QtQuick/private/qquickpositioners_p.h>
++
++#include "i18n_p.h"
++#include "privates/listitemselection_p.h"
++#include "privates/listviewextensions_p.h"
++#include "propertychange_p.h"
++#include "quickutils_p.h"
++#include "ubuntutoolkitmodule.h"
++#include "ucaction_p.h"
++#include "uclistitemactions_p_p.h"
  #include "uclistitemstyle_p.h"
--#include <QtQuick/private/qquickbehavior_p.h>
--#include <QtQml/QQmlEngine>
--#include <QFileInfo>
--#include <QLibraryInfo>
--#include <ubuntutoolkitmodule.h>
++#include "uctheme_p.h"
++#include "ucubuntuanimation_p.h"
++#include "ucunits_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/uclistitem_p.h'
 --- src/UbuntuToolkit/uclistitem_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitem_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLISTITEM_H
--#define UCLISTITEM_H
++#ifndef UCLISTITEM_P_H
++#define UCLISTITEM_P_H
  #include <QtQuick/QQuickItem>
--#include "ucstyleditembase_p.h"
++
++#include <UbuntuToolkit/private/ucstyleditembase_p.h>
  UT_NAMESPACE_BEGIN
@@ -320,4 +321,4 @@
  UT_NAMESPACE_END
--#endif // UCLISTITEM_H
++#endif // UCLISTITEM_P_H
 === modified file 'src/UbuntuToolkit/uclistitem_p_p.h'
 --- src/UbuntuToolkit/uclistitem_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitem_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,16 +14,18 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCVIEWITEM_P_H
--#define UCVIEWITEM_P_H
--
--#include "uclistitem_p.h"
--#include "ucstyleditembase_p_p.h"
--#include "uclistitemstyle_p.h"
++#ifndef UCLISTITEM_P_P_H
++#define UCLISTITEM_P_P_H
++
++#include <UbuntuToolkit/private/uclistitem_p.h>
++
  #include <QtCore/QPointer>
  #include <QtCore/QBasicTimer>
  #include <QtQuick/private/qquickrectangle_p.h>
++#include <UbuntuToolkit/private/uclistitemstyle_p.h>
++#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
++
  #define IMPLICIT_LISTITEM_WIDTH_GU      40
  #define IMPLICIT_LISTITEM_HEIGHT_GU     7
  #define DIVIDER_THICKNESS_DP            1
@@ -179,4 +181,4 @@
  UT_NAMESPACE_END
--#endif // UCVIEWITEM_P_H
++#endif // UCLISTITEM_P_P_H
 === modified file 'src/UbuntuToolkit/uclistitemactions.cpp'
 --- src/UbuntuToolkit/uclistitemactions.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemactions.cpp	2016-09-09 22:15:37 +0000
@@ -15,13 +15,15 @@
   */
  #include "uclistitemactions_p_p.h"
--#include "uclistitem_p_p.h"
++
++#include <QtQml/QQmlInfo>
++
++#include "i18n_p.h"
  #include "quickutils_p.h"
--#include "i18n_p.h"
--#include <QtQml/QQmlInfo>
  #include "ucaction_p.h"
++#include "uclistitem_p_p.h"
++#include "uclistitemstyle_p.h"
  #include "ucunits_p.h"
--#include "uclistitemstyle_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/uclistitemactions_p.h'
 --- src/UbuntuToolkit/uclistitemactions_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemactions_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLISTITEMACTIONS_H
--#define UCLISTITEMACTIONS_H
++#ifndef UCLISTITEMACTIONS_P_H
++#define UCLISTITEMACTIONS_P_H
  #include <QtCore/QObject>
--#include "uclistitem_p_p.h"
++
++#include <UbuntuToolkit/private/uclistitem_p_p.h>
  class QQmlComponent;
@@ -51,4 +52,4 @@
  UT_NAMESPACE_END
--#endif // UCLISTITEMACTIONS_H
++#endif // UCLISTITEMACTIONS_P_H
 === modified file 'src/UbuntuToolkit/uclistitemactions_p_p.h'
 --- src/UbuntuToolkit/uclistitemactions_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemactions_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLISTITEMACTIONS_P_H
--#define UCLISTITEMACTIONS_P_H
--
--#include "uclistitemactions_p.h"
--#include "QtCore/private/qobject_p.h"
++#ifndef UCLISTITEMACTIONS_P_P_H
++#define UCLISTITEMACTIONS_P_P_H
++
++#include <UbuntuToolkit/private/uclistitemactions_p.h>
++
++#include <QtCore/private/qobject_p.h>
  #include <QtQml/QQmlListProperty>
  UT_NAMESPACE_BEGIN
@@ -46,4 +47,4 @@
  UT_NAMESPACE_END
--#endif // UCLISTITEMACTIONS_P_H
++#endif // UCLISTITEMACTIONS_P_P_H
 === modified file 'src/UbuntuToolkit/uclistitemlayout.cpp'
 --- src/UbuntuToolkit/uclistitemlayout.cpp	2016-07-22 18:14:52 +0000
 +++ src/UbuntuToolkit/uclistitemlayout.cpp	2016-09-09 22:15:37 +0000
@@ -16,11 +16,12 @@
   * Author: Andrea Bernabei <andrea.bernabei@canonical.com>
   */
--#include "private/qqmldata_p.h"
++#include "uclistitemlayout_p.h"
++
  #include <QtQml/QQmlEngine>
++#include <QtQml/private/qqmldata_p.h>
  #include "privates/threelabelsslot_p.h"
--#include "uclistitemlayout_p.h"
  #include "uclabel_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/uclistitemlayout_p.h'
 --- src/UbuntuToolkit/uclistitemlayout_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemlayout_p.h	2016-09-09 22:15:37 +0000
@@ -14,11 +14,11 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLISTITEMLAYOUT_H
--#define UCLISTITEMLAYOUT_H
++#ifndef UCLISTITEMLAYOUT_P_H
++#define UCLISTITEMLAYOUT_P_H
--#include "ucslotslayout_p.h"
--#include <ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
++#include <UbuntuToolkit/private/ucslotslayout_p.h>
  UT_NAMESPACE_BEGIN
@@ -51,4 +51,4 @@
  UT_NAMESPACE_END
--#endif // UCLISTITEMLAYOUT_H
++#endif // UCLISTITEMLAYOUT_P_H
 === modified file 'src/UbuntuToolkit/uclistitemstyle.cpp'
 --- src/UbuntuToolkit/uclistitemstyle.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemstyle.cpp	2016-09-09 22:15:37 +0000
@@ -15,14 +15,16 @@
   */
  #include "uclistitemstyle_p.h"
--#include "i18n_p.h"
--#include "uclistitem_p_p.h"
++
++#include <QtQml/QQmlContext>
  #include <QtQml/QQmlEngine>
--#include <QtQml/QQmlContext>
  #include <QtQml/QQmlInfo>
  #include <QtQuick/private/qquickanimation_p.h>
  #include <QtQuick/private/qquickflickable_p.h>
++#include "uclistitem_p_p.h"
++#include "i18n_p.h"
++
  UT_NAMESPACE_BEGIN
  /*!
 === modified file 'src/UbuntuToolkit/uclistitemstyle_p.h'
 --- src/UbuntuToolkit/uclistitemstyle_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/uclistitemstyle_p.h	2016-09-09 22:15:37 +0000
@@ -13,11 +13,13 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCLISTITEMSTYLE_H
--#define UCLISTITEMSTYLE_H
++
++#ifndef UCLISTITEMSTYLE_P_H
++#define UCLISTITEMSTYLE_P_H
  #include <QtQuick/QQuickItem>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  class QQmlComponent;
  class QQuickAbstractAnimation;
@@ -122,4 +124,4 @@
  UT_NAMESPACE_END
--#endif // UCLISTITEMSTYLE_H
++#endif // UCLISTITEMSTYLE_P_H
 === modified file 'src/UbuntuToolkit/ucmainviewbase.cpp'
 --- src/UbuntuToolkit/ucmainviewbase.cpp	2016-09-06 16:49:08 +0000
 +++ src/UbuntuToolkit/ucmainviewbase.cpp	2016-09-09 22:15:37 +0000
@@ -16,16 +16,15 @@
  #include "ucmainviewbase_p_p.h"
++#include <QtCore/QCoreApplication>
++
++#include "colorutils_p.h"
++#include "i18n_p.h"
++#include "quickutils_p.h"
++#include "ucactioncontext_p.h"
  #include "ucactionmanager_p.h"
--#include "ucactioncontext_p.h"
  #include "ucapplication_p.h"
  #include "uctheme_p.h"
--#include "i18n_p.h"
--#include "quickutils_p.h"
--
--#include <colorutils_p.h>
--
--#include <QCoreApplication>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucmainviewbase_p.h'
 --- src/UbuntuToolkit/ucmainviewbase_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmainviewbase_p.h	2016-09-09 22:15:37 +0000
@@ -14,10 +14,10 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCMAINVIEWBASE_H
--#define UCMAINVIEWBASE_H
++#ifndef UCMAINVIEWBASE_P_H
++#define UCMAINVIEWBASE_P_H
--#include "ucpagetreenode_p.h"
++#include <UbuntuToolkit/private/ucpagetreenode_p.h>
  UT_NAMESPACE_BEGIN
@@ -97,4 +97,4 @@
  UT_NAMESPACE_END
--#endif // UCMAINVIEWBASE_H
++#endif // UCMAINVIEWBASE_P_H
 === modified file 'src/UbuntuToolkit/ucmainviewbase_p_p.h'
 --- src/UbuntuToolkit/ucmainviewbase_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmainviewbase_p_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCMAINVIEWBASE_P_H
--#define UCMAINVIEWBASE_P_H
--
--#include "ucpagetreenode_p_p.h"
--#include "ucmainviewbase_p.h"
--#include <QQmlProperty>
++#ifndef UCMAINVIEWBASE_P_P_H
++#define UCMAINVIEWBASE_P_P_H
++
++#include <UbuntuToolkit/private/ucmainviewbase_p.h>
++
++#include <QtQml/QQmlProperty>
++
++#include <UbuntuToolkit/private/ucpagetreenode_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -59,4 +61,4 @@
  UT_NAMESPACE_END
--#endif // UCMAINVIEWBASE_P_H
++#endif // UCMAINVIEWBASE_P_P_H
 === modified file 'src/UbuntuToolkit/ucmargins_p.h'
 --- src/UbuntuToolkit/ucmargins_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmargins_p.h	2016-09-09 22:15:37 +0000
@@ -14,12 +14,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCMARGINS_H
--#define UCMARGINS_H
++#ifndef UCMARGINS_P_H
++#define UCMARGINS_P_H
  #include <QtCore/QObject>
  #include <QtQuick/QQuickItem>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -78,4 +79,4 @@
  UT_NAMESPACE_END
--#endif // UCMARGINS_H
++#endif // UCMARGINS_P_H
 === modified file 'src/UbuntuToolkit/ucmathutils.cpp'
 --- src/UbuntuToolkit/ucmathutils.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmathutils.cpp	2016-09-09 22:15:37 +0000
@@ -12,11 +12,11 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "ucmathutils_p.h"
--#include <QDebug>
++
++#include <QtCore/QDebug>
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucmathutils_p.h'
 --- src/UbuntuToolkit/ucmathutils_p.h	2016-08-11 14:07:52 +0000
 +++ src/UbuntuToolkit/ucmathutils_p.h	2016-09-09 22:15:37 +0000
@@ -12,14 +12,14 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCMATHUTILS_H
--#define UCMATHUTILS_H
--
--#include <QObject>
--#include <ubuntutoolkitglobal.h>
++#ifndef UCMATHUTILS_P_H
++#define UCMATHUTILS_P_H
++
++#include <QtCore/QObject>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  QT_FORWARD_DECLARE_CLASS(QQmlEngine)
  QT_FORWARD_DECLARE_CLASS(QJSEngine)
@@ -40,4 +40,4 @@
  UT_NAMESPACE_END
--#endif // UCMATHUTILS_H
++#endif // UCMATHUTILS_P_H
 === modified file 'src/UbuntuToolkit/ucmouse_p.h'
 --- src/UbuntuToolkit/ucmouse_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmouse_p.h	2016-09-09 22:15:37 +0000
@@ -12,18 +12,18 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
--#ifndef UCMOUSE_H
--#define UCMOUSE_H
++#ifndef UCMOUSE_P_H
++#define UCMOUSE_P_H
++#include <QtCore/QBasicTimer>
  #include <QtCore/QObject>
--#include <QtQml>
++#include <QtQml/QtQml>
  #include <QtQuick/QQuickItem>
--#include <private/qquickevents_p_p.h>
--#include <QtCore/qbasictimer.h>
--#include <ubuntutoolkitglobal.h>
++#include <QtQuick/private/qquickevents_p_p.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -169,4 +169,4 @@
  QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCMouse), QML_HAS_ATTACHED_PROPERTIES)
--#endif // UCMOUSE_H
++#endif // UCMOUSE_P_H
 === modified file 'src/UbuntuToolkit/ucmousefilters.cpp'
 --- src/UbuntuToolkit/ucmousefilters.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucmousefilters.cpp	2016-09-09 22:15:37 +0000
@@ -12,19 +12,19 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
   */
  #include "ucmouse_p.h"
--#include "ucinversemouse_p.h"
++
++#include <QtGui/QGuiApplication>
  #include <QtQml/QQmlInfo>
--#include <QtGui/QGuiApplication>
--#include <private/qqmlglobal_p.h>
++#include <QtQml/private/qqmlglobal_p.h>
  #include <QtQuick/private/qquickmousearea_p.h>
++
++#include "i18n_p.h"
  #include "inversemouseareatype_p.h"
--#include "i18n_p.h"
--
  #include "quickutils_p.h"
++#include "ucinversemouse_p.h"
  #include "ucunits_p.h"
  UT_NAMESPACE_BEGIN
 === modified file 'src/UbuntuToolkit/ucpagetreenode.cpp'
 --- src/UbuntuToolkit/ucpagetreenode.cpp	2016-07-07 08:42:42 +0000
 +++ src/UbuntuToolkit/ucpagetreenode.cpp	2016-09-09 22:15:37 +0000
@@ -16,7 +16,7 @@
  #include "ucpagetreenode_p_p.h"
--#include <QQmlEngine>
++#include <QtQml/QQmlEngine>
  Q_LOGGING_CATEGORY(ucPageTreeNode, "ubuntu.components.PageTreeNode", QtMsgType::QtWarningMsg)
 === modified file 'src/UbuntuToolkit/ucpagetreenode_p.h'
 --- src/UbuntuToolkit/ucpagetreenode_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucpagetreenode_p.h	2016-09-09 22:15:37 +0000
@@ -13,10 +13,11 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCPAGETREENODE_H
--#define UCPAGETREENODE_H
--
--#include "ucstyleditembase_p.h"
++
++#ifndef UCPAGETREENODE_P_H
++#define UCPAGETREENODE_P_H
++
++#include <UbuntuToolkit/private/ucstyleditembase_p.h>
  UT_NAMESPACE_BEGIN
@@ -99,4 +100,4 @@
  UT_NAMESPACE_END
--#endif // UCPAGETREENODE_H
++#endif // UCPAGETREENODE_P_H
 === modified file 'src/UbuntuToolkit/ucpagetreenode_p_p.h'
 --- src/UbuntuToolkit/ucpagetreenode_p_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucpagetreenode_p_p.h	2016-09-09 22:15:37 +0000
@@ -13,11 +13,13 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef UCPAGETREENODE_P_H
--#define UCPAGETREENODE_P_H
--
--#include "ucstyleditembase_p_p.h"
--#include "ucpagetreenode_p.h"
++
++#ifndef UCPAGETREENODE_P_P_H
++#define UCPAGETREENODE_P_P_H
++
++#include <UbuntuToolkit/private/ucpagetreenode_p.h>
++
++#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
  UT_NAMESPACE_BEGIN
@@ -70,4 +72,4 @@
  UT_NAMESPACE_END
--#endif // UCPAGETREENODE_P_H
++#endif // UCPAGETREENODE_P_P_H
 === modified file 'src/UbuntuToolkit/ucperformancemonitor.cpp'
 --- src/UbuntuToolkit/ucperformancemonitor.cpp	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucperformancemonitor.cpp	2016-09-09 22:15:37 +0000
@@ -17,6 +17,7 @@
   */
  #include "ucperformancemonitor_p.h"
++
  #include <QtGui/QGuiApplication>
  Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")
 === modified file 'src/UbuntuToolkit/ucperformancemonitor_p.h'
 --- src/UbuntuToolkit/ucperformancemonitor_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucperformancemonitor_p.h	2016-09-09 22:15:37 +0000
@@ -16,15 +16,16 @@
   * Author: Florian Boucault <florian.boucault@canonical.com>
   */
--#ifndef UCPERFORMANCE_MONITOR_H
--#define UCPERFORMANCE_MONITOR_H
++#ifndef UCPERFORMANCEMONITOR_P_H
++#define UCPERFORMANCEMONITOR_P_H
++#include <QtCore/QElapsedTimer>
++#include <QtCore/QLoggingCategory>
  #include <QtCore/QObject>
  #include <QtCore/QSharedPointer>
--#include <QtCore/QElapsedTimer>
--#include <QtCore/QLoggingCategory>
  #include <QtQuick/QQuickWindow>
--#include <ubuntutoolkitglobal.h>
++
++#include <UbuntuToolkit/ubuntutoolkitglobal.h>
  UT_NAMESPACE_BEGIN
@@ -57,4 +58,4 @@
  Q_DECLARE_LOGGING_CATEGORY(ucPerformance)
--#endif // UCPERFORMANCE_MONITOR_H
++#endif // UCPERFORMANCEMONITOR_P_H
 === modified file 'src/UbuntuToolkit/ucproportionalshape_p.h'
 --- src/UbuntuToolkit/ucproportionalshape_p.h	2016-07-07 07:21:48 +0000
 +++ src/UbuntuToolkit/ucproportionalshape_p.h	2016-09-09 22:15:37 +0000
@@ -16,10 +16,10 @@
   * Author: Loïc Molinari <loic.molinari@canonical.com>
   */
--#ifndef UCPROPORTIONALSHAPE_H
--#define UCPROPORTIONALSHAPE_H
++#ifndef UCPROPORTIONALSHAPE_P_H
++#define UCPROPORTIONALSHAPE_P_H
--#include "ucubuntushape_p.h"
++#include <UbuntuToolkit/private/ucubuntushape_p.h>
  UT_NAMESPACE_BEGIN
@@ -44,4 +44,4 @@
  QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCProportionalShape))