Added included guards and removed excess spaces