diff --git a/Tracking/TrkEvent/TrkMeasurementBase/CMakeLists.txt b/Tracking/TrkEvent/TrkMeasurementBase/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7dd8b41dd799bbc9b13e6e938f913b186e65c2ab
--- /dev/null
+++ b/Tracking/TrkEvent/TrkMeasurementBase/CMakeLists.txt
@@ -0,0 +1,32 @@
+################################################################################
+# Package: TrkMeasurementBase
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrkMeasurementBase )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          DetectorDescription/GeoPrimitives
+                          Event/EventPrimitives
+                          GaudiKernel
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          PRIVATE
+                          Control/AthContainers )
+
+# External dependencies:
+find_package( Eigen )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( TrkMeasurementBase
+                   PUBLIC_HEADERS TrkMeasurementBase
+                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives )
+
+atlas_add_dictionary( TrkMeasurementBaseDict
+                      TrkMeasurementBase/TrkMeasurementBaseDict.h
+                      TrkMeasurementBase/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives AthContainers TrkMeasurementBase )
+
diff --git a/Tracking/TrkEvent/TrkMeasurementBase/TrkMeasurementBase/TrkMeasurementBaseDict.h b/Tracking/TrkEvent/TrkMeasurementBase/TrkMeasurementBase/TrkMeasurementBaseDict.h
index 35af6d0349539332d0e206668eef221d46414aff..6d85a93196294348c49d26cba2bc9ed5a2d78e2b 100755
--- a/Tracking/TrkEvent/TrkMeasurementBase/TrkMeasurementBase/TrkMeasurementBaseDict.h
+++ b/Tracking/TrkEvent/TrkMeasurementBase/TrkMeasurementBase/TrkMeasurementBaseDict.h
@@ -6,7 +6,7 @@
 #define TRKMEASUREMENTBASEDICT_H
 
 #include "TrkMeasurementBase/MeasurementBase.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // We need to instantiate some templates here to be able to create the
 // dictionary for them
diff --git a/Tracking/TrkEvent/TrkMeasurementBase/cmt/requirements b/Tracking/TrkEvent/TrkMeasurementBase/cmt/requirements
index dd6f6e034ba715fdc303dd0e3d6f61d84ffd511c..6e2374257c7e408671fd5d97a0a7b888e9fe56eb 100755
--- a/Tracking/TrkEvent/TrkMeasurementBase/cmt/requirements
+++ b/Tracking/TrkEvent/TrkMeasurementBase/cmt/requirements
@@ -7,10 +7,11 @@ use GaudiInterface      GaudiInterface-*     External
 use EventPrimitives     EventPrimitives-*    Event
 use GeoPrimitives       GeoPrimitives-*      DetectorDescription
 use TrkEventPrimitives  TrkEventPrimitives-* Tracking/TrkEvent
-use DataModel           DataModel-*          Control
 
 private
-use AtlasReflex   AtlasReflex-*   External -no_auto_imports
+use AthContainers       AthContainers-*      Control
+
+use AtlasReflex         AtlasReflex-*        External -no_auto_imports
 
 # Pattern to build the dict lib. User should create a single header
 # file: <package>Dict.h which includes all other .h files. See MissingETDict
@@ -18,5 +19,7 @@ use AtlasReflex   AtlasReflex-*   External -no_auto_imports
 # classes to be added to the dictionary, and which fields are
 # transient. It should be put in ../<package> dir and is conventionally called
 # selection.xml.
-# apply_pattern lcgdict dict=TrkMeasurementBase selectionfile=selection.xml headerfiles="../TrkMeasurementBase/TrkMeasurementBaseDict.h"
+apply_pattern lcgdict dict=TrkMeasurementBase selectionfile=selection.xml headerfiles="../TrkMeasurementBase/TrkMeasurementBaseDict.h"
 
+# To make the package behave correctly with CMake:
+apply_pattern cmake_add_command command=metalibrary