a11y: move accessibility stuff to its own directory, adding a private lib for building

(bzr r4054.2.4)

63 files changed, 115 insertions, 124 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2312b3ae..d8da80363 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,6 +262,7 @@ pkg_check_modules (CACHED_UNITY_PRIVATE_DEPS REQUIRED ${UNITY_PROTOCOL_PRIVATE_D
 find_library (UNITY_PROTOCOL_PRIVATE_LIB unity-protocol-private ${CACHED_UNITY_PRIVATE_DEPS_LIBDIR} ${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS})
 set(UNITY_STANDALONE_LADD ${UNITY_STANDALONE_LADD} ${UNITY_PROTOCOL_PRIVATE_LIB})
 
+add_subdirectory(a11y)
 add_subdirectory(unity-shared)
 add_subdirectory(dash)
 add_subdirectory(launcher)
diff --git a/a11y/CMakeLists.txt b/a11y/CMakeLists.txt
new file mode 100644
index 000000000..9a4714d67
--- /dev/null
+++ b/a11y/CMakeLists.txt
@@ -0,0 +1,48 @@
+pkg_check_modules(A11Y_DEPS REQUIRED atk atk-bridge-2.0)
+
+set(CFLAGS
+ ${CACHED_UNITY_DEPS_CFLAGS}
+ ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
+ ${PIC_FLAGS}
+ ${A11Y_DEPS_CFLAGS})
+
+include_directories(.. ../unity-shared ../dash ../panel ../launcher ../shutdown ../plugins/unityshell/src ${CMAKE_BINARY_DIR})
+
+string(REPLACE ";" " " CFLAGS "${CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
+set(LIBS ${CACHED_UNITY_DEPS_LDFLAGS} ${A11Y_DEPS_LDFLAGS})
+
+set(A11Y_SOURCES
+ nux-area-accessible.cpp
+ nux-base-window-accessible.cpp
+ nux-layout-accessible.cpp
+ nux-object-accessible.cpp
+ nux-text-entry-accessible.cpp
+ nux-view-accessible.cpp
+ unity-dash-view-accessible.cpp
+ unity-expander-view-accessible.cpp
+ unity-filter-basic-button-accessible.cpp
+ unity-launcher-accessible.cpp
+ unity-launcher-icon-accessible.cpp
+ unity-panel-view-accessible.cpp
+ unity-places-group-accessible.cpp
+ unity-quicklist-accessible.cpp
+ unity-quicklist-menu-accessible.cpp
+ unity-quicklist-menu-item-accessible.cpp
+ unity-result-accessible.cpp
+ unity-root-accessible.cpp
+ unity-rvgrid-accessible.cpp
+ unity-scope-bar-icon-accessible.cpp
+ unity-sctext-accessible.cpp
+ unity-search-bar-accessible.cpp
+ unity-session-button-accessible.cpp
+ unity-switcher-accessible.cpp
+ unity-text-input-accessible.cpp
+ unity-util-accessible.cpp
+ unitya11y.cpp
+ unitya11ytests.cpp
+)
+
+add_library(a11y-lib STATIC ${A11Y_SOURCES})
+target_link_libraries(a11y-lib ${LIBS})
+add_pch(pch/a11y_pch.hh a11y-lib)
diff --git a/plugins/unityshell/src/nux-area-accessible.cpp b/a11y/nux-area-accessible.cpp
index d3c456c2f..bffad5ad3 100644
--- a/plugins/unityshell/src/nux-area-accessible.cpp
+++ b/a11y/nux-area-accessible.cpp
@@ -178,8 +178,10 @@ nux_area_accessible_initialize(AtkObject* accessible,
 /* focus support based on Focusable, used on the Dash */
 area->key_nav_focus_change.connect(sigc::bind(sigc::ptr_fun(on_focus_changed_cb), accessible));
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 atk_component_add_focus_handler(ATK_COMPONENT(accessible),
 nux_area_accessible_focus_handler);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 /* NOTE: we can't search for the parent window on initialization as a
 general rule, or we could enter an infinite loop. At area this
@@ -534,8 +536,8 @@ nux_area_accessible_real_check_pending_notification(NuxAreaAccessible* self)
 if (nux_object == NULL) /* defunct */
 return FALSE;
 
- g_signal_emit_by_name(self, "focus_event", self->priv->focused);
- atk_focus_tracker_notify(ATK_OBJECT(self));
+ g_signal_emit_by_name(self, "focus-event", self->priv->focused);
+ atk_object_notify_state_change(ATK_OBJECT(self), ATK_STATE_FOCUSED, self->priv->focused);
 self->priv->pending_notification = FALSE;
 
 return TRUE;
@@ -573,7 +575,7 @@ check_focus(NuxAreaAccessible* self)
 else
 {
 g_signal_emit_by_name(self, "focus_event", focus_in);
- atk_focus_tracker_notify(ATK_OBJECT(self));
+ atk_object_notify_state_change(ATK_OBJECT(self), ATK_STATE_FOCUSED, focus_in);
 self->priv->pending_notification = FALSE;
 }
 }
diff --git a/plugins/unityshell/src/nux-area-accessible.h b/a11y/nux-area-accessible.h
index a5326c63f..a5326c63f 100644
--- a/plugins/unityshell/src/nux-area-accessible.h
+++ b/a11y/nux-area-accessible.h
diff --git a/plugins/unityshell/src/nux-base-window-accessible.cpp b/a11y/nux-base-window-accessible.cpp
index e82b536d7..e82b536d7 100644
--- a/plugins/unityshell/src/nux-base-window-accessible.cpp
+++ b/a11y/nux-base-window-accessible.cpp
diff --git a/plugins/unityshell/src/nux-base-window-accessible.h b/a11y/nux-base-window-accessible.h
index 0fa6382d4..0fa6382d4 100644
--- a/plugins/unityshell/src/nux-base-window-accessible.h
+++ b/a11y/nux-base-window-accessible.h
diff --git a/plugins/unityshell/src/nux-layout-accessible.cpp b/a11y/nux-layout-accessible.cpp
index d4a3e3b4a..d4a3e3b4a 100644
--- a/plugins/unityshell/src/nux-layout-accessible.cpp
+++ b/a11y/nux-layout-accessible.cpp
diff --git a/plugins/unityshell/src/nux-layout-accessible.h b/a11y/nux-layout-accessible.h
index cc9a50cd3..cc9a50cd3 100644
--- a/plugins/unityshell/src/nux-layout-accessible.h
+++ b/a11y/nux-layout-accessible.h
diff --git a/plugins/unityshell/src/nux-object-accessible.cpp b/a11y/nux-object-accessible.cpp
index 4e25c2963..4e25c2963 100644
--- a/plugins/unityshell/src/nux-object-accessible.cpp
+++ b/a11y/nux-object-accessible.cpp
diff --git a/plugins/unityshell/src/nux-object-accessible.h b/a11y/nux-object-accessible.h
index decf9b358..decf9b358 100644
--- a/plugins/unityshell/src/nux-object-accessible.h
+++ b/a11y/nux-object-accessible.h
diff --git a/plugins/unityshell/src/nux-text-entry-accessible.cpp b/a11y/nux-text-entry-accessible.cpp
index bda50a611..bda50a611 100644
--- a/plugins/unityshell/src/nux-text-entry-accessible.cpp
+++ b/a11y/nux-text-entry-accessible.cpp
diff --git a/plugins/unityshell/src/nux-text-entry-accessible.h b/a11y/nux-text-entry-accessible.h
index b618bd85a..b618bd85a 100644
--- a/plugins/unityshell/src/nux-text-entry-accessible.h
+++ b/a11y/nux-text-entry-accessible.h
diff --git a/plugins/unityshell/src/nux-view-accessible.cpp b/a11y/nux-view-accessible.cpp
index bc4eea568..2718437eb 100644
--- a/plugins/unityshell/src/nux-view-accessible.cpp
+++ b/a11y/nux-view-accessible.cpp
@@ -295,7 +295,7 @@ nux_view_accessible_check_pending_notification(NuxAreaAccessible* area_accessibl
 return FALSE;
 
 g_signal_emit_by_name(self, "focus_event", self->priv->key_focused);
- atk_focus_tracker_notify(ATK_OBJECT(self));
+ atk_object_notify_state_change(ATK_OBJECT(self), ATK_STATE_FOCUSED, self->priv->key_focused);
 self->priv->pending_notification = FALSE;
 
 return TRUE;
diff --git a/plugins/unityshell/src/nux-view-accessible.h b/a11y/nux-view-accessible.h
index bca728ce6..bca728ce6 100644
--- a/plugins/unityshell/src/nux-view-accessible.h
+++ b/a11y/nux-view-accessible.h
diff --git a/a11y/pch/a11y_pch.hh b/a11y/pch/a11y_pch.hh
new file mode 100644
index 000000000..ecae45c9c
--- /dev/null
+++ b/a11y/pch/a11y_pch.hh
@@ -0,0 +1,33 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
+ */
+
+/*
+ * These are the precompiled header includes for this module.
+ * Only system header files can be listed here.
+ */
+
+#include <atk/atk.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include <gmodule.h>
+#include <stdio.h>
+#include <atk-bridge.h>
+#include <Nux/Nux.h>
+#include <Nux/WindowThread.h>
+#include <NuxCore/Object.h>
diff --git a/plugins/unityshell/src/unity-dash-view-accessible.cpp b/a11y/unity-dash-view-accessible.cpp
index 76258e128..76258e128 100644
--- a/plugins/unityshell/src/unity-dash-view-accessible.cpp
+++ b/a11y/unity-dash-view-accessible.cpp
diff --git a/plugins/unityshell/src/unity-dash-view-accessible.h b/a11y/unity-dash-view-accessible.h
index 9d3ef7cc1..9d3ef7cc1 100644
--- a/plugins/unityshell/src/unity-dash-view-accessible.h
+++ b/a11y/unity-dash-view-accessible.h
diff --git a/plugins/unityshell/src/unity-expander-view-accessible.cpp b/a11y/unity-expander-view-accessible.cpp
index b16f5c3d2..b16f5c3d2 100644
--- a/plugins/unityshell/src/unity-expander-view-accessible.cpp
+++ b/a11y/unity-expander-view-accessible.cpp
diff --git a/plugins/unityshell/src/unity-expander-view-accessible.h b/a11y/unity-expander-view-accessible.h
index 0c9855d79..0c9855d79 100644
--- a/plugins/unityshell/src/unity-expander-view-accessible.h
+++ b/a11y/unity-expander-view-accessible.h
diff --git a/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp b/a11y/unity-filter-basic-button-accessible.cpp
index 1011e86f5..1011e86f5 100644
--- a/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp
+++ b/a11y/unity-filter-basic-button-accessible.cpp
diff --git a/plugins/unityshell/src/unity-filter-basic-button-accessible.h b/a11y/unity-filter-basic-button-accessible.h
index a5eed8df0..a5eed8df0 100644
--- a/plugins/unityshell/src/unity-filter-basic-button-accessible.h
+++ b/a11y/unity-filter-basic-button-accessible.h
diff --git a/plugins/unityshell/src/unity-launcher-accessible.cpp b/a11y/unity-launcher-accessible.cpp
index 182ad524f..182ad524f 100644
--- a/plugins/unityshell/src/unity-launcher-accessible.cpp
+++ b/a11y/unity-launcher-accessible.cpp
diff --git a/plugins/unityshell/src/unity-launcher-accessible.h b/a11y/unity-launcher-accessible.h
index faa9817a2..faa9817a2 100644
--- a/plugins/unityshell/src/unity-launcher-accessible.h
+++ b/a11y/unity-launcher-accessible.h
diff --git a/plugins/unityshell/src/unity-launcher-icon-accessible.cpp b/a11y/unity-launcher-icon-accessible.cpp
index dff762d1c..8afb4e823 100644
--- a/plugins/unityshell/src/unity-launcher-icon-accessible.cpp
+++ b/a11y/unity-launcher-icon-accessible.cpp
@@ -245,8 +245,10 @@ unity_launcher_icon_accessible_initialize(AtkObject* accessible,
 
 accessible->role = ATK_ROLE_PUSH_BUTTON;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 atk_component_add_focus_handler(ATK_COMPONENT(accessible),
 unity_launcher_icon_accessible_focus_handler);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 /* we could do that by redefining ->set_parent */
 self->priv->on_parent_change_id =
@@ -384,7 +386,7 @@ check_selected(UnityLauncherIconAccessible* self)
 found);
 
 g_signal_emit_by_name(self, "focus-event", self->priv->selected, &return_val);
- atk_focus_tracker_notify(ATK_OBJECT(self));
+ atk_object_notify_state_change(ATK_OBJECT(self), ATK_STATE_FOCUSED, self->priv->selected);
 }
 }
 
diff --git a/plugins/unityshell/src/unity-launcher-icon-accessible.h b/a11y/unity-launcher-icon-accessible.h
index 94cd7cc13..94cd7cc13 100644
--- a/plugins/unityshell/src/unity-launcher-icon-accessible.h
+++ b/a11y/unity-launcher-icon-accessible.h
diff --git a/plugins/unityshell/src/unity-panel-view-accessible.cpp b/a11y/unity-panel-view-accessible.cpp
index 688089f70..4b23e7e4c 100644
--- a/plugins/unityshell/src/unity-panel-view-accessible.cpp
+++ b/a11y/unity-panel-view-accessible.cpp
@@ -28,13 +28,14 @@
 *
 */
 
+#include "config.h"
+#include "unitya11y.h"
+
 #include <glib/gi18n-lib.h>
 #include <Nux/Nux.h>
 #include "PanelView.h"
 #include "unity-panel-view-accessible.h"
 
-#include "unitya11y.h"
-
 using namespace unity::panel;
 
 /* GObject */
diff --git a/plugins/unityshell/src/unity-panel-view-accessible.h b/a11y/unity-panel-view-accessible.h
index dcca2e899..dcca2e899 100644
--- a/plugins/unityshell/src/unity-panel-view-accessible.h
+++ b/a11y/unity-panel-view-accessible.h
diff --git a/plugins/unityshell/src/unity-places-group-accessible.cpp b/a11y/unity-places-group-accessible.cpp
index 8abfe78fa..8abfe78fa 100644
--- a/plugins/unityshell/src/unity-places-group-accessible.cpp
+++ b/a11y/unity-places-group-accessible.cpp
diff --git a/plugins/unityshell/src/unity-places-group-accessible.h b/a11y/unity-places-group-accessible.h
index 594c9a219..594c9a219 100644
--- a/plugins/unityshell/src/unity-places-group-accessible.h
+++ b/a11y/unity-places-group-accessible.h
diff --git a/plugins/unityshell/src/unity-quicklist-accessible.cpp b/a11y/unity-quicklist-accessible.cpp
index eaebd8bf4..eaebd8bf4 100644
--- a/plugins/unityshell/src/unity-quicklist-accessible.cpp
+++ b/a11y/unity-quicklist-accessible.cpp
diff --git a/plugins/unityshell/src/unity-quicklist-accessible.h b/a11y/unity-quicklist-accessible.h
index e1a30b85c..e1a30b85c 100644
--- a/plugins/unityshell/src/unity-quicklist-accessible.h
+++ b/a11y/unity-quicklist-accessible.h
diff --git a/plugins/unityshell/src/unity-quicklist-menu-accessible.cpp b/a11y/unity-quicklist-menu-accessible.cpp
index 8967b4738..8967b4738 100644
--- a/plugins/unityshell/src/unity-quicklist-menu-accessible.cpp
+++ b/a11y/unity-quicklist-menu-accessible.cpp
diff --git a/plugins/unityshell/src/unity-quicklist-menu-accessible.h b/a11y/unity-quicklist-menu-accessible.h
index 99aeab75a..99aeab75a 100644
--- a/plugins/unityshell/src/unity-quicklist-menu-accessible.h
+++ b/a11y/unity-quicklist-menu-accessible.h
diff --git a/plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp b/a11y/unity-quicklist-menu-item-accessible.cpp
index 97bc898cc..97bc898cc 100644
--- a/plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp
+++ b/a11y/unity-quicklist-menu-item-accessible.cpp
diff --git a/plugins/unityshell/src/unity-quicklist-menu-item-accessible.h b/a11y/unity-quicklist-menu-item-accessible.h
index 5c0c2b3b1..5c0c2b3b1 100644
--- a/plugins/unityshell/src/unity-quicklist-menu-item-accessible.h
+++ b/a11y/unity-quicklist-menu-item-accessible.h
diff --git a/plugins/unityshell/src/unity-result-accessible.cpp b/a11y/unity-result-accessible.cpp
index b2f431e18..b2f431e18 100644
--- a/plugins/unityshell/src/unity-result-accessible.cpp
+++ b/a11y/unity-result-accessible.cpp
diff --git a/plugins/unityshell/src/unity-result-accessible.h b/a11y/unity-result-accessible.h
index 764a4c70c..764a4c70c 100644
--- a/plugins/unityshell/src/unity-result-accessible.h
+++ b/a11y/unity-result-accessible.h
diff --git a/plugins/unityshell/src/unity-root-accessible.cpp b/a11y/unity-root-accessible.cpp
index 92dd63cd9..92dd63cd9 100644
--- a/plugins/unityshell/src/unity-root-accessible.cpp
+++ b/a11y/unity-root-accessible.cpp
diff --git a/plugins/unityshell/src/unity-root-accessible.h b/a11y/unity-root-accessible.h
index 4e843e1df..4e843e1df 100644
--- a/plugins/unityshell/src/unity-root-accessible.h
+++ b/a11y/unity-root-accessible.h
diff --git a/plugins/unityshell/src/unity-rvgrid-accessible.cpp b/a11y/unity-rvgrid-accessible.cpp
index e17f15e2a..e17f15e2a 100644
--- a/plugins/unityshell/src/unity-rvgrid-accessible.cpp
+++ b/a11y/unity-rvgrid-accessible.cpp
diff --git a/plugins/unityshell/src/unity-rvgrid-accessible.h b/a11y/unity-rvgrid-accessible.h
index bd9cc0fb0..bd9cc0fb0 100644
--- a/plugins/unityshell/src/unity-rvgrid-accessible.h
+++ b/a11y/unity-rvgrid-accessible.h
diff --git a/plugins/unityshell/src/unity-scope-bar-icon-accessible.cpp b/a11y/unity-scope-bar-icon-accessible.cpp
index 997e9364d..997e9364d 100644
--- a/plugins/unityshell/src/unity-scope-bar-icon-accessible.cpp
+++ b/a11y/unity-scope-bar-icon-accessible.cpp
diff --git a/plugins/unityshell/src/unity-scope-bar-icon-accessible.h b/a11y/unity-scope-bar-icon-accessible.h
index 6fa67f160..6fa67f160 100644
--- a/plugins/unityshell/src/unity-scope-bar-icon-accessible.h
+++ b/a11y/unity-scope-bar-icon-accessible.h
diff --git a/plugins/unityshell/src/unity-sctext-accessible.cpp b/a11y/unity-sctext-accessible.cpp
index b1f043215..b1f043215 100644
--- a/plugins/unityshell/src/unity-sctext-accessible.cpp
+++ b/a11y/unity-sctext-accessible.cpp
diff --git a/plugins/unityshell/src/unity-sctext-accessible.h b/a11y/unity-sctext-accessible.h
index 2c1dd22c8..2c1dd22c8 100644
--- a/plugins/unityshell/src/unity-sctext-accessible.h
+++ b/a11y/unity-sctext-accessible.h
diff --git a/plugins/unityshell/src/unity-search-bar-accessible.cpp b/a11y/unity-search-bar-accessible.cpp
index 4c59cdc81..4c59cdc81 100644
--- a/plugins/unityshell/src/unity-search-bar-accessible.cpp
+++ b/a11y/unity-search-bar-accessible.cpp
diff --git a/plugins/unityshell/src/unity-search-bar-accessible.h b/a11y/unity-search-bar-accessible.h
index 94664b77e..94664b77e 100644
--- a/plugins/unityshell/src/unity-search-bar-accessible.h
+++ b/a11y/unity-search-bar-accessible.h
diff --git a/plugins/unityshell/src/unity-session-button-accessible.cpp b/a11y/unity-session-button-accessible.cpp
index 65653ef73..65653ef73 100644
--- a/plugins/unityshell/src/unity-session-button-accessible.cpp
+++ b/a11y/unity-session-button-accessible.cpp
diff --git a/plugins/unityshell/src/unity-session-button-accessible.h b/a11y/unity-session-button-accessible.h
index ab3ae0429..ab3ae0429 100644
--- a/plugins/unityshell/src/unity-session-button-accessible.h
+++ b/a11y/unity-session-button-accessible.h
diff --git a/plugins/unityshell/src/unity-switcher-accessible.cpp b/a11y/unity-switcher-accessible.cpp
index 80651bc01..80651bc01 100644
--- a/plugins/unityshell/src/unity-switcher-accessible.cpp
+++ b/a11y/unity-switcher-accessible.cpp
diff --git a/plugins/unityshell/src/unity-switcher-accessible.h b/a11y/unity-switcher-accessible.h
index b79d0683a..b79d0683a 100644
--- a/plugins/unityshell/src/unity-switcher-accessible.h
+++ b/a11y/unity-switcher-accessible.h
diff --git a/plugins/unityshell/src/unity-text-input-accessible.cpp b/a11y/unity-text-input-accessible.cpp
index 57d1a490a..57d1a490a 100644
--- a/plugins/unityshell/src/unity-text-input-accessible.cpp
+++ b/a11y/unity-text-input-accessible.cpp
diff --git a/plugins/unityshell/src/unity-text-input-accessible.h b/a11y/unity-text-input-accessible.h
index c1ab85636..c1ab85636 100644
--- a/plugins/unityshell/src/unity-text-input-accessible.h
+++ b/a11y/unity-text-input-accessible.h
diff --git a/plugins/unityshell/src/unity-util-accessible.cpp b/a11y/unity-util-accessible.cpp
index b850cd2ea..b850cd2ea 100644
--- a/plugins/unityshell/src/unity-util-accessible.cpp
+++ b/a11y/unity-util-accessible.cpp
diff --git a/plugins/unityshell/src/unity-util-accessible.h b/a11y/unity-util-accessible.h
index 8ed12d037..8ed12d037 100644
--- a/plugins/unityshell/src/unity-util-accessible.h
+++ b/a11y/unity-util-accessible.h
diff --git a/plugins/unityshell/src/unitya11y.cpp b/a11y/unitya11y.cpp
index bcd670f5a..bcd670f5a 100644
--- a/plugins/unityshell/src/unitya11y.cpp
+++ b/a11y/unitya11y.cpp
diff --git a/plugins/unityshell/src/unitya11y.h b/a11y/unitya11y.h
index 37b81e515..37b81e515 100644
--- a/plugins/unityshell/src/unitya11y.h
+++ b/a11y/unitya11y.h
diff --git a/plugins/unityshell/src/unitya11ytests.cpp b/a11y/unitya11ytests.cpp
index efc7968ca..efc7968ca 100644
--- a/plugins/unityshell/src/unitya11ytests.cpp
+++ b/a11y/unitya11ytests.cpp
diff --git a/plugins/unityshell/src/unitya11ytests.h b/a11y/unitya11ytests.h
index cfb3631b3..cfb3631b3 100644
--- a/plugins/unityshell/src/unitya11ytests.h
+++ b/a11y/unitya11ytests.h
diff --git a/plugins/unityshell/CMakeLists.txt b/plugins/unityshell/CMakeLists.txt
index 2de4ffeba..01a300589 100644
--- a/plugins/unityshell/CMakeLists.txt
+++ b/plugins/unityshell/CMakeLists.txt
@@ -21,35 +21,27 @@ if(revert_compiz)
 set (CMAKE_BUILD_TYPE "" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
 endif()
 
-add_dependencies(unityshell
- dash-lib
- decorations-lib
- hud-lib
- launcher-lib
- lockscreen-lib
- panel-lib
- shortcuts-lib
- shutdown-lib
- switcher-lib
- unity-core-${UNITY_API_VERSION}
- unity-shared
- unity-shared-compiz)
+set(UNITY_PRIVATE_LIBS
+ a11y-lib
+ dash-lib
+ decorations-lib
+ hud-lib
+ launcher-lib
+ lockscreen-lib
+ panel-lib
+ shortcuts-lib
+ shutdown-lib
+ switcher-lib
+ unity-core-${UNITY_API_VERSION}
+ unity-shared
+ unity-shared-bamf
+ unity-shared-compiz)
+
+add_dependencies(unityshell ${UNITY_PRIVATE_LIBS})
 
 target_link_libraries(unityshell
- dash-lib
- decorations-lib
- hud-lib
- launcher-lib
- pam
- lockscreen-lib
- panel-lib
- shortcuts-lib
- shutdown-lib
- switcher-lib
- unity-core-${UNITY_API_VERSION}
- unity-shared
- unity-shared-bamf
- unity-shared-compiz)
+ ${UNITY_PRIVATE_LIBS}
+ pam)
 
 set_target_properties(unityshell
 PROPERTIES INSTALL_RPATH "${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS}"
diff --git a/plugins/unityshell/src/Monitor.cpp b/plugins/unityshell/src/Monitor.cpp
deleted file mode 100644
index 7ecd8d72f..000000000
--- a/plugins/unityshell/src/Monitor.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#include "Monitor.h"
-
-namespace unity {
-namespace performance {
-
-void Monitor::Start ()
-{
- StartMonitor ();
-}
-
-GVariant* Monitor::Stop ()
-{
- GVariantBuilder builder;
-
- g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
- StopMonitor (&builder);
-
- return g_variant_new ("a{sv}", &builder);
-}
-
-}
-}
diff --git a/plugins/unityshell/src/Monitor.h b/plugins/unityshell/src/Monitor.h
deleted file mode 100644
index 11a28c456..000000000
--- a/plugins/unityshell/src/Monitor.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#ifndef UNITY_PERFORMANCE_MONITOR
-#define UNITY_PERFORMANCE_MONITOR
-
-#include <string>
-#include <glib.h>
-
-namespace unity {
-namespace performance {
-
-class Monitor
-{
-public:
- virtual ~Monitor() {}
-
-	void Start();
-	GVariant* Stop();
-	virtual std::string GetName() const = 0;
-
-protected:
-	virtual void StartMonitor () = 0;
-	virtual void StopMonitor (GVariantBuilder* builder) = 0;
-};
- 
-}
-}
-
-#endif // UNITY_PERFORMANCE_MONITOR
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index fdc58f097..514eb2c83 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -71,8 +71,7 @@
 
 #include <core/atoms.h>
 
-#include "unitya11y.h"
-
+#include "a11y/unitya11y.h"
 #include "UBusMessages.h"
 #include "UBusWrapper.h"
 #include "UScreen.h"
@@ -81,7 +80,7 @@
 
 /* FIXME: once we get a better method to add the toplevel windows to
 the accessible root object, this include would not be required */
-#include "unity-util-accessible.h"
+#include "a11y/unity-util-accessible.h"
 
 /* Set up vtable symbols */
 COMPIZ_PLUGIN_20090315(unityshell, unity::UnityPluginVTable);