Merge branch 'tari01-pr/move-to-cmake'

Attributes GH PR #38: https://github.com/AyatanaIndicators/libayatana-indicator/pull/38

60 files changed, 804 insertions, 1014 deletions

diff --git a/.build.yml b/.build.yml
index 261f72e..16d1816 100644
--- a/.build.yml
+++ b/.build.yml
@@ -104,15 +104,15 @@ build_scripts:
   -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
   - fi
   -
-  - if [ -e ./autogen.sh ]; then
-  -     NOCONFIGURE=1 ./autogen.sh
-  -     scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
-  - elif [ -e ./CMakeLists.txt ]; then
+  - if [ -e ./CMakeLists.txt ]; then
   -     if [ ${DISTRO_NAME} == "debian" ];then
   -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
   -     else
   -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
   -     fi
+  - elif [ -e ./autogen.sh ]; then
+  -     NOCONFIGURE=1 ./autogen.sh
+  -     scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
   - else
   -     exit 1
   - fi
@@ -135,11 +135,11 @@ after_scripts:
   - if [ ${BUILD_TYPE} == "scripts" ];then
   -     XVFB_RUN="$(which xvfb-run || true)"
   -     if [ ${DISTRO_NAME} == "debian" ];then
-  -         if [ -e ./autogen.sh ]; then
+  -         if [ -e ./CMakeLists.txt ]; then
+  -             ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+  -         elif [ -e ./autogen.sh ]; then
   -             ${XVFB_RUN} make check
   -             cat tests/test-suite.log
-  -         elif [ -e ./CMakeLists.txt ]; then
-  -             ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
   -         fi
   -     fi
   - fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..e580790
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,70 @@
+cmake_minimum_required(VERSION 3.13)
+project(libayatana-indicator C)
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
+endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+option(ENABLE_TESTS "Enable all tests and checks" OFF)
+option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF)
+
+if(ENABLE_COVERAGE)
+    set(ENABLE_TESTS ON)
+    set(CMAKE_BUILD_TYPE "Coverage")
+else()
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+# Check for prerequisites
+
+set(DEPS glib-2.0>=2.58 gtk+-3.0>=3.24 libayatana-ido3-0.4>=0.8.2)
+
+find_package (PkgConfig REQUIRED)
+pkg_check_modules(PROJECT_DEPS REQUIRED ${DEPS})
+
+# Set global variables
+
+include(GNUInstallDirs)
+set(ABI_VERSION "7")
+set(API_VERSION "4")
+set(PROJECT_VERSION "0.8.4")
+set(PROJECT_NAME "libayatana-indicator")
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Weverything")
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-c++98-compat -Wno-padded")
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-documentation")
+
+else()
+
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall")
+
+endif()
+
+# Make everything
+
+add_subdirectory(src)
+add_subdirectory(data)
+
+if(ENABLE_TESTS)
+    include(CTest)
+    enable_testing()
+    add_subdirectory(tools)
+    add_subdirectory(tests)
+
+    if (ENABLE_COVERAGE)
+        find_package(CoverageReport)
+        ENABLE_COVERAGE_REPORT(
+            TARGETS "ayatana-indicator3"
+            TESTS "test-desktop-shortcuts" "test-indicator-ng" "test-loader"
+            FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+        )
+    endif()
+
+endif()
+
+# Display config info
+
+message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "Unit tests: ${ENABLE_TESTS}")
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 0a03376..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = \
-	data \
-	libayatana-indicator \
-	tools
-
-tools: libayatana-indicator
-
-if WANT_TESTS
-SUBDIRS += \
-	tests
-
-tests: libayatana-indicator
-endif
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations --disable-silent-rules --with-gtk=3
-
-DISTCLEANFILES = \
-	libayatana-indicator-*.tar.gz
-
-include $(top_srcdir)/Makefile.am.coverage
diff --git a/Makefile.am.coverage b/Makefile.am.coverage
deleted file mode 100644
index dc3b9c8..0000000
--- a/Makefile.am.coverage
+++ /dev/null
@@ -1,50 +0,0 @@
-
-# Coverage targets
-
-EXTRA_DIST = trim-lcov.py
-
-.PHONY: clean-gcno clean-gcda \
-	coverage-html generate-coverage-html clean-coverage-html \
-	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
-
-if HAVE_GCOV
-
-clean-gcno:
-	@echo Removing old coverage instrumentation
-	-find -name '*.gcno' -print | xargs -r rm
-
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-  
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-  
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --no-checksum --compat-libtool | $(top_srcdir)/trim-lcov.py > coverage.info
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-  
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-if HAVE_GCOVR
-
-coverage-gcovr: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-	
-generate-coverage-gcovr:
-	@echo Generating coverage GCOVR report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-	
-clean-coverage-gcovr: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-endif # HAVE_GCOVR
-
-endif # HAVE_GCOV
diff --git a/Makefile.am.marshal b/Makefile.am.marshal
deleted file mode 100644
index a1e1070..0000000
--- a/Makefile.am.marshal
+++ /dev/null
@@ -1,44 +0,0 @@
-# Rules for generating marshal files using glib-genmarshal
-#
-# Define:
-# 	glib_marshal_list = marshal list file
-# 	glib_marshal_prefix = prefix for marshal functions
-#
-# before including Makefile.am.marshal. You will also need to have
-# the following targets already defined:
-#
-# 	CLEANFILES
-#	DISTCLEANFILES
-#	BUILT_SOURCES
-#	EXTRA_DIST
-#
-# Author: Emmanuele Bassi <ebassi@linux.intel.com>
-
-marshal_h = $(glib_marshal_list:.list=.h)
-marshal_c = $(glib_marshal_list:.list=.c)
-
-CLEANFILES += stamp-marshal
-DISTCLEANFILES += $(marshal_h) $(marshal_c)
-BUILT_SOURCES += $(marshal_h) $(marshal_c)
-EXTRA_DIST += $(glib_marshal_list)
-
-stamp-marshal: $(glib_marshal_list)
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
-		--prefix=$(glib_marshal_prefix) \
-		--header \
-	$(srcdir)/$(glib_marshal_list) > xgen-mh \
-	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
-	&& rm -f xgen-mh \
-	&& echo timestamp > $(@F)
-
-$(marshal_h): stamp-marshal
-	@true
-
-$(marshal_c): $(marshal_h)
-	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
-	$(GLIB_GENMARSHAL) \
-		--prefix=$(glib_marshal_prefix) \
-		--body \
-	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
-	&& cp xgen-mc $(marshal_c) \
-	&& rm -f xgen-mc
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 472f875..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PKG_NAME="libayatana-indicator"
-
-which mate-autogen || {
-	echo "You need mate-common from https://git.mate-desktop.org/mate-common."
-	exit 1
-}
-
-. mate-autogen
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 95398ec..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,218 +0,0 @@
-AC_INIT([libayatana-indicator],
-        [0.8.4],
-        [https://github.com/ArcticaProject/libayatana-indicator/issues],
-        [libayatana-indicator],
-        [https://github.com/ArcticaProject/libayatana-indicator])
-
-AC_PREREQ([2.64])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_SUBST([ac_aux_dir])
-
-AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
-
-AM_MAINTAINER_MODE([enable])
-
-AM_SILENT_RULES([yes])
-
-# Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-
-# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
-# compatible version in case the local version of pkgconfig isn't new enough.
-# https://bugs.freedesktop.org/show_bug.cgi?id=48743
-m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
-         [AC_ARG_WITH([pkgconfigdir],
-                      [AS_HELP_STRING([--with-pkgconfigdir],
-                      [install directory for nx-x11.pc pkg-config file])],
-                       [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
-          AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
-
-# Required when PKG_CHECK_MODULES called within an if statement
-PKG_PROG_PKG_CONFIG
-
-
-AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-
-
-AC_ARG_ENABLE([deprecations],
-  [AS_HELP_STRING([--enable-deprecations],
-    [allow deprecated API usage @<:@default=yes@:>@])],
-  [],
-  [enable_deprecations=yes])
-AS_IF([test "x$enable_deprecations" = xno],
-  [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
-)
-
-AC_ARG_ENABLE([ido],
-  [AS_HELP_STRING([--enable-ido],
-    [enable indicator widget loader @<:@default=yes@:>@])],
-  [],
-  [enable_ido=yes])
-
-##############################
-# Dependencies
-##############################
-
-GTK_REQUIRED_VERSION=2.18
-GTK3_REQUIRED_VERSION=3.6
-GIO_UNIX_REQUIRED_VERSION=2.37
-IDO_REQUIRED_VERSION=0.8.0
-
-
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use @<:@default=3@:>@])],
-  [],
-  [with_gtk=3])
-AS_IF([test "x$with_gtk" = x3],
-        [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gmodule-2.0
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
-         AS_IF([test "x$enable_ido" = xyes], [
-           PKG_CHECK_MODULES(LIBINDICATOR_IDO, libayatana-ido3-0.4 >= $IDO_REQUIRED_VERSION)
-         ])
-        ],
-      [test "x$with_gtk" = x2],
-        [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gmodule-2.0
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
-        ],
-      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
-
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
-AM_CONDITIONAL(USE_IDO, [test "$enable_ido" = "yes"])
-
-LT_LIB_M
-AC_SUBST(LIBM)
-
-##############################
-# Custom Junk
-##############################
-
-AC_DEFUN([AC_DEFINE_PATH], [
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_path=`eval echo [$]$2`
-  ac_define_path=`eval echo [$]ac_define_path`
-  $1="$ac_define_path"
-  AC_SUBST($1)
-  ifelse($3, ,
-    AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
-    AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
-])
-
-##############################
-# ./configure Flags messings
-##############################
-
-cflags_set=${CFLAGS+set}
-# find the actual value for $prefix that we'll end up with
-REAL_PREFIX=
-if test "x$prefix" = "xNONE"; then
-  REAL_PREFIX=$ac_default_prefix
-else
-  REAL_PREFIX=$prefix
-fi
-
-# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
-# if you actually know how to code shell then fix this :-)
-SYSCONFDIR_TMP="$sysconfdir"
-old_prefix=$prefix
-prefix=$REAL_PREFIX
-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
-prefix=$old_prefix
-AC_SUBST(EXPANDED_SYSCONFDIR)
-
-AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory])
-AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir])
-AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir])
-
-#########################
-# Check for systemd
-#########################
-PKG_CHECK_MODULES(SYSTEMD,  systemd,
-    [has_systemd=yes],
-    []
-)
-if test "x$has_systemd" = "xyes"; then
-	SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
-	AC_SUBST(SYSTEMD_USERDIR)
-	AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicators-pre.target for systemd])
-fi
-
-#########################
-# Check if build tests
-#########################
-AC_ARG_ENABLE([tests],
-	AC_HELP_STRING([--disable-tests], [disable tests]),,
-	[enable_tests=yes])
-AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
-
-#########################
-# Debug symbols
-#########################
-AC_ARG_ENABLE([debug],
-              AS_HELP_STRING([--enable-debug],[build with debug symbols]),,
-              [enable_debug=no])
-
-if test "x$enable_debug" = "xyes"; then
-	CFLAGS="-g $CFLAGS"
-	AC_DEFINE(ENABLE_DEBUG, 1, [build with extra debug information])
-fi
-
-AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
-
-###########################
-# gcov coverage reporting
-###########################
-m4_include([m4/gcov.m4])
-AC_TDD_GCOV
-AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
-AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
-AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_CXXFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-###########################
-# Files
-###########################
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-libayatana-indicator/Makefile
-libayatana-indicator/ayatana-indicator-0.4.pc.in
-libayatana-indicator/ayatana-indicator3-0.4.pc.in
-tests/Makefile
-tools/Makefile
-])
-AC_OUTPUT
-
-###########################
-# Results
-###########################
-
-AC_MSG_NOTICE([
-
-Libindicator Configuration:
-
-	Prefix:                 $prefix
-	GTK+ Version:           $with_gtk
-	
-	Enable IDO loader:      $enable_ido
-	Enable tests:           $enable_tests
-	Enable debugging:       $enable_debug
-	Coverage reporting:     $use_gcov
-])
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..f6c71d9
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,12 @@
+# ayatana-indicator3-0.4.pc
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator3-0.4.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.4.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.4.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+
+# ayatana-indicators.target
+
+pkg_check_modules(SYSTEMD systemd)
+
+if (${SYSTEMD_FOUND})
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicators.target" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/systemd/user")
+endif()
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index c4b1255..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-#if defined(HAVE_SYSTEMD)
-systemd_DATA = ayatana-indicators.target
-systemddir = $(SYSTEMD_USERDIR)
-EXTRA_DIST = $(systemd_DATA)
-#endif
diff --git a/data/ayatana-indicator3-0.4.pc.in b/data/ayatana-indicator3-0.4.pc.in
new file mode 100644
index 0000000..231fa71
--- /dev/null
+++ b/data/ayatana-indicator3-0.4.pc.in
@@ -0,0 +1,15 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+bindir=${exec_prefix}/@CMAKE_INSTALL_BINDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+indicatordir=${exec_prefix}/lib/ayatana-indicators3/@ABI_VERSION@/
+iconsdir=${prefix}/@CMAKE_INSTALL_DATADIR@/@PROJECT_NAME@/icons/
+
+Cflags: -I${includedir}/libayatana-indicator3-0.@API_VERSION@
+Requires: gtk+-3.0
+Libs: -layatana-indicator3
+
+Name: libayatana-indicator3
+Description: libayatana-indicator3.
+Version: @PROJECT_VERSION@
diff --git a/helper/test-loader-build b/helper/test-loader-build
deleted file mode 100755
index fa1e006..0000000
--- a/helper/test-loader-build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gcc `pkg-config --cflags --libs gtk+-2.0` -I../libindicator/ test-loader.c ../libindicator/indicator-image-helper.c -o test-loader
diff --git a/helper/test-loader.c b/helper/test-loader.c
deleted file mode 100644
index 6a06248..0000000
--- a/helper/test-loader.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#include <gtk/gtk.h>
-#include "indicator-image-helper.h"
-
-int
-main (int argv, char * argc[])
-{
-	gtk_init(&argv, &argc);
-
-	GtkImage * image = indicator_image_helper(argc[1]);
-
-	GdkPixbuf * pixbuf = gtk_image_get_pixbuf(image);
-
-	g_debug("Pixbuf width: %d", gdk_pixbuf_get_width(pixbuf));
-	g_debug("Pixbuf height: %d", gdk_pixbuf_get_height(pixbuf));
-	
-	return;
-}
diff --git a/libayatana-indicator/Makefile.am b/libayatana-indicator/Makefile.am
deleted file mode 100644
index 4933c71..0000000
--- a/libayatana-indicator/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-if USE_GTK3
-VER=3
-lib_LTLIBRARIES = libayatana-indicator3.la
-else
-VER=
-lib_LTLIBRARIES = libayatana-indicator.la
-GTK_DISABLE_DEPRECATED = -DGTK_DISABLE_DEPRECATED
-endif
-
-BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
-CLEANFILES =
-DISTCLEANFILES =
-EXTRA_DIST = \
-	ayatana-indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
-	ayatana-indicator-0.$(INDICATOR_API_VERSION).pc.in.in
-
-INDICATOR_ABI_VERSION = 7
-INDICATOR_API_VERSION = 4
-
-%.pc: %.pc.in
-	sed \
-		-e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \
-		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
-		$< > $@
-
-CLEANFILES += ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
-
-include $(top_srcdir)/Makefile.am.marshal
-
-libayatana_indicatorincludedir=$(includedir)/libayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION)/libayatana-indicator
-
-indicator_headers = \
-	indicator.h \
-	indicator-desktop-shortcuts.h \
-	indicator-image-helper.h \
-	indicator-object.h \
-	indicator-service.h \
-	indicator-service-manager.h
-
-if USE_GTK3
-indicator_headers += \
-	indicator-ng.h
-endif
-
-libayatana_indicatorinclude_HEADERS = \
-	$(indicator_headers)
-
-libayatana_indicator_la_SOURCES = \
-	$(indicator_headers) \
-	dbus-shared.h \
-	gen-indicator-service.xml.h \
-	gen-indicator-service.xml.c \
-	indicator-object.c \
-	indicator-object-enum-types.c \
-	indicator-desktop-shortcuts.c \
-	indicator-image-helper.c \
-	indicator-object-marshal.h \
-	indicator-object-marshal.c \
-	indicator-service.c \
-	indicator-service-manager.c
-
-if USE_GTK3
-libayatana_indicator_la_SOURCES += \
-	indicator-ng.c
-endif
-
-libayatana_indicator_la_CFLAGS = \
-	$(LIBINDICATOR_CFLAGS) \
-	$(LIBINDICATOR_IDO_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(GTK_DISABLE_DEPRECATED) \
-	-DG_LOG_DOMAIN=\"libayatana-indicator\" \
-	-Wall -Wno-error=deprecated-declarations
-
-libayatana_indicator_la_LIBADD = \
-	$(LIBINDICATOR_LIBS) \
-	$(LIBINDICATOR_IDO_LIBS) \
-	$(LIBM)
-
-libayatana_indicator_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	-version-info $(INDICATOR_ABI_VERSION):0:0 \
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
-
-# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
-# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
-# Only one version of the library is every compiled at the same time, so it is safe to reuse
-# the right hand sides like this.
-libayatana_indicator3includedir = $(libayatana_indicatorincludedir)
-libayatana_indicator3include_HEADERS = $(indicator_headers)
-libayatana_indicator3_la_SOURCES = $(libayatana_indicator_la_SOURCES)
-libayatana_indicator3_la_CFLAGS = $(libayatana_indicator_la_CFLAGS)
-libayatana_indicator3_la_LIBADD = $(libayatana_indicator_la_LIBADD)
-libayatana_indicator3_la_LDFLAGS = $(libayatana_indicator_la_LDFLAGS)
-
-pkgconfig_DATA = ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-glib_marshal_list = indicator-object-marshal.list
-glib_marshal_prefix = _indicator_object_marshal
-
-indicator-object-enum-types.h: s-enum-types-h
-	@true
-s-enum-types-h: $(indicator_headers)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template								\
-		$(indicator_headers) ) >> tmp-indicator-object-enum-types.h											\
-	&& (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h )	\
-	&& rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
-
-indicator-object-enum-types.c: s-enum-types-c
-	@true
-s-enum-types-c: $(indicator_headers)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template								\
-		$(indicator_headers) ) > tmp-indicator-object-enum-types.c											\
-	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
-	&& rm -f tmp-indicator-object-enum-types.c
-
-EXTRA_DIST += indicator-object-enum-types.h.template indicator-object-enum-types.c.template
-CLEANFILES +=						\
-	indicator-object-enum-types.h			\
-	indicator-object-enum-types.c			\
-	s-enum-types-h					\
-	s-enum-types-c
-
-##################################
-# DBus Specs
-##################################
-
-DBUS_SPECS = \
-	indicator-service.xml
-
-gen-%.xml.h: %.xml
-	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
-
-gen-%.xml.c: %.xml
-	@echo "Building $@ from $<"
-	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
-	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
-	@echo ";" >> $@
-
-BUILT_SOURCES += \
-	gen-indicator-service.xml.h \
-	gen-indicator-service.xml.c
-
-CLEANFILES += $(BUILT_SOURCES)
-
-EXTRA_DIST += $(DBUS_SPECS)
diff --git a/libayatana-indicator/ayatana-indicator-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
deleted file mode 100644
index 02ff40d..0000000
--- a/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
+++ /dev/null
@@ -1,17 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-
-indicatordir=${exec_prefix}/lib/ayatana-indicators/@indicator_abi_version@
-iconsdir=@datarootdir@/@PACKAGE@/icons/
-
-Cflags: -I${includedir}/libayatana-indicator-0.@indicator_api_version@
-Requires: gtk+-2.0
-Libs: -layatana-indicator
-
-Name: libayatana-indicator
-Description: libayatana-indicator.
-Version: @VERSION@
-
diff --git a/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
deleted file mode 100644
index ff0862e..0000000
--- a/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-
-indicatordir=${exec_prefix}/lib/ayatana-indicators3/@indicator_abi_version@/
-iconsdir=@datarootdir@/@PACKAGE@/icons/
-
-Cflags: -I${includedir}/libayatana-indicator3-0.@indicator_api_version@
-Requires: gtk+-3.0
-Libs: -layatana-indicator3
-
-Name: libayatana-indicator3
-Description: libayatana-indicator3.
-Version: @VERSION@
diff --git a/m4/gcov.m4 b/m4/gcov.m4
deleted file mode 100644
index 3163584..0000000
--- a/m4/gcov.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-# Checks for existence of coverage tools:
-#  * gcov
-#  * lcov
-#  * genhtml
-#  * gcovr
-# 
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
-  AC_ARG_ENABLE(gcov,
-  AS_HELP_STRING([--enable-gcov],
-		 [enable coverage testing with gcov]),
-  [use_gcov=$enableval], [use_gcov=no])
-
-  if test "x$use_gcov" = "xyes"; then
-  # we need gcc:
-  if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required for --enable-gcov])
-  fi
-
-  # Check if ccache is being used
-  AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  case `$SHTOOL path $CC` in
-    *ccache*[)] gcc_ccache=yes;;
-    *[)] gcc_ccache=no;;
-  esac
-
-  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-  fi
-
-  lcov_version_list="1.6 1.7 1.8 1.9"
-  AC_CHECK_PROG(LCOV, lcov, lcov)
-  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
-  if test -z "$GENHTML"; then
-    AC_MSG_ERROR([Could not find genhtml from the lcov package])
-  fi
-
-  ac_cv_check_gcov=yes
-  ac_cv_check_lcov=yes
-
-  # Remove all optimization flags from CFLAGS
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  changequote([,])
-
-  # Add the special gcc flags
-  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
-  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
-  COVERAGE_LDFLAGS="-lgcov"
-
-  # Check availability of gcovr
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
-  if test -z "$GCOVR"; then
-    ac_cv_check_gcovr=no
-  else
-    ac_cv_check_gcovr=yes
-  fi
-
-fi
-]) # AC_TDD_GCOV
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..d6c6647
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,127 @@
+# indicator-desktop-shortcuts.h
+# indicator-image-helper.h
+# indicator-ng.h
+# indicator-object.h
+# indicator-service-manager.h
+# indicator-service.h
+# indicator.h
+
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator")
+
+set(HEADERS
+    indicator.h
+    indicator-desktop-shortcuts.h
+    indicator-image-helper.h
+    indicator-object.h
+    indicator-service.h
+    indicator-service-manager.h
+    indicator-ng.h
+)
+
+set(SOURCES
+    gen-indicator-service.xml.c
+    indicator-desktop-shortcuts.c
+    indicator-image-helper.c
+    indicator-ng.c
+    indicator-object.c
+    indicator-object-enum-types.c
+    indicator-object-marshal.c
+    indicator-service.c
+    indicator-service-manager.c
+
+)
+
+# indicator-object-enum-types.h
+
+find_program(GLIB_MKENUMS glib-mkenums)
+
+add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND
+    ${GLIB_MKENUMS}
+    --template indicator-object-enum-types.h.template
+    ${HEADERS}
+    --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h"
+)
+
+# indicator-object-enum-types.c
+
+add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c"
+    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND
+    ${GLIB_MKENUMS}
+    --template indicator-object-enum-types.c.template
+    ${HEADERS}
+    --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c"
+)
+
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+
+# indicator-object-marshal.h
+
+add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h"
+    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND
+    ${GLIB_GENMARSHAL}
+    --prefix=_indicator_object_marshal
+    --header indicator-object-marshal.list
+    --quiet
+    --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h"
+)
+
+# indicator-object-marshal.c
+
+add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.c"
+    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND
+    ${GLIB_GENMARSHAL}
+    --prefix=_indicator_object_marshal
+    --body indicator-object-marshal.list
+    --include-header=indicator-object-marshal.h
+    --quiet
+    --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.c"
+)
+
+add_custom_target("src-generated" DEPENDS "indicator-object-marshal.c")
+
+# gen-indicator-service.xml.h
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.h" "extern const char * _indicator_service;")
+
+# gen-indicator-service.xml.c
+
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.xml" GEN_INDICATOR_SERVICE_XML_C)
+string(REPLACE "\"" "\\\"" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C})
+string(REPLACE "\n" "\\n\"\n\"" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C})
+string(REGEX REPLACE "\n\"$" "\n" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C})
+string(PREPEND GEN_INDICATOR_SERVICE_XML_C "const char * _indicator_service = \n\"")
+string(APPEND GEN_INDICATOR_SERVICE_XML_C "\;")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.c" ${GEN_INDICATOR_SERVICE_XML_C})
+
+# libayatana-indicator3.so
+
+set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("ayatana-indicator3" SHARED ${SOURCES})
+set_target_properties("ayatana-indicator3" PROPERTIES VERSION 7.0.0 SOVERSION 7)
+target_compile_definitions("ayatana-indicator3" PUBLIC DG_LOG_DOMAIN="libayatana-indicator")
+target_include_directories("ayatana-indicator3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("ayatana-indicator3" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories("ayatana-indicator3" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries("ayatana-indicator3" ${PROJECT_DEPS_LIBRARIES})
+add_dependencies("ayatana-indicator3" "src-generated")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-indicator3.so" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-indicator3.so.7" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-indicator3.so.7.0.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
diff --git a/libayatana-indicator/dbus-shared.h b/src/dbus-shared.h
index b55acef..b55acef 100644
--- a/libayatana-indicator/dbus-shared.h
+++ b/src/dbus-shared.h
diff --git a/libayatana-indicator/indicator-desktop-shortcuts.c b/src/indicator-desktop-shortcuts.c
index be1d632..be1d632 100644
--- a/libayatana-indicator/indicator-desktop-shortcuts.c
+++ b/src/indicator-desktop-shortcuts.c
diff --git a/libayatana-indicator/indicator-desktop-shortcuts.h b/src/indicator-desktop-shortcuts.h
index fb997ea..fb997ea 100644
--- a/libayatana-indicator/indicator-desktop-shortcuts.h
+++ b/src/indicator-desktop-shortcuts.h
diff --git a/libayatana-indicator/indicator-image-helper.c b/src/indicator-image-helper.c
index 2c0e244..2c0e244 100644
--- a/libayatana-indicator/indicator-image-helper.c
+++ b/src/indicator-image-helper.c
diff --git a/libayatana-indicator/indicator-image-helper.h b/src/indicator-image-helper.h
index 290f4e2..290f4e2 100644
--- a/libayatana-indicator/indicator-image-helper.h
+++ b/src/indicator-image-helper.h
diff --git a/libayatana-indicator/indicator-ng.c b/src/indicator-ng.c
index f057600..f057600 100644
--- a/libayatana-indicator/indicator-ng.c
+++ b/src/indicator-ng.c
diff --git a/libayatana-indicator/indicator-ng.h b/src/indicator-ng.h
index f074a47..f074a47 100644
--- a/libayatana-indicator/indicator-ng.h
+++ b/src/indicator-ng.h
diff --git a/libayatana-indicator/indicator-object-enum-types.c.template b/src/indicator-object-enum-types.c.template
index e5b3352..e5b3352 100644
--- a/libayatana-indicator/indicator-object-enum-types.c.template
+++ b/src/indicator-object-enum-types.c.template
diff --git a/libayatana-indicator/indicator-object-enum-types.h.template b/src/indicator-object-enum-types.h.template
index 2ac8ef8..2ac8ef8 100644
--- a/libayatana-indicator/indicator-object-enum-types.h.template
+++ b/src/indicator-object-enum-types.h.template
diff --git a/libayatana-indicator/indicator-object-marshal.list b/src/indicator-object-marshal.list
index 4896ac4..4896ac4 100644
--- a/libayatana-indicator/indicator-object-marshal.list
+++ b/src/indicator-object-marshal.list
diff --git a/libayatana-indicator/indicator-object.c b/src/indicator-object.c
index 50b3078..50b3078 100644
--- a/libayatana-indicator/indicator-object.c
+++ b/src/indicator-object.c
diff --git a/libayatana-indicator/indicator-object.h b/src/indicator-object.h
index e542c0d..e542c0d 100644
--- a/libayatana-indicator/indicator-object.h
+++ b/src/indicator-object.h
diff --git a/libayatana-indicator/indicator-service-manager.c b/src/indicator-service-manager.c
index 33bcba9..33bcba9 100644
--- a/libayatana-indicator/indicator-service-manager.c
+++ b/src/indicator-service-manager.c
diff --git a/libayatana-indicator/indicator-service-manager.h b/src/indicator-service-manager.h
index 7d444c6..7d444c6 100644
--- a/libayatana-indicator/indicator-service-manager.h
+++ b/src/indicator-service-manager.h
diff --git a/libayatana-indicator/indicator-service.c b/src/indicator-service.c
index de3a0cf..de3a0cf 100644
--- a/libayatana-indicator/indicator-service.c
+++ b/src/indicator-service.c
diff --git a/libayatana-indicator/indicator-service.h b/src/indicator-service.h
index bda9cb7..bda9cb7 100644
--- a/libayatana-indicator/indicator-service.h
+++ b/src/indicator-service.h
diff --git a/libayatana-indicator/indicator-service.xml b/src/indicator-service.xml
index 71ef4df..71ef4df 100644
--- a/libayatana-indicator/indicator-service.xml
+++ b/src/indicator-service.xml
diff --git a/libayatana-indicator/indicator.h b/src/indicator.h
index 8bff270..8bff270 100644
--- a/libayatana-indicator/indicator.h
+++ b/src/indicator.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..bb9c0f4
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,156 @@
+# dummy-indicator-blank
+
+set_source_files_properties(dummy-indicator-blank.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-blank" SHARED dummy-indicator-blank.c)
+target_include_directories("dummy-indicator-blank" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-blank" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# dummy-indicator-entry-func
+
+set_source_files_properties(dummy-indicator-entry-func.h PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-entry-func" SHARED dummy-indicator-entry-func.c)
+target_include_directories("dummy-indicator-entry-func" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-entry-func" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# dummy-indicator-null
+
+set_source_files_properties(dummy-indicator-null.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-null" SHARED dummy-indicator-null.c)
+target_include_directories("dummy-indicator-null" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-null" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# dummy-indicator-signaller
+
+set_source_files_properties(dummy-indicator-signaler.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-signaler" SHARED dummy-indicator-signaler.c)
+target_include_directories("dummy-indicator-signaler" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-signaler" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# dummy-indicator-simple
+
+set_source_files_properties(dummy-indicator-simple.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-simple" SHARED dummy-indicator-simple.c)
+target_include_directories("dummy-indicator-simple" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-simple" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# dummy-indicator-visible
+
+set_source_files_properties(dummy-indicator-visible.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("dummy-indicator-visible" SHARED dummy-indicator-visible.c)
+target_include_directories("dummy-indicator-visible" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("dummy-indicator-visible" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-manager-connect
+
+set_source_files_properties(service-manager-connect.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-manager-connect" SHARED service-manager-connect.c)
+target_include_directories("service-manager-connect" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-manager-connect" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-manager-connect-service
+
+set_source_files_properties(service-manager-connect-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-manager-connect-service" SHARED service-manager-connect-service.c)
+target_include_directories("service-manager-connect-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-manager-connect-service" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-manager-no-connect
+
+set_source_files_properties(service-manager-no-connect.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-manager-no-connect" SHARED service-manager-no-connect.c)
+target_include_directories("service-manager-no-connect" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-manager-no-connect" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-manager-nostart-connect
+
+set_source_files_properties(service-manager-nostart-connect.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-manager-nostart-connect" SHARED service-manager-nostart-connect.c)
+target_include_directories("service-manager-nostart-connect" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-manager-nostart-connect" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-shutdown-timeout
+
+set_source_files_properties(service-shutdown-timeout.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-shutdown-timeout" SHARED service-shutdown-timeout.c)
+target_include_directories("service-shutdown-timeout" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-shutdown-timeout" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-bad-service
+
+set_source_files_properties(service-version-bad-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-bad-service" SHARED service-version-bad-service.c)
+target_include_directories("service-version-bad-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-bad-service" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-good-service
+
+set_source_files_properties(service-version-good-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-good-service" SHARED service-version-good-service.c)
+target_include_directories("service-version-good-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-good-service" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-manager
+
+set_source_files_properties(service-version-manager.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-manager" SHARED service-version-manager.c)
+target_include_directories("service-version-manager" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-manager" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-multiwatch-manager
+
+set_source_files_properties(service-version-multiwatch-manager.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-multiwatch-manager" SHARED service-version-multiwatch-manager.c)
+target_include_directories("service-version-multiwatch-manager" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-multiwatch-manager" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-multiwatch-manager-impolite
+
+set_source_files_properties(service-version-multiwatch-manager-impolite.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-multiwatch-manager-impolite" SHARED service-version-multiwatch-manager-impolite.c)
+target_include_directories("service-version-multiwatch-manager-impolite" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-multiwatch-manager-impolite" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# service-version-multiwatch-service
+
+set_source_files_properties(service-version-multiwatch-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_library("service-version-multiwatch-service" SHARED service-version-multiwatch-service.c)
+target_include_directories("service-version-multiwatch-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("service-version-multiwatch-service" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+
+# test-desktop-shortcuts
+
+set_source_files_properties(test-desktop-shortcuts.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_executable("test-desktop-shortcuts" test-desktop-shortcuts.c)
+target_compile_definitions("test-desktop-shortcuts" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+target_compile_definitions("test-desktop-shortcuts" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories("test-desktop-shortcuts" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("test-desktop-shortcuts" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+target_link_libraries("test-desktop-shortcuts" ${PROJECT_DEPS_LIBRARIES} -layatana-indicator3)
+target_link_directories("test-desktop-shortcuts" PUBLIC "${CMAKE_BINARY_DIR}/src")
+add_dependencies("test-desktop-shortcuts" "ayatana-indicator3")
+add_test("test-desktop-shortcuts" "test-desktop-shortcuts")
+
+# test-indicator-ng
+
+set_source_files_properties(test-indicator-ng.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_executable("test-indicator-ng" test-indicator-ng.c)
+target_compile_definitions("test-indicator-ng" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+target_compile_definitions("test-indicator-ng" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories("test-indicator-ng" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("test-indicator-ng" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+target_link_libraries("test-indicator-ng" ${PROJECT_DEPS_LIBRARIES} -layatana-indicator3)
+target_link_directories("test-indicator-ng" PUBLIC "${CMAKE_BINARY_DIR}/src")
+add_dependencies("test-indicator-ng" "ayatana-indicator3")
+add_test("test-indicator-ng" "test-indicator-ng")
+
+# test-loader
+
+set_source_files_properties(test-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_executable("test-loader" test-loader.c)
+target_compile_definitions("test-loader" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+target_include_directories("test-loader" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("test-loader" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+target_link_libraries("test-loader" ${PROJECT_DEPS_LIBRARIES} -layatana-indicator3)
+target_link_directories("test-loader" PUBLIC "${CMAKE_BINARY_DIR}/src")
+add_dependencies("test-loader" "ayatana-indicator3")
+add_test("test-loader" "test-loader")
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 100eb16..476de28 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ TESTS =
 DISTCLEANFILES =
 XFAIL_TESTS =
 
-check_PROGRAMS = 
+check_PROGRAMS =
 
 lib_LTLIBRARIES = \
 	libdummy-indicator-blank.la \
@@ -46,7 +46,7 @@ test_loader_CFLAGS = \
 
 test_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 #############################
@@ -66,7 +66,7 @@ test_desktop_shortcuts_CFLAGS = \
 
 test_desktop_shortcuts_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 DS_XML_REPORT  = desktop-shortcuts-check-results.xml
@@ -99,7 +99,7 @@ libdummy_indicator_blank_la_CFLAGS = \
 
 libdummy_indicator_blank_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_blank_la_LDFLAGS = \
@@ -120,7 +120,7 @@ libdummy_indicator_null_la_CFLAGS = \
 
 libdummy_indicator_null_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_null_la_LDFLAGS = \
@@ -141,7 +141,7 @@ libdummy_indicator_signaler_la_CFLAGS = \
 
 libdummy_indicator_signaler_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_signaler_la_LDFLAGS = \
@@ -162,7 +162,7 @@ libdummy_indicator_simple_la_CFLAGS = \
 
 libdummy_indicator_simple_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_simple_la_LDFLAGS = \
@@ -184,7 +184,7 @@ libdummy_indicator_entry_func_la_CFLAGS = \
 
 libdummy_indicator_entry_func_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_entry_func_la_LDFLAGS = \
@@ -205,7 +205,7 @@ libdummy_indicator_visible_la_CFLAGS = \
 
 libdummy_indicator_visible_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_visible_la_LDFLAGS = \
@@ -227,7 +227,7 @@ service_shutdown_timeout_CFLAGS = \
 
 service_shutdown_timeout_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-shutdown-timeout-tester: service-shutdown-timeout Makefile
@@ -253,7 +253,7 @@ service_manager_no_connect_CFLAGS = \
 
 service_manager_no_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-no-connect-tester: service-manager-no-connect Makefile.am
@@ -285,7 +285,7 @@ service_manager_connect_CFLAGS = \
 
 service_manager_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-manager-connect-service
@@ -299,7 +299,7 @@ service_manager_connect_service_CFLAGS = \
 
 service_manager_connect_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am
@@ -332,7 +332,7 @@ service_version_manager_CFLAGS = \
 
 service_version_manager_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-bad-service
@@ -347,7 +347,7 @@ service_version_bad_service_CFLAGS = \
 
 service_version_bad_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-good-service
@@ -362,7 +362,7 @@ service_version_good_service_CFLAGS = \
 
 service_version_good_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-version-tester: service-version-manager service-version-bad-service service-version-good-service session.conf service-version-bad.service service-version-good.service Makefile.am
@@ -389,7 +389,7 @@ service_version_multiwatch_manager_CFLAGS = \
 
 service_version_multiwatch_manager_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-multiwatch-manager-impolite
@@ -404,7 +404,7 @@ service_version_multiwatch_manager_impolite_CFLAGS = \
 
 service_version_multiwatch_manager_impolite_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-multiwatch-service
@@ -419,7 +419,7 @@ service_version_multiwatch_service_CFLAGS = \
 
 service_version_multiwatch_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am
@@ -445,7 +445,7 @@ service_manager_nostart_connect_CFLAGS = \
 
 service_manager_nostart_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am
@@ -496,7 +496,7 @@ test_indicator_ng_CFLAGS = \
 
 test_indicator_ng_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 
diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c
index dcbb99f..e447d6c 100644
--- a/tests/dummy-indicator-blank.c
+++ b/tests/dummy-indicator-blank.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,7 +23,7 @@ License along with this library. If not, see
 */
 
 
-#include "libayatana-indicator/indicator.h"
+#include "indicator.h"
 
 INDICATOR_SET_VERSION
 
diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h
index c1fa8d3..97b3a04 100644
--- a/tests/dummy-indicator-entry-func.h
+++ b/tests/dummy-indicator-entry-func.h
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2012 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -26,8 +28,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libayatana-indicator/indicator.h"
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator.h"
+#include "indicator-object.h"
 
 G_BEGIN_DECLS
 
@@ -42,15 +44,15 @@ typedef struct _DummyIndicatorEntryFunc      DummyIndicatorEntryFunc;
 typedef struct _DummyIndicatorEntryFuncClass DummyIndicatorEntryFuncClass;
 
 struct _DummyIndicatorEntryFuncClass {
-	IndicatorObjectClass parent_class;
+    IndicatorObjectClass parent_class;
 };
 
 struct _DummyIndicatorEntryFunc {
-	IndicatorObject parent;
+    IndicatorObject parent;
 
-	gboolean entry_activate_called;
-	gboolean entry_activate_window_called;
-	gboolean entry_close_called;
+    gboolean entry_activate_called;
+    gboolean entry_activate_window_called;
+    gboolean entry_close_called;
 };
 
 #endif /* __DUMMY_INDICATOR_ENTRY_FUNC__ */
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 5eb8716..adb05d3 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -24,8 +26,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libayatana-indicator/indicator.h"
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator.h"
+#include "indicator-object.h"
 
 #define DUMMY_INDICATOR_NULL_TYPE            (dummy_indicator_null_get_type ())
 #define DUMMY_INDICATOR_NULL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNull))
@@ -38,11 +40,11 @@ typedef struct _DummyIndicatorNull      DummyIndicatorNull;
 typedef struct _DummyIndicatorNullClass DummyIndicatorNullClass;
 
 struct _DummyIndicatorNullClass {
-	IndicatorObjectClass parent_class;
+    IndicatorObjectClass parent_class;
 };
 
 struct _DummyIndicatorNull {
-	IndicatorObject parent;
+    IndicatorObject parent;
 };
 
 GType dummy_indicator_null_get_type (void);
@@ -54,24 +56,24 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_NULL_TYPE)
 GtkLabel *
 get_label (IndicatorObject * io)
 {
-	return NULL;
+    return NULL;
 }
 
 GtkImage *
 get_icon (IndicatorObject * io)
 {
-	return NULL;
+    return NULL;
 }
 
 GtkMenu *
 get_menu (IndicatorObject * io)
 {
-	return NULL;
+    return NULL;
 }
 const gchar *
 get_accessible_desc (IndicatorObject * io)
 {
-	return NULL;
+    return NULL;
 }
 
 static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass);
@@ -84,40 +86,40 @@ G_DEFINE_TYPE (DummyIndicatorNull, dummy_indicator_null, INDICATOR_OBJECT_TYPE);
 static void
 dummy_indicator_null_class_init (DummyIndicatorNullClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->dispose = dummy_indicator_null_dispose;
-	object_class->finalize = dummy_indicator_null_finalize;
+    object_class->dispose = dummy_indicator_null_dispose;
+    object_class->finalize = dummy_indicator_null_finalize;
 
-	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+    IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 
-	io_class->get_label = get_label;
-	io_class->get_image = get_icon;
-	io_class->get_menu = get_menu;
-	io_class->get_accessible_desc = get_accessible_desc;
+    io_class->get_label = get_label;
+    io_class->get_image = get_icon;
+    io_class->get_menu = get_menu;
+    io_class->get_accessible_desc = get_accessible_desc;
 
-	return;
+    return;
 }
 
 static void
 dummy_indicator_null_init (DummyIndicatorNull *self)
 {
 
-	return;
+    return;
 }
 
 static void
 dummy_indicator_null_dispose (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_null_parent_class)->dispose (object);
-	return;
+    G_OBJECT_CLASS (dummy_indicator_null_parent_class)->dispose (object);
+    return;
 }
 
 static void
 dummy_indicator_null_finalize (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_null_parent_class)->finalize (object);
-	return;
+    G_OBJECT_CLASS (dummy_indicator_null_parent_class)->finalize (object);
+    return;
 }
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index f73f35e..2fa3a8b 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -23,8 +25,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libayatana-indicator/indicator.h"
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator.h"
+#include "indicator-object.h"
 
 #define DUMMY_INDICATOR_SIGNALER_TYPE            (dummy_indicator_signaler_get_type ())
 #define DUMMY_INDICATOR_SIGNALER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignaler))
@@ -37,12 +39,12 @@ typedef struct _DummyIndicatorSignaler      DummyIndicatorSignaler;
 typedef struct _DummyIndicatorSignalerClass DummyIndicatorSignalerClass;
 
 struct _DummyIndicatorSignalerClass {
-	IndicatorObjectClass parent_class;
+    IndicatorObjectClass parent_class;
 };
 
 struct _DummyIndicatorSignaler {
-	IndicatorObject parent;
-	IndicatorObjectEntry *entries;
+    IndicatorObject parent;
+    IndicatorObjectEntry *entries;
 };
 
 GType dummy_indicator_signaler_get_type (void);
@@ -53,30 +55,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIGNALER_TYPE)
 GtkLabel *
 get_label (IndicatorObject * io)
 {
-	return GTK_LABEL(gtk_label_new("Signaler Item"));
+    return GTK_LABEL(gtk_label_new("Signaler Item"));
 }
 
 GtkImage *
 get_icon (IndicatorObject * io)
 {
-	return GTK_IMAGE(gtk_image_new());
+    return GTK_IMAGE(gtk_image_new());
 }
 
 GtkMenu *
 get_menu (IndicatorObject * io)
 {
-	GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
-	GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
-	gtk_widget_show(GTK_WIDGET(loading_item));
+    GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
+    GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
+    gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
+    gtk_widget_show(GTK_WIDGET(loading_item));
 
-	return main_menu;
+    return main_menu;
 }
 
 const gchar *
 get_accessible_desc (IndicatorObject * io)
 {
-	return "Signaler Item";
+    return "Signaler Item";
 }
 
 static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass);
@@ -89,66 +91,66 @@ G_DEFINE_TYPE (DummyIndicatorSignaler, dummy_indicator_signaler, INDICATOR_OBJEC
 static void
 dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->dispose = dummy_indicator_signaler_dispose;
-	object_class->finalize = dummy_indicator_signaler_finalize;
+    object_class->dispose = dummy_indicator_signaler_dispose;
+    object_class->finalize = dummy_indicator_signaler_finalize;
 
-	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+    IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 
-	io_class->get_label = get_label;
-	io_class->get_image = get_icon;
-	io_class->get_menu = get_menu;
-	io_class->get_accessible_desc = get_accessible_desc;
-	io_class->entry_being_removed  = NULL;
-	io_class->entry_was_added  = NULL;
+    io_class->get_label = get_label;
+    io_class->get_image = get_icon;
+    io_class->get_menu = get_menu;
+    io_class->get_accessible_desc = get_accessible_desc;
+    io_class->entry_being_removed  = NULL;
+    io_class->entry_was_added  = NULL;
 
-	return;
+    return;
 }
 
 static gboolean
 idle_signal (gpointer data)
 {
-	DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data);
+    DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data);
 
-	IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry;
+    IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry;
 
-	added_entry = &self->entries[0];
-	moved_entry = &self->entries[1];
-	removed_entry = &self->entries[2];
+    added_entry = &self->entries[0];
+    moved_entry = &self->entries[1];
+    removed_entry = &self->entries[2];
 
-	added_entry->name_hint = "added";
-	moved_entry->name_hint = "moved";
-	removed_entry->name_hint = "removed";
+    added_entry->name_hint = "added";
+    moved_entry->name_hint = "moved";
+    removed_entry->name_hint = "removed";
 
-	g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry);
-	g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1);
-	g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry);
+    g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry);
+    g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1);
+    g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry);
 
-	return FALSE; /* Don't queue again */
+    return FALSE; /* Don't queue again */
 }
 
 static void
 dummy_indicator_signaler_init (DummyIndicatorSignaler *self)
 {
-	self->entries = g_new0(IndicatorObjectEntry, 3);
-	g_idle_add(idle_signal, self);
-	return;
+    self->entries = g_new0(IndicatorObjectEntry, 3);
+    g_idle_add(idle_signal, self);
+    return;
 }
 
 static void
 dummy_indicator_signaler_dispose (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->dispose (object);
-	return;
+    G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->dispose (object);
+    return;
 }
 
 static void
 dummy_indicator_signaler_finalize (GObject *object)
 {
-	DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object);
-	g_free (self->entries);
-	G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object);
-	return;
+    DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object);
+    g_free (self->entries);
+    G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object);
+    return;
 }
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 69a9c1d..e42d1fe 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -23,8 +25,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libayatana-indicator/indicator.h"
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator.h"
+#include "indicator-object.h"
 
 #define DUMMY_INDICATOR_SIMPLE_TYPE            (dummy_indicator_simple_get_type ())
 #define DUMMY_INDICATOR_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimple))
@@ -37,11 +39,11 @@ typedef struct _DummyIndicatorSimple      DummyIndicatorSimple;
 typedef struct _DummyIndicatorSimpleClass DummyIndicatorSimpleClass;
 
 struct _DummyIndicatorSimpleClass {
-	IndicatorObjectClass parent_class;
+    IndicatorObjectClass parent_class;
 };
 
 struct _DummyIndicatorSimple {
-	IndicatorObject parent;
+    IndicatorObject parent;
 };
 
 GType dummy_indicator_simple_get_type (void);
@@ -52,30 +54,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIMPLE_TYPE)
 GtkLabel *
 get_label (IndicatorObject * io)
 {
-	return GTK_LABEL(gtk_label_new("Simple Item"));
+    return GTK_LABEL(gtk_label_new("Simple Item"));
 }
 
 GtkImage *
 get_icon (IndicatorObject * io)
 {
-	return GTK_IMAGE(gtk_image_new());
+    return GTK_IMAGE(gtk_image_new());
 }
 
 GtkMenu *
 get_menu (IndicatorObject * io)
 {
-	GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
-	GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
-	gtk_widget_show(GTK_WIDGET(loading_item));
+    GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
+    GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
+    gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
+    gtk_widget_show(GTK_WIDGET(loading_item));
 
-	return main_menu;
+    return main_menu;
 }
 
 const gchar *
 get_accessible_desc (IndicatorObject * io)
 {
-	return "Simple Item";
+    return "Simple Item";
 }
 
 static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass);
@@ -88,40 +90,40 @@ G_DEFINE_TYPE (DummyIndicatorSimple, dummy_indicator_simple, INDICATOR_OBJECT_TY
 static void
 dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->dispose = dummy_indicator_simple_dispose;
-	object_class->finalize = dummy_indicator_simple_finalize;
+    object_class->dispose = dummy_indicator_simple_dispose;
+    object_class->finalize = dummy_indicator_simple_finalize;
 
-	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+    IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 
-	io_class->get_label = get_label;
-	io_class->get_image = get_icon;
-	io_class->get_menu = get_menu;
-	io_class->get_accessible_desc = get_accessible_desc;
+    io_class->get_label = get_label;
+    io_class->get_image = get_icon;
+    io_class->get_menu = get_menu;
+    io_class->get_accessible_desc = get_accessible_desc;
 
-	return;
+    return;
 }
 
 static void
 dummy_indicator_simple_init (DummyIndicatorSimple *self)
 {
 
-	return;
+    return;
 }
 
 static void
 dummy_indicator_simple_dispose (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->dispose (object);
-	return;
+    G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->dispose (object);
+    return;
 }
 
 static void
 dummy_indicator_simple_finalize (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->finalize (object);
-	return;
+    G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->finalize (object);
+    return;
 }
diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c
index 05bc9ad..639f7c8 100644
--- a/tests/dummy-indicator-visible.c
+++ b/tests/dummy-indicator-visible.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2012 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Charles Kerr <charles.kerr@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -23,8 +25,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libayatana-indicator/indicator.h"
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator.h"
+#include "indicator-object.h"
 
 #define DUMMY_INDICATOR_VISIBLE_TYPE            (dummy_indicator_visible_get_type ())
 #define DUMMY_INDICATOR_VISIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisible))
@@ -37,11 +39,11 @@ typedef struct _DummyIndicatorVisible      DummyIndicatorVisible;
 typedef struct _DummyIndicatorVisibleClass DummyIndicatorVisibleClass;
 
 struct _DummyIndicatorVisibleClass {
-	IndicatorObjectClass parent_class;
+    IndicatorObjectClass parent_class;
 };
 
 struct _DummyIndicatorVisible {
-	IndicatorObject parent;
+    IndicatorObject parent;
 };
 
 GType dummy_indicator_visible_get_type (void);
@@ -52,30 +54,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_VISIBLE_TYPE)
 GtkLabel *
 get_label (IndicatorObject * io)
 {
-	return GTK_LABEL(gtk_label_new("Visible Item"));
+    return GTK_LABEL(gtk_label_new("Visible Item"));
 }
 
 GtkImage *
 get_icon (IndicatorObject * io)
 {
-	return GTK_IMAGE(gtk_image_new());
+    return GTK_IMAGE(gtk_image_new());
 }
 
 GtkMenu *
 get_menu (IndicatorObject * io)
 {
-	GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
-	GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
-	gtk_widget_show(GTK_WIDGET(loading_item));
+    GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
+    GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
+    gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
+    gtk_widget_show(GTK_WIDGET(loading_item));
 
-	return main_menu;
+    return main_menu;
 }
 
 const gchar *
 get_accessible_desc (IndicatorObject * io)
 {
-	return "Visible Item";
+    return "Visible Item";
 }
 
 static void dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass);
@@ -88,43 +90,43 @@ G_DEFINE_TYPE (DummyIndicatorVisible, dummy_indicator_visible, INDICATOR_OBJECT_
 static void
 dummy_indicator_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry * entry)
 {
-	IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class);
+    IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class);
 
-	g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1));
+    g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1));
 
-	if (indicator_object_class->entry_being_removed != NULL) {
-		indicator_object_class->entry_being_removed (io, entry);
-	}
+    if (indicator_object_class->entry_being_removed != NULL) {
+        indicator_object_class->entry_being_removed (io, entry);
+    }
 }
 
 static void
 dummy_indicator_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * entry)
 {
-	IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class);
+    IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class);
 
-	g_object_steal_data(G_OBJECT(entry->label), "is-hidden");
+    g_object_steal_data(G_OBJECT(entry->label), "is-hidden");
 
-	if (indicator_object_class->entry_was_added != NULL) {
-		indicator_object_class->entry_was_added (io, entry);
-	}
+    if (indicator_object_class->entry_was_added != NULL) {
+        indicator_object_class->entry_was_added (io, entry);
+    }
 }
 
 static void
 dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->dispose = dummy_indicator_visible_dispose;
-	object_class->finalize = dummy_indicator_visible_finalize;
+    object_class->dispose = dummy_indicator_visible_dispose;
+    object_class->finalize = dummy_indicator_visible_finalize;
 
-	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+    IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 
-	io_class->get_label = get_label;
-	io_class->get_image = get_icon;
-	io_class->get_menu = get_menu;
-	io_class->get_accessible_desc = get_accessible_desc;
-	io_class->entry_being_removed = dummy_indicator_entry_being_removed;
-	io_class->entry_was_added = dummy_indicator_entry_was_added;
+    io_class->get_label = get_label;
+    io_class->get_image = get_icon;
+    io_class->get_menu = get_menu;
+    io_class->get_accessible_desc = get_accessible_desc;
+    io_class->entry_being_removed = dummy_indicator_entry_being_removed;
+    io_class->entry_was_added = dummy_indicator_entry_was_added;
 }
 
 static void
@@ -136,12 +138,12 @@ static void
 dummy_indicator_visible_dispose (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->dispose (object);
+    G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->dispose (object);
 }
 
 static void
 dummy_indicator_visible_finalize (GObject *object)
 {
 
-	G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->finalize (object);
+    G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->finalize (object);
 }
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index fb00712..a17bada 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service.h"
+#include "indicator-service.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index d4774f7..cf7cb6a 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
index 7aeffc2..5b5d389 100644
--- a/tests/service-manager-no-connect.c
+++ b/tests/service-manager-no-connect.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c
index 36d1bdd..44a87a9 100644
--- a/tests/service-manager-nostart-connect.c
+++ b/tests/service-manager-nostart-connect.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
index e044216..338ebb6 100644
--- a/tests/service-shutdown-timeout.c
+++ b/tests/service-shutdown-timeout.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service.h"
+#include "indicator-service.h"
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c
index f78f6e1..46574cb 100644
--- a/tests/service-version-bad-service.c
+++ b/tests/service-version-bad-service.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service.h"
+#include "indicator-service.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c
index a811d96..3257ce2 100644
--- a/tests/service-version-good-service.c
+++ b/tests/service-version-good-service.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service.h"
+#include "indicator-service.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c
index 370dbd0..07c6173 100644
--- a/tests/service-version-manager.c
+++ b/tests/service-version-manager.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c
index 4e3a5a9..97678d3 100644
--- a/tests/service-version-multiwatch-manager-impolite.c
+++ b/tests/service-version-multiwatch-manager-impolite.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c
index c24b41d..7f82e82 100644
--- a/tests/service-version-multiwatch-manager.c
+++ b/tests/service-version-multiwatch-manager.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service-manager.h"
+#include "indicator-service-manager.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c
index 1a43414..e1ca660 100644
--- a/tests/service-version-multiwatch-service.c
+++ b/tests/service-version-multiwatch-service.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +24,7 @@ License along with this library. If not, see
 
 
 #include <glib.h>
-#include "libayatana-indicator/indicator-service.h"
+#include "indicator-service.h"
 #include "service-version-values.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c
index 59084dd..48a668d 100644
--- a/tests/test-desktop-shortcuts.c
+++ b/tests/test-desktop-shortcuts.c
@@ -2,9 +2,11 @@
 Test for libayatana-indicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,7 +23,7 @@ License along with this library. If not, see
 */
 
 #include <gtk/gtk.h>
-#include "libayatana-indicator/indicator-desktop-shortcuts.h"
+#include "indicator-desktop-shortcuts.h"
 
 /* Basic object creation and destruction.  Stop big
    f*** ups here. */
diff --git a/tests/test-indicator-ng.c b/tests/test-indicator-ng.c
index 0844334..416c8da 100644
--- a/tests/test-indicator-ng.c
+++ b/tests/test-indicator-ng.c
@@ -1,5 +1,5 @@
 
-#include <libayatana-indicator/indicator-ng.h>
+#include "indicator-ng.h"
 
 static void
 indicator_ng_test_func (gconstpointer user_data)
@@ -105,7 +105,7 @@ test_instantiation_with_profile (void)
  * widgets to accommodate an icon.
  *
  */
-static const gchar *
+/*static const gchar *
 get_label (GtkMenuItem *item)
 {
   GList *children = gtk_container_get_children (GTK_CONTAINER (item));
@@ -122,9 +122,9 @@ get_label (GtkMenuItem *item)
     }
 
   return label;
-}
+}*/
 
-static void
+/*static void
 test_menu (void)
 {
   IndicatorNg *indicator;
@@ -169,7 +169,7 @@ test_menu (void)
   g_list_free (entries);
   g_main_loop_unref (loop);
   g_object_unref (indicator);
-}
+}*/
 
 int
 main (int argc, char **argv)
@@ -187,7 +187,7 @@ main (int argc, char **argv)
   indicator_ng_test_add ("non-existing", test_non_existing);
   indicator_ng_test_add ("instantiation", test_instantiation);
   indicator_ng_test_add ("instantiation-with-profile", test_instantiation_with_profile);
-  indicator_ng_test_add ("menu", test_menu);
+  //indicator_ng_test_add ("menu", test_menu);
 
   return g_test_run ();
 }
diff --git a/tests/test-loader.c b/tests/test-loader.c
index 5f9b8d3..d6dabc5 100644
--- a/tests/test-loader.c
+++ b/tests/test-loader.c
@@ -2,9 +2,11 @@
 Test for libindicator
 
 Copyright 2009 Canonical Ltd.
+Copyright 2021 AyatanaIndicators
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,78 +23,78 @@ License along with this library. If not, see
 */
 
 #include <gtk/gtk.h>
-#include "libayatana-indicator/indicator-object.h"
+#include "indicator-object.h"
 
 #include "dummy-indicator-entry-func.h"
 
 void
 entry_func_swap (IndicatorObject * io)
 {
-	static void (*saved_func) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) = NULL;
-	IndicatorObjectClass * klass = INDICATOR_OBJECT_GET_CLASS(io);
+    static void (*saved_func) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) = NULL;
+    IndicatorObjectClass * klass = INDICATOR_OBJECT_GET_CLASS(io);
 
-	if (saved_func == NULL) {
-		saved_func = klass->entry_activate_window;
-	}
+    if (saved_func == NULL) {
+        saved_func = klass->entry_activate_window;
+    }
 
-	if (klass->entry_activate_window == NULL) {
-		klass->entry_activate_window = saved_func;
-	} else {
-		klass->entry_activate_window = NULL;
-	}
+    if (klass->entry_activate_window == NULL) {
+        klass->entry_activate_window = saved_func;
+    } else {
+        klass->entry_activate_window = NULL;
+    }
 
-	return;
+    return;
 }
 
 void
 test_loader_entry_func_window (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-entry-func.so");
+    g_assert(object != NULL);
 
-	DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object);
+    DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object);
 
-	entryfunc->entry_activate_called = FALSE;
-	entryfunc->entry_activate_window_called = FALSE;
-	entryfunc->entry_close_called = FALSE;
+    entryfunc->entry_activate_called = FALSE;
+    entryfunc->entry_activate_window_called = FALSE;
+    entryfunc->entry_close_called = FALSE;
 
-	entry_func_swap(object);
-	indicator_object_entry_activate_window(object, NULL, 0, 0);
-	g_assert(entryfunc->entry_activate_called);
+    entry_func_swap(object);
+    indicator_object_entry_activate_window(object, NULL, 0, 0);
+    g_assert(entryfunc->entry_activate_called);
 
-	entry_func_swap(object);
-	indicator_object_entry_activate_window(object, NULL, 0, 0);
-	g_assert(entryfunc->entry_activate_window_called);
+    entry_func_swap(object);
+    indicator_object_entry_activate_window(object, NULL, 0, 0);
+    g_assert(entryfunc->entry_activate_window_called);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	return;
+    return;
 }
 
 void
 test_loader_entry_funcs (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-entry-func.so");
+    g_assert(object != NULL);
 
-	DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object);
+    DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object);
 
-	entryfunc->entry_activate_called = FALSE;
-	entryfunc->entry_activate_window_called = FALSE;
-	entryfunc->entry_close_called = FALSE;
+    entryfunc->entry_activate_called = FALSE;
+    entryfunc->entry_activate_window_called = FALSE;
+    entryfunc->entry_close_called = FALSE;
 
-	indicator_object_entry_activate(object, NULL, 0);
-	g_assert(entryfunc->entry_activate_called);
+    indicator_object_entry_activate(object, NULL, 0);
+    g_assert(entryfunc->entry_activate_called);
 
-	indicator_object_entry_activate_window(object, NULL, 0, 0);
-	g_assert(entryfunc->entry_activate_window_called);
+    indicator_object_entry_activate_window(object, NULL, 0, 0);
+    g_assert(entryfunc->entry_activate_window_called);
 
-	indicator_object_entry_close(object, NULL, 0);
-	g_assert(entryfunc->entry_close_called);
+    indicator_object_entry_close(object, NULL, 0);
+    g_assert(entryfunc->entry_close_called);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	return;
+    return;
 }
 
 void destroy_cb (gpointer data, GObject * object);
@@ -100,53 +102,53 @@ void destroy_cb (gpointer data, GObject * object);
 void
 entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data)
 {
-	IndicatorObjectEntry *other_entry = data;
-	other_entry->name_hint = entry->name_hint;
-	other_entry->parent_object = entry->parent_object;
-	return;
+    IndicatorObjectEntry *other_entry = data;
+    other_entry->name_hint = entry->name_hint;
+    other_entry->parent_object = entry->parent_object;
+    return;
 }
 
 void
 entry_move_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer data)
 {
-	return entry_change_cb(io, entry, data);
+    return entry_change_cb(io, entry, data);
 }
 
 void
 test_loader_filename_dummy_signaler (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-signaler.so");
+    g_assert(object != NULL);
 
-	IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry;
-	IndicatorObjectEntry entries[3];
+    IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry;
+    IndicatorObjectEntry entries[3];
 
-	added_entry = &entries[0];
-	moved_entry = &entries[1];
-	removed_entry = &entries[2];
+    added_entry = &entries[0];
+    moved_entry = &entries[1];
+    removed_entry = &entries[2];
 
-	g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_change_cb), added_entry);
-	g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_move_cb), moved_entry);
-	g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry);
+    g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_change_cb), added_entry);
+    g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_move_cb), moved_entry);
+    g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry);
 
-	GList * list = indicator_object_get_entries(object);
-	g_assert(list != NULL);
-	g_list_free(list);
+    GList * list = indicator_object_get_entries(object);
+    g_assert(list != NULL);
+    g_list_free(list);
 
-	while (g_main_context_pending(NULL)) {
-		g_main_context_iteration(NULL, TRUE);
-	}
+    while (g_main_context_pending(NULL)) {
+        g_main_context_iteration(NULL, TRUE);
+    }
 
-	g_assert(g_strcmp0(added_entry->name_hint, "added") == 0);
-	g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0);
-	g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0);
+    g_assert(g_strcmp0(added_entry->name_hint, "added") == 0);
+    g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0);
+    g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0);
 
-	g_assert(added_entry->parent_object == object);
-	g_assert(removed_entry->parent_object == NULL);
+    g_assert(added_entry->parent_object == object);
+    g_assert(removed_entry->parent_object == NULL);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	return;
+    return;
 }
 
 /***
@@ -156,86 +158,86 @@ test_loader_filename_dummy_signaler (void)
 static void
 visible_entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box)
 {
-	GtkWidget * child = GTK_WIDGET (entry->label);
-	g_assert (child != NULL);
-
-	if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL)
-	{
-		GtkWidget * frame = gtk_frame_new (NULL);
-		gtk_container_add (GTK_CONTAINER(frame), child);
-		gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0);
-		g_object_set_data (G_OBJECT(child), "frame-parent", frame);
-	}
+    GtkWidget * child = GTK_WIDGET (entry->label);
+    g_assert (child != NULL);
+
+    if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL)
+    {
+        GtkWidget * frame = gtk_frame_new (NULL);
+        gtk_container_add (GTK_CONTAINER(frame), child);
+        gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0);
+        g_object_set_data (G_OBJECT(child), "frame-parent", frame);
+    }
 }
 
 static void
 visible_entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box)
 {
-	GtkWidget * child = GTK_WIDGET (entry->label);
-	g_assert (child != NULL);
-	g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL);
+    GtkWidget * child = GTK_WIDGET (entry->label);
+    g_assert (child != NULL);
+    g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL);
 }
 
 void
 test_loader_filename_dummy_visible (void)
 {
-	const GQuark is_hidden_quark = g_quark_from_static_string ("is-hidden");
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-visible.so");
-	g_assert(object != NULL);
+    const GQuark is_hidden_quark = g_quark_from_static_string ("is-hidden");
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-visible.so");
+    g_assert(object != NULL);
 
-	// create our local parent widgetry
+    // create our local parent widgetry
 #if GTK_CHECK_VERSION(3,0,0)
-	GtkWidget * box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    GtkWidget * box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 #else
-	GtkWidget * box = gtk_hbox_new (TRUE, 0);
+    GtkWidget * box = gtk_hbox_new (TRUE, 0);
 #endif
-	g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,
-	                 G_CALLBACK(visible_entry_added), box);
-	g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED,
-	                 G_CALLBACK(visible_entry_removed), box);
-
-	// on startup, DummyVisible has one entry and it has a label
-	GList * list = indicator_object_get_entries(object);
-	g_assert(g_list_length(list) == 1);
-	IndicatorObjectEntry * entry = list->data;
-	g_assert(entry != NULL);
-	g_list_free(list);
-	g_assert(GTK_IS_LABEL(entry->label));
-	g_assert(entry->parent_object == object);
-	g_assert(INDICATOR_IS_OBJECT(entry->parent_object));
-	GtkWidget * label = GTK_WIDGET(entry->label);
+    g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,
+                     G_CALLBACK(visible_entry_added), box);
+    g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED,
+                     G_CALLBACK(visible_entry_removed), box);
+
+    // on startup, DummyVisible has one entry and it has a label
+    GList * list = indicator_object_get_entries(object);
+    g_assert(g_list_length(list) == 1);
+    IndicatorObjectEntry * entry = list->data;
+    g_assert(entry != NULL);
+    g_list_free(list);
+    g_assert(GTK_IS_LABEL(entry->label));
+    g_assert(entry->parent_object == object);
+    g_assert(INDICATOR_IS_OBJECT(entry->parent_object));
+    GtkWidget * label = GTK_WIDGET(entry->label);
         g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL);
 
-	// add the inital entry to our local parent widgetry
-	visible_entry_added (object, entry, box);
-	entry = NULL;
-	list = gtk_container_get_children (GTK_CONTAINER(box));
-	g_assert(g_list_length(list) == 1);
-	g_list_free(list);
-	
-	// hide the entries and confirm that the label survived
-	indicator_object_set_visible (object, FALSE);
-	while (g_main_context_pending(NULL))
-		g_main_context_iteration(NULL, TRUE);
-	g_assert(GTK_IS_LABEL(label));
+    // add the inital entry to our local parent widgetry
+    visible_entry_added (object, entry, box);
+    entry = NULL;
+    list = gtk_container_get_children (GTK_CONTAINER(box));
+    g_assert(g_list_length(list) == 1);
+    g_list_free(list);
+
+    // hide the entries and confirm that the label survived
+    indicator_object_set_visible (object, FALSE);
+    while (g_main_context_pending(NULL))
+        g_main_context_iteration(NULL, TRUE);
+    g_assert(GTK_IS_LABEL(label));
         g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) != NULL);
-	list = gtk_container_get_children (GTK_CONTAINER(box));
-	g_assert(g_list_length(list) == 1);
-	g_list_free(list);
-
-	// restore the entries and confirm that the label survived
-	indicator_object_set_visible (object, TRUE);
-	while (g_main_context_pending(NULL))
-		g_main_context_iteration(NULL, TRUE);
-	g_assert(GTK_IS_LABEL(label));
+    list = gtk_container_get_children (GTK_CONTAINER(box));
+    g_assert(g_list_length(list) == 1);
+    g_list_free(list);
+
+    // restore the entries and confirm that the label survived
+    indicator_object_set_visible (object, TRUE);
+    while (g_main_context_pending(NULL))
+        g_main_context_iteration(NULL, TRUE);
+    g_assert(GTK_IS_LABEL(label));
         g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL);
-	list = gtk_container_get_children (GTK_CONTAINER(box));
-	g_assert(g_list_length(list) == 1);
-	g_list_free(list);
+    list = gtk_container_get_children (GTK_CONTAINER(box));
+    g_assert(g_list_length(list) == 1);
+    g_list_free(list);
 
-	// cleanup
-	g_object_unref(object);
-	gtk_widget_destroy(box);
+    // cleanup
+    g_object_unref(object);
+    gtk_widget_destroy(box);
 }
 
 /***
@@ -245,129 +247,129 @@ test_loader_filename_dummy_visible (void)
 void
 test_loader_filename_dummy_simple_location (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so");
+    g_assert(object != NULL);
 
-	GList * entries = indicator_object_get_entries(object);
-	g_assert(entries != NULL);
-	g_assert(g_list_length(entries) == 1);
+    GList * entries = indicator_object_get_entries(object);
+    g_assert(entries != NULL);
+    g_assert(g_list_length(entries) == 1);
 
-	IndicatorObjectEntry *entry = entries->data;
+    IndicatorObjectEntry *entry = entries->data;
 
-	g_assert(indicator_object_get_location(object, entry) == 0);
-	g_assert(indicator_object_get_location(object, NULL) == 0);
-	g_assert(entry->parent_object == object);
+    g_assert(indicator_object_get_location(object, entry) == 0);
+    g_assert(indicator_object_get_location(object, NULL) == 0);
+    g_assert(entry->parent_object == object);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	return;
+    return;
 }
 
 void
 test_loader_filename_dummy_simple_accessors (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so");
+    g_assert(object != NULL);
 
-	g_assert(indicator_object_get_entries(object) != NULL);
+    g_assert(indicator_object_get_entries(object) != NULL);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	return;
+    return;
 }
 
 void
 test_loader_filename_dummy_simple (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so");
-	g_assert(object != NULL);
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so");
+    g_assert(object != NULL);
 
-	gboolean unreffed = FALSE;
-	g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed);
+    gboolean unreffed = FALSE;
+    g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed);
 
-	g_object_unref(object);
-	g_assert(unreffed == TRUE);
+    g_object_unref(object);
+    g_assert(unreffed == TRUE);
 
-	return;
+    return;
 }
 
 void
 test_loader_filename_dummy_blank (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-blank.so");
-	g_assert(object == NULL);
-	return;
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-blank.so");
+    g_assert(object == NULL);
+    return;
 }
 
 void
 test_loader_filename_dummy_null (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so");
-	g_assert(object != NULL);
-	g_assert(indicator_object_get_entries(object) == NULL);
-	g_object_unref(G_OBJECT(object));
-	return;
+    IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-null.so");
+    g_assert(object != NULL);
+    g_assert(indicator_object_get_entries(object) == NULL);
+    g_object_unref(G_OBJECT(object));
+    return;
 }
 
 void
 test_loader_filename_bad (void)
 {
-	IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so");
-	g_assert(object == NULL);
-	return;
+    IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so");
+    g_assert(object == NULL);
+    return;
 }
 
 void
 destroy_cb (gpointer data, GObject * object)
 {
-	gboolean * bob = (gboolean *)data;
-	*bob = TRUE;
-	return;
+    gboolean * bob = (gboolean *)data;
+    *bob = TRUE;
+    return;
 }
 
 void
 test_loader_refunref (void)
 {
-	GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL);
+    GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL);
 
-	gboolean unreffed = FALSE;
-	g_object_weak_ref(object, destroy_cb, &unreffed);
+    gboolean unreffed = FALSE;
+    g_object_weak_ref(object, destroy_cb, &unreffed);
 
-	g_object_unref(object);
+    g_object_unref(object);
 
-	g_assert(unreffed == TRUE);
+    g_assert(unreffed == TRUE);
 
-	return;
+    return;
 }
 
 void
 test_loader_creation_deletion_suite (void)
 {
-	g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref);
-	g_test_add_func ("/libindicator/loader/filename_bad",  test_loader_filename_bad);
-	g_test_add_func ("/libindicator/loader/dummy/null_load",  test_loader_filename_dummy_null);
-	g_test_add_func ("/libindicator/loader/dummy/blank_load",  test_loader_filename_dummy_null);
-	g_test_add_func ("/libindicator/loader/dummy/simple_load",  test_loader_filename_dummy_simple);
-	g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors);
-	g_test_add_func ("/libindicator/loader/dummy/simple_location", test_loader_filename_dummy_simple_location);
-	g_test_add_func ("/libindicator/loader/dummy/signaler",  test_loader_filename_dummy_signaler);
-	g_test_add_func ("/libindicator/loader/dummy/entry_funcs",  test_loader_entry_funcs);
-	g_test_add_func ("/libindicator/loader/dummy/entry_func_window",  test_loader_entry_func_window);
-	g_test_add_func ("/libindicator/loader/dummy/visible",  test_loader_filename_dummy_visible);
-
-	return;
+    g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref);
+    g_test_add_func ("/libindicator/loader/filename_bad",  test_loader_filename_bad);
+    g_test_add_func ("/libindicator/loader/dummy/null_load",  test_loader_filename_dummy_null);
+    g_test_add_func ("/libindicator/loader/dummy/blank_load",  test_loader_filename_dummy_null);
+    g_test_add_func ("/libindicator/loader/dummy/simple_load",  test_loader_filename_dummy_simple);
+    g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors);
+    g_test_add_func ("/libindicator/loader/dummy/simple_location", test_loader_filename_dummy_simple_location);
+    g_test_add_func ("/libindicator/loader/dummy/signaler",  test_loader_filename_dummy_signaler);
+    g_test_add_func ("/libindicator/loader/dummy/entry_funcs",  test_loader_entry_funcs);
+    g_test_add_func ("/libindicator/loader/dummy/entry_func_window",  test_loader_entry_func_window);
+    g_test_add_func ("/libindicator/loader/dummy/visible",  test_loader_filename_dummy_visible);
+
+    return;
 }
 
 
 int
 main (int argc, char ** argv)
 {
-	g_test_init (&argc, &argv, NULL);
-	gtk_init(&argc, &argv);
+    g_test_init (&argc, &argv, NULL);
+    gtk_init(&argc, &argv);
 
-	test_loader_creation_deletion_suite();
+    test_loader_creation_deletion_suite();
 
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+    g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 
-	return g_test_run();
+    return g_test_run();
 }
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..4120f31
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,8 @@
+# ayatana-indicator-loader3
+
+set_source_files_properties(indicator-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_executable("ayatana-indicator-loader3" indicator-loader.c)
+target_include_directories("ayatana-indicator-loader3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_include_directories("ayatana-indicator-loader3" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+target_link_libraries("ayatana-indicator-loader3" ${PROJECT_DEPS_LIBRARIES} "-L${CMAKE_BINARY_DIR}/src" -layatana-indicator3)
+add_dependencies("ayatana-indicator-loader3" "ayatana-indicator3")
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e871921..7d25b5c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ ayatana_indicator_loader_CFLAGS = \
 ayatana_indicator_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	$(LIBINDICATOR_IDO_LIBS) \
-	-L$(top_builddir)/libayatana-indicator/.libs \
+	-L$(top_builddir)/src/.libs \
 	$(INDICATOR_LIB)
 
 # We duplicate these here because Automake won't let us use $(VER) on the left hand side.
diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c
index 5b236db..159b17b 100644
--- a/tools/indicator-loader.c
+++ b/tools/indicator-loader.c
@@ -3,11 +3,13 @@
  * and during development of them.
  *
  * Copyright 2009 Canonical Ltd.
+ * Copyright 2021 AyatanaIndicators
  *
  * Authors:
  *   Ted Gould <ted@canonical.com>
  *   Lars Uebernickel <lars.uebernickel@canonical.com>
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +19,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License version 3.0 for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this library. If not, see
  * <http://www.gnu.org/licenses/>.
@@ -25,9 +27,9 @@
 
 #include <gtk/gtk.h>
 #include <libayatana-ido/libayatana-ido.h>
-#include <libayatana-indicator/indicator-object.h>
+#include "indicator-object.h"
 #if GTK_CHECK_VERSION (3,0,0)
- #include <libayatana-indicator/indicator-ng.h>
+ #include "indicator-ng.h"
 #endif
 
 static GHashTable * entry_to_menu_item = NULL;
@@ -159,7 +161,7 @@ entry_added (IndicatorObject      * io,
   gtk_widget_show (menu_item);
 }
 
-static void 
+static void
 entry_removed (__attribute__((unused)) IndicatorObject      * io,
                IndicatorObjectEntry * entry,
                __attribute__((unused)) gpointer               user_data)