Revert "hlte-common: fix includes"

This reverts commit a24b56e2efeb10ae4eea03d0854d81ad6f112c16.