diff --git a/campcaster/src/modules/core/include/LiveSupport/Core/Playlist.h b/campcaster/src/modules/core/include/LiveSupport/Core/Playlist.h
index e11e11d4b..7883589ac 100644
--- a/campcaster/src/modules/core/include/LiveSupport/Core/Playlist.h
+++ b/campcaster/src/modules/core/include/LiveSupport/Core/Playlist.h
@@ -516,7 +516,7 @@ class Playlist : public Configurable,
          *
          *  @return the URI.
          */
-        virtual Ptr<const string>::Ref
+        virtual Ptr<const std::string>::Ref
         getUri(void) const                      throw ()
         {
             return uri;
diff --git a/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h b/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
index aecacfac6..04f6f0bb2 100644
--- a/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
+++ b/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
@@ -480,5 +480,5 @@ class PlaylistElement : public Configurable
 } // namespace Core
 } // namespace LiveSupport
 
-#endif // PlaylistElement_h
+#endif // LiveSupport_Core_PlaylistElement_h