Add some cpp::int typedefs.  Indent the conditionals