Added utility functions.

Cosmetic changes on include guards.