Merge "fix(xilinx): add headers to resolve compile time issue" into integration