* Hack; flatten includes so works as static lib with public headers.
* TODO(rahul) -- need to understand this better; must be a cleaner way.