Fix build, prepare to split things into Normal and Codense.

Signed-off-by: Ricky Elrod <ricky@elrod.me>