Merge "target: Fix compilation error due to missing header file inclusion"