Move the contents of some headers which contained very
little into more sensible places, and remove the original
header files. This should make it easier to find things.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>