Fix the includes accordingly and get rid of some unused ones.
Now that HMAC isn't special anymore, and with the help of init params, this isn't needed anymore as we only allocate memory for the state. This effectively reverts e9bcc64e62 .
e9bcc64e62