Revert "Revert: hlte-common: fix includes"

This reverts commit 765219dbf16ec03f26760b0ad0fd086ef2c64081.