--- a/toolkit/components/telemetry/geckoview/gtest/TestGeckoView.cpp
+++ b/toolkit/components/telemetry/geckoview/gtest/TestGeckoView.cpp
@@ -1,20 +1,24 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 #include "gtest/gtest.h"
 #include "mozilla/JSONWriter.h"
 #include "nsDirectoryServiceDefs.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
 #include "nsIOutputStream.h"
 #include "nsITelemetry.h"
 #include "nsJSUtils.h"
 #include "nsNetUtil.h"
+#include "nsThreadUtils.h"
+#include "nsPrintfCString.h"
 #include "prenv.h"
 #include "Telemetry.h"
 #include "TelemetryFixture.h"
 #include "TelemetryGeckoViewPersistence.h"
 #include "TelemetryScalar.h"
 #include "TelemetryTestHelpers.h"
 
 using namespace mozilla;

--- a/toolkit/components/telemetry/geckoview/gtest/moz.build
+++ b/toolkit/components/telemetry/geckoview/gtest/moz.build
@@ -5,25 +5,23 @@
 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
 
 Library('telemetrygeckoviewtest')
 
 LOCAL_INCLUDES += [
     '../',
     '../..',
     '../../..',
-    '/toolkit/components/jsoncpp/include',
     '/toolkit/components/telemetry/tests/gtest',
     '/xpcom/io',
 ]
 
 DEFINES['MOZ_TELEMETRY_GECKOVIEW'] = True
 
 UNIFIED_SOURCES = [
-    '../TelemetryGeckoViewPersistence.cpp',
     'TestGeckoView.cpp',
 ]
 
 # We need the following line otherwise including
 # "TelemetryHistogram.h" in tests will fail due to
 # missing headers.
 include('/ipc/chromium/chromium-config.mozbuild')
 

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -58,16 +58,17 @@ EXPORTS.mozilla += [
     'ipc/TelemetryComms.h',
     'ipc/TelemetryIPC.h',
     'ProcessedStack.h',
     'Telemetry.h',
 ]
 
 SOURCES += [
     'CombinedStacks.cpp',
+    'geckoview/TelemetryGeckoViewPersistence.cpp',
     'HangReports.cpp',
     'ipc/TelemetryIPC.cpp',
     'ipc/TelemetryIPCAccumulator.cpp',
     'ProcessedStack.cpp',
     'Telemetry.cpp',
     'TelemetryCommon.cpp',
     'TelemetryEvent.cpp',
     'TelemetryHistogram.cpp',
@@ -204,18 +205,14 @@ processes_data.inputs = processes_files
 # include the GeckoView files on all Android builds.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     # Introduce this define to conditionally enable Telemetry GV code in the various
     # C++ modules. We need this trick in order to run gtest coverage on Treeherder
     # on platforms other than Android, since gtests on Android are not supported
     # yet (see bug 1318091).
     DEFINES['MOZ_TELEMETRY_GECKOVIEW'] = True
 
-    SOURCES += [
-        'geckoview/TelemetryGeckoViewPersistence.cpp'
-    ]
-
     EXTRA_JS_MODULES += [
         'geckoview/GeckoViewTelemetryController.jsm',
     ]
 
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'Telemetry')