Add boxes around FbApi types

Testing Done:
Compile only.

Reviewed at https://reviews.imfreedom.org/r/1340/