After the previous patch, we can use the proper
declaration in a common header file.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>