Add missing include statements

[vil02]

This is makes the code less dependent on transitive includes.

Continuation of #560.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.03%. Comparing base (6cebb63) to head (2c884c9).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #561      +/-   ##
==========================================
- Coverage   97.07%   97.03%   -0.05%     
==========================================
  Files          98       98              
  Lines       11291    11291              
  Branches      796      796              
==========================================
- Hits        10961    10956       -5     
- Misses        330      335       +5     

Flag	Coverage Δ
unittests	97.03% <ø> (-0.05%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.