And remove declarations which are already in the headers.
Signed-off-by: NJiri Slaby <jslaby@suse.cz>
Signed-off-by: NTony Luck <tony.luck@intel.com>