diff --git a/Event/xAOD/xAODTrackingCnv/CMakeLists.txt b/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
index d48e57d6c758d15465cab18ea560221a7686d01b..a093942c0072680dd1aef773374a72d0ae5fb947 100644
--- a/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
@@ -3,17 +3,34 @@
 # Declare the package name:
 atlas_subdir( xAODTrackingCnv )
 
-# Component(s) in the package:
-atlas_add_library( xAODTrackingCnvLib
-   xAODTrackingCnv/*.h
-   INTERFACE
-   PUBLIC_HEADERS xAODTrackingCnv
-   LINK_LIBRARIES xAODTracking TrkTrack GaudiKernel )
-
-atlas_add_component( xAODTrackingCnv
-   src/*.h src/*.cxx src/components/*.cxx
-   LINK_LIBRARIES xAODTracking TrkTrack AthenaBaseComps AthenaKernel
-   EventPrimitives GaudiKernel GeneratorObjects MCTruthClassifierLib Particle
-   ParticleTruth TrkLinks TrkParticleBase TrkTruthData VxVertex 
-   TrkToolInterfaces xAODCore xAODTrackingCnvLib
-   PRIVATE_LINK_LIBRARIES CxxUtils )
+# Component(s) in the package. Built in a much more lightweight fashion for
+# AthAnalysis.
+if( XAOD_ANALYSIS )
+
+   atlas_add_library( xAODTrackingCnvLib
+      xAODTrackingCnv/ITrackParticleCompressorTool.h
+      INTERFACE
+      PUBLIC_HEADERS xAODTrackingCnv
+      LINK_LIBRARIES xAODTracking GaudiKernel )
+
+   atlas_add_component( xAODTrackingCnv
+      src/TrackParticleCompressorTool.* src/components/*.cxx
+      LINK_LIBRARIES AthenaBaseComps CxxUtils xAODTrackingCnvLib )
+
+else()
+
+   atlas_add_library( xAODTrackingCnvLib
+      xAODTrackingCnv/*.h
+      INTERFACE
+      PUBLIC_HEADERS xAODTrackingCnv
+      LINK_LIBRARIES xAODTracking TrkTrack GaudiKernel )
+
+   atlas_add_component( xAODTrackingCnv
+      src/*.h src/*.cxx src/components/*.cxx
+      LINK_LIBRARIES xAODTracking TrkTrack AthenaBaseComps AthenaKernel
+      EventPrimitives GaudiKernel GeneratorObjects MCTruthClassifierLib Particle
+      ParticleTruth TrkLinks TrkParticleBase TrkTruthData VxVertex
+      TrkToolInterfaces xAODCore xAODTrackingCnvLib
+      PRIVATE_LINK_LIBRARIES CxxUtils )
+
+endif()
diff --git a/Event/xAOD/xAODTrackingCnv/src/components/xAODTrackingCnv_entries.cxx b/Event/xAOD/xAODTrackingCnv/src/components/xAODTrackingCnv_entries.cxx
index 2e08c663b6c39cfee89cb0ddc5600f19508fd287..9c54f444966682fb2b9125bc0635a36958a2c5cc 100644
--- a/Event/xAOD/xAODTrackingCnv/src/components/xAODTrackingCnv_entries.cxx
+++ b/Event/xAOD/xAODTrackingCnv/src/components/xAODTrackingCnv_entries.cxx
@@ -1,12 +1,19 @@
-#include "../TrackCollectionCnvTool.h"
-#include "../RecTrackParticleContainerCnvTool.h"
-#include "../TrackParticleCnvAlg.h"
-#include "../VertexCnvAlg.h"
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+
+#ifndef XAOD_ANALYSIS
+#   include "../TrackCollectionCnvTool.h"
+#   include "../RecTrackParticleContainerCnvTool.h"
+#   include "../TrackParticleCnvAlg.h"
+#   include "../VertexCnvAlg.h"
+#endif // NOT XAOD_ANALYSIS
 #include "../TrackParticleCompressorTool.h"
 
-DECLARE_COMPONENT( xAODMaker::RecTrackParticleContainerCnvTool )
-DECLARE_COMPONENT( xAODMaker::TrackCollectionCnvTool )
+#ifndef XAOD_ANALYSIS
+   DECLARE_COMPONENT( xAODMaker::RecTrackParticleContainerCnvTool )
+   DECLARE_COMPONENT( xAODMaker::TrackCollectionCnvTool )
+   DECLARE_COMPONENT( xAODMaker::TrackParticleCnvAlg )
+   DECLARE_COMPONENT( xAODMaker::VertexCnvAlg )
+#endif // NOT XAOD_ANALYSIS
 DECLARE_COMPONENT( xAODMaker::TrackParticleCompressorTool )
-DECLARE_COMPONENT( xAODMaker::TrackParticleCnvAlg )
-DECLARE_COMPONENT( xAODMaker::VertexCnvAlg )
-