Removing duplicate typedefs from headers.
Conditionally using systemtap definitions.
Conditionally set HAVE_SYSTEMTAP.