Added appropriate header guards and changed some return types to void