In order to make the file and line number reporting work
correctly, this has been moved back into the header file.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>