Proper width variables and proper macro defines.
Chasing down compile errors, tweaked some typedefs to conform to errors.
Revert "Nixed unused file"

This reverts commit 425a62c1bde52290a91bb999ecfe8e14c7137a52.
Compiles, unresolved symbols though.