Merge pull request #219 from murrekatt/develop

Fixed header guards for server library.