diff -Nru location-service-3.0.0+16.10.20160912/debian/changelog location-service-3.0.0+16.10.20160912/debian/changelog
--- location-service-3.0.0+16.10.20160912/debian/changelog	2016-11-08 18:01:36.000000000 +0100
+++ location-service-3.0.0+16.10.20160912/debian/changelog	2017-03-23 13:04:47.000000000 +0100
@@ -1,3 +1,15 @@
+location-service (3.0.0+16.10.20160912-0ubuntu3) zesty; urgency=high
+
+  [ Tiago Stürmer Daitx ]
+  * Fix zesty FTBFS by adding the missing vector includes
+
+  [ Balint Reczey ]
+  * Build-depend on googletest instead of google-mock and libgtest-dev
+  * Don't FTBFS with google-mock installed (LP: #1640320)
+  * Don't ship google test files in binary packages
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 23 Mar 2017 12:04:47 +0000
+
 location-service (3.0.0+16.10.20160912-0ubuntu2) zesty; urgency=high
 
   * No change rebuild against boost1.62.
diff -Nru location-service-3.0.0+16.10.20160912/debian/control location-service-3.0.0+16.10.20160912/debian/control
--- location-service-3.0.0+16.10.20160912/debian/control	2016-09-12 22:54:10.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/debian/control	2017-03-23 13:04:47.000000000 +0100
@@ -14,7 +14,7 @@
                debhelper (>= 9),
                doxygen,
                geoclue-ubuntu-geoip,
-               google-mock (>= 1.6.0+svn437),
+               googletest,
                graphviz,
                libapparmor-dev,
                libboost-filesystem-dev,
@@ -23,7 +23,6 @@
                libdbus-1-dev,
                libdbus-cpp-dev,
                libgoogle-glog-dev,
-               libgtest-dev,
                libiw-dev,
                libjson-c-dev,
                libnet-cpp-dev,
diff -Nru location-service-3.0.0+16.10.20160912/debian/control.in location-service-3.0.0+16.10.20160912/debian/control.in
--- location-service-3.0.0+16.10.20160912/debian/control.in	2016-09-12 22:54:09.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/debian/control.in	2017-03-23 13:04:47.000000000 +0100
@@ -9,7 +9,7 @@
                debhelper (>= 9),
                doxygen,
                geoclue-ubuntu-geoip,
-               google-mock (>= 1.6.0+svn437),
+               googletest,
                graphviz,
                libapparmor-dev,
                libboost-filesystem-dev,
@@ -18,7 +18,6 @@
                libdbus-1-dev,
                libdbus-cpp-dev,
                libgoogle-glog-dev,
-               libgtest-dev,
                libiw-dev,
                libjson-c-dev,
                libnet-cpp-dev,
diff -Nru location-service-3.0.0+16.10.20160912/debian/rules location-service-3.0.0+16.10.20160912/debian/rules
--- location-service-3.0.0+16.10.20160912/debian/rules	2016-09-12 22:54:09.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/debian/rules	2017-03-23 13:04:47.000000000 +0100
@@ -36,7 +36,9 @@
 %:
 	dh $@ --parallel --fail-missing
 
+# remove google test files before installing files to packages
 override_dh_install:
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/lib* $(CURDIR)/debian/tmp/usr/include/g*
 	dh_install -Xubuntu-location-service.1 --fail-missing
 
 override_dh_strip:
diff -Nru location-service-3.0.0+16.10.20160912/include/location_service/com/ubuntu/location/update.h location-service-3.0.0+16.10.20160912/include/location_service/com/ubuntu/location/update.h
--- location-service-3.0.0+16.10.20160912/include/location_service/com/ubuntu/location/update.h	2016-09-12 22:53:36.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/include/location_service/com/ubuntu/location/update.h	2017-03-23 13:04:38.000000000 +0100
@@ -21,6 +21,7 @@
 #include <com/ubuntu/location/clock.h>
 
 #include <ostream>
+#include <vector>
 
 namespace com
 {
diff -Nru location-service-3.0.0+16.10.20160912/src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h location-service-3.0.0+16.10.20160912/src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h
--- location-service-3.0.0+16.10.20160912/src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2016-09-12 22:53:36.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2017-03-23 13:04:38.000000000 +0100
@@ -22,6 +22,7 @@
 #include <com/ubuntu/location/providers/gps/sntp_client.h>
 
 #include <ubuntu/hardware/gps.h>
+#include <vector>
 
 namespace com { namespace ubuntu { namespace location { namespace providers { namespace gps
 {
diff -Nru location-service-3.0.0+16.10.20160912/tests/CMakeLists.txt location-service-3.0.0+16.10.20160912/tests/CMakeLists.txt
--- location-service-3.0.0+16.10.20160912/tests/CMakeLists.txt	2016-09-12 22:53:36.000000000 +0200
+++ location-service-3.0.0+16.10.20160912/tests/CMakeLists.txt	2017-03-23 12:22:30.000000000 +0100
@@ -21,8 +21,19 @@
     PROPERTIES COMPILE_FLAGS "-std=c99")
 
 # Build with system gmock and embedded gtest
+
+# Include dir may be just /usr/include which is searched by default but
+# adding this one for compatibility with older versions
 set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+
+# Use new path of googlemock when it exists
+IF(EXISTS /usr/src/googletest/googlemock)
+  set (GMOCK_SOURCE_DIR "/usr/src/googletest/googlemock" CACHE PATH "gmock source directory")
+ELSE()
+  set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+ENDIF()
+
+# this may be just /usr/include as well
 set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
 
 add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")