Get declarations from the proper header file

Test: builds OK
Change-Id: I759e49570cd00b3e5101f38164fcac5ac53faa6c
2 files changed