diff --git a/src/app/util/basic-types.h b/src/app/util/basic-types.h index 2988019403bdfd..97aebe690423c0 100644 --- a/src/app/util/basic-types.h +++ b/src/app/util/basic-types.h @@ -25,11 +25,7 @@ #include <cstdint> -#include <lib/core/GroupId.h> -#include <lib/core/NodeId.h> - -// Pull in other core types -#include <lib/core/CHIPVendorIdentifiers.hpp> +// Pull in core types #include <lib/core/DataModelTypes.h> namespace chip { diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h index d7d76c9c0ada04..ef81e350c58559 100644 --- a/src/lib/core/DataModelTypes.h +++ b/src/lib/core/DataModelTypes.h @@ -19,6 +19,11 @@ #include <cstdint> +#include <lib/core/CHIPVendorIdentifiers.hpp> // For VendorId +#include <lib/core/GroupId.h> +#include <lib/core/NodeId.h> +#include <lib/core/PasscodeId.h> + namespace chip { typedef uint8_t ActionId;