diff --git a/Alignment/Geners/interface/AbsArchive.hh b/Alignment/Geners/interface/AbsArchive.hh
index a228fb15bd8de..99f47be224f14 100644
--- a/Alignment/Geners/interface/AbsArchive.hh
+++ b/Alignment/Geners/interface/AbsArchive.hh
@@ -5,10 +5,11 @@
 
 #include "Alignment/Geners/interface/AbsRecord.hh"
 #include "Alignment/Geners/interface/AbsReference.hh"
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/CatalogEntry.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
+#include <memory>
+
 namespace gs {
   class AbsArchive;
 }
@@ -66,8 +67,8 @@ namespace gs {
 
     // Fetch metadata for the item with given id. NULL pointer is
     // returned if there is no item in the archive with the given id
-    // (and there is an automatic cast from CPP11_shared_ptr to bool).
-    virtual CPP11_shared_ptr<const CatalogEntry> catalogEntry(unsigned long long id) = 0;
+    // (and there is an automatic cast from std::hared_ptr to bool).
+    virtual std::shared_ptr<const CatalogEntry> catalogEntry(unsigned long long id) = 0;
 
     // Dump everything to storage (if the archive is open for writing
     // and if this makes sense for the archive)
diff --git a/Alignment/Geners/interface/AbsCatalog.hh b/Alignment/Geners/interface/AbsCatalog.hh
index 22f343e13fedb..0bc0ee3bd1c50 100644
--- a/Alignment/Geners/interface/AbsCatalog.hh
+++ b/Alignment/Geners/interface/AbsCatalog.hh
@@ -1,14 +1,14 @@
 #ifndef GENERS_ABSCATALOG_HH_
 #define GENERS_ABSCATALOG_HH_
 
-#include <cassert>
-#include <vector>
-
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/CatalogEntry.hh"
 #include "Alignment/Geners/interface/ItemDescriptor.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
+#include <cassert>
+#include <memory>
+#include <vector>
+
 namespace gs {
   //
   // This abstract class defines interfaces for adding entries to
@@ -52,7 +52,7 @@ namespace gs {
 
     // The following function returns a shared pointer to the entry.
     // The pointer will contain NULL in case the item is not found.
-    virtual CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const = 0;
+    virtual std::shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const = 0;
 
     // The following function fetches just the stream position
     // associated with the entry. "true" is returned on success.
diff --git a/Alignment/Geners/interface/AbsReference.hh b/Alignment/Geners/interface/AbsReference.hh
index 3fe1ae59696cf..69639f899225c 100644
--- a/Alignment/Geners/interface/AbsReference.hh
+++ b/Alignment/Geners/interface/AbsReference.hh
@@ -1,13 +1,13 @@
 #ifndef GENERS_ABSREFERENCE_HH_
 #define GENERS_ABSREFERENCE_HH_
 
-#include <iostream>
-#include <vector>
-
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
+#include <iostream>
+#include <memory>
+#include <vector>
+
 namespace gs {
   class AbsArchive;
   class CatalogEntry;
@@ -44,7 +44,7 @@ namespace gs {
 
     // Catalog entry retrieval by index in the list of referenced items.
     // Throws gs::IOOutOfRange exception if the index is out of range.
-    CPP11_shared_ptr<const CatalogEntry> indexedCatalogEntry(unsigned long index) const;
+    std::shared_ptr<const CatalogEntry> indexedCatalogEntry(unsigned long index) const;
 
   protected:
     // Use the following constructor to retrieve an item with
diff --git a/Alignment/Geners/interface/ArchiveRecord.hh b/Alignment/Geners/interface/ArchiveRecord.hh
index 9463e3af95830..b91e884290860 100644
--- a/Alignment/Geners/interface/ArchiveRecord.hh
+++ b/Alignment/Geners/interface/ArchiveRecord.hh
@@ -3,15 +3,15 @@
 #ifndef GENERS_ARCHIVERECORD_HH_
 #define GENERS_ARCHIVERECORD_HH_
 
-#include <vector>
-
 #include "Alignment/Geners/interface/AbsRecord.hh"
 #include "Alignment/Geners/interface/ArrayAdaptor.hh"
 #include "Alignment/Geners/interface/IOIsAnyPtr.hh"
 
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/GenericIO.hh"
 
+#include <memory>
+#include <vector>
+
 namespace gs {
     template <typename T>
     class ArchiveRecord : public AbsRecord
@@ -78,7 +78,7 @@ namespace gs {
         inline virtual bool writeData(std::ostream& os) const
             {return write_item(os, *obj_, true);}
 
-        CPP11_shared_ptr<T> obj_;
+        std::shared_ptr<T> obj_;
     };
 
 
@@ -97,9 +97,8 @@ namespace gs {
         inline virtual bool writeData(std::ostream& os) const
             {return write_array(os, obj_->begin(), obj_->size());}
 
-        CPP11_shared_ptr<std::vector<T> > obj_;
+        std::shared_ptr<std::vector<T> > obj_;
     };
 }
 
 #endif // GENERS_ARCHIVERECORD_HH_
-
diff --git a/Alignment/Geners/interface/BinaryArchiveBase.hh b/Alignment/Geners/interface/BinaryArchiveBase.hh
index b4169af649980..df3a6165a34e3 100644
--- a/Alignment/Geners/interface/BinaryArchiveBase.hh
+++ b/Alignment/Geners/interface/BinaryArchiveBase.hh
@@ -90,9 +90,9 @@ namespace gs {
                     const SearchSpecifier &categoryPattern,
                     std::vector<unsigned long long> *idsFound) const override;
 
-    inline CPP11_shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
+    inline std::shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
       return catalog_ ? catalog_->retrieveEntry(id)
-                      : CPP11_shared_ptr<const CatalogEntry>((const CatalogEntry *)nullptr);
+                      : std::shared_ptr<const CatalogEntry>((const CatalogEntry *)nullptr);
     }
 
     // Inspection methods for compression options
diff --git a/Alignment/Geners/interface/ClassId.hh b/Alignment/Geners/interface/ClassId.hh
index 9ceb182923606..39cffca06b10f 100644
--- a/Alignment/Geners/interface/ClassId.hh
+++ b/Alignment/Geners/interface/ClassId.hh
@@ -591,22 +591,22 @@ namespace gs {
 
   // Skip shared pointers in class ids
   template <class T>
-  struct ClassIdSpecialization<CPP11_shared_ptr<T>> {
+  struct ClassIdSpecialization<std::shared_ptr<T>> {
     inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
   };
 
   template <class T>
-  struct ClassIdSpecialization<const CPP11_shared_ptr<T>> {
+  struct ClassIdSpecialization<const std::shared_ptr<T>> {
     inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
   };
 
   template <class T>
-  struct ClassIdSpecialization<volatile CPP11_shared_ptr<T>> {
+  struct ClassIdSpecialization<volatile std::shared_ptr<T>> {
     inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
   };
 
   template <class T>
-  struct ClassIdSpecialization<const volatile CPP11_shared_ptr<T>> {
+  struct ClassIdSpecialization<const volatile std::shared_ptr<T>> {
     inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
   };
 
diff --git a/Alignment/Geners/interface/ContiguousCatalog.hh b/Alignment/Geners/interface/ContiguousCatalog.hh
index 778140b1a0f25..16ccb5f68b791 100644
--- a/Alignment/Geners/interface/ContiguousCatalog.hh
+++ b/Alignment/Geners/interface/ContiguousCatalog.hh
@@ -1,12 +1,12 @@
 #ifndef GENERS_CONTIGUOUSCATALOG_HH_
 #define GENERS_CONTIGUOUSCATALOG_HH_
 
+#include "Alignment/Geners/interface/AbsCatalog.hh"
+
 #include <map>
+#include <memory>
 #include <vector>
 
-#include "Alignment/Geners/interface/AbsCatalog.hh"
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
-
 namespace gs {
   class ContiguousCatalog : public AbsCatalog {
   public:
@@ -19,7 +19,7 @@ namespace gs {
     inline unsigned long long largestId() const override { return firstId_ + records_.size() - 1; }
     inline bool isContiguous() const override { return true; }
 
-    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const override;
+    std::shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const override;
 
     bool retrieveStreampos(unsigned long long id,
                            unsigned *compressionCode,
@@ -53,7 +53,7 @@ namespace gs {
     bool isEqual(const AbsCatalog &) const override;
 
   private:
-    typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
+    typedef std::shared_ptr<const CatalogEntry> SPtr;
 
     // In the following multimap, item name is the key and
     // item id is the value
diff --git a/Alignment/Geners/interface/GeneralCatalog.hh b/Alignment/Geners/interface/GeneralCatalog.hh
index 4fa065ec9cf84..e22e0f242acf4 100644
--- a/Alignment/Geners/interface/GeneralCatalog.hh
+++ b/Alignment/Geners/interface/GeneralCatalog.hh
@@ -18,7 +18,7 @@ namespace gs {
     inline bool isContiguous() const override { return false; }
     inline bool itemExists(const unsigned long long id) const override { return records_.find(id) != records_.end(); }
 
-    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(const unsigned long long id) const override;
+    std::shared_ptr<const CatalogEntry> retrieveEntry(const unsigned long long id) const override;
 
     bool retrieveStreampos(unsigned long long id,
                            unsigned *compressionCode,
@@ -38,7 +38,7 @@ namespace gs {
     // Add a new entry with id (presumably, from another catalog).
     // Returns "true" on success. The entry is not included (and "false"
     // is returned) in case the entry with the given id already exists.
-    bool addEntry(CPP11_shared_ptr<const CatalogEntry> ptr);
+    bool addEntry(std::shared_ptr<const CatalogEntry> ptr);
 
     // Remove an entry with the given id. "false" is returned in case
     // an entry with the specified id does not exist.
@@ -61,7 +61,7 @@ namespace gs {
     bool isEqual(const AbsCatalog &) const override;
 
   private:
-    typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
+    typedef std::shared_ptr<const CatalogEntry> SPtr;
 
     // In the following multimap, item name is the key and
     // catalog entry pointer is the value
diff --git a/Alignment/Geners/interface/GenericIO.hh b/Alignment/Geners/interface/GenericIO.hh
index 95e0848f0d1e3..a8d7558f03469 100644
--- a/Alignment/Geners/interface/GenericIO.hh
+++ b/Alignment/Geners/interface/GenericIO.hh
@@ -408,7 +408,7 @@ namespace gs {
           ptr, str, s, processClassId);
       if (status) {
         assert(ptr);
-        a = CPP11_shared_ptr<Pointee>(ptr);
+        a = std::shared_ptr<Pointee>(ptr);
         return true;
       } else {
         delete ptr;
@@ -553,7 +553,7 @@ namespace gs {
           GenericReader<Stream, State, Pointee *, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(ptr, is, st, true);
       if (status) {
         assert(ptr);
-        CPP11_shared_ptr<Pointee> sptr(ptr);
+        std::shared_ptr<Pointee> sptr(ptr);
         InsertContainerItem<Container>::insert(obj, sptr, itemN);
       } else
         delete ptr;
diff --git a/Alignment/Geners/interface/IOIsSharedPtr.hh b/Alignment/Geners/interface/IOIsSharedPtr.hh
index 93d419f940aa4..2102b3618bdcb 100644
--- a/Alignment/Geners/interface/IOIsSharedPtr.hh
+++ b/Alignment/Geners/interface/IOIsSharedPtr.hh
@@ -1,7 +1,7 @@
 #ifndef GENERS_IOISSHAREDPTR_HH_
 #define GENERS_IOISSHAREDPTR_HH_
 
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
+#include <memory>
 
 namespace gs {
   template <class T>
@@ -10,22 +10,22 @@ namespace gs {
   };
 
   template <class T>
-  struct IOIsSharedPtr<CPP11_shared_ptr<T>> {
+  struct IOIsSharedPtr<std::shared_ptr<T>> {
     enum { value = 1 };
   };
 
   template <class T>
-  struct IOIsSharedPtr<const CPP11_shared_ptr<T>> {
+  struct IOIsSharedPtr<const std::shared_ptr<T>> {
     enum { value = 1 };
   };
 
   template <class T>
-  struct IOIsSharedPtr<volatile CPP11_shared_ptr<T>> {
+  struct IOIsSharedPtr<volatile std::shared_ptr<T>> {
     enum { value = 1 };
   };
 
   template <class T>
-  struct IOIsSharedPtr<const volatile CPP11_shared_ptr<T>> {
+  struct IOIsSharedPtr<const volatile std::shared_ptr<T>> {
     enum { value = 1 };
   };
 }  // namespace gs
diff --git a/Alignment/Geners/interface/Reference.hh b/Alignment/Geners/interface/Reference.hh
index a1e1d17180671..03cfc0bf49117 100644
--- a/Alignment/Geners/interface/Reference.hh
+++ b/Alignment/Geners/interface/Reference.hh
@@ -3,7 +3,8 @@
 
 #include "Alignment/Geners/interface/AbsReference.hh"
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
+
+#include <memory>
 
 namespace gs {
   template <typename T>
@@ -32,7 +33,7 @@ namespace gs {
     // Methods to retrieve the item
     void restore(unsigned long index, T *obj) const;
     CPP11_auto_ptr<T> get(unsigned long index) const;
-    CPP11_shared_ptr<T> getShared(unsigned long index) const;
+    std::shared_ptr<T> getShared(unsigned long index) const;
 
   private:
     Reference() = delete;
@@ -76,8 +77,8 @@ namespace gs {
   }
 
   template <typename T>
-  inline CPP11_shared_ptr<T> Reference<T>::getShared(const unsigned long index) const {
-    return CPP11_shared_ptr<T>(getPtr(index));
+  inline std::shared_ptr<T> Reference<T>::getShared(const unsigned long index) const {
+    return std::shared_ptr<T>(getPtr(index));
   }
 }  // namespace gs
 
diff --git a/Alignment/Geners/interface/StringArchive.hh b/Alignment/Geners/interface/StringArchive.hh
index 97510e9c4240c..94e376dce89ad 100644
--- a/Alignment/Geners/interface/StringArchive.hh
+++ b/Alignment/Geners/interface/StringArchive.hh
@@ -26,7 +26,7 @@ namespace gs {
       catalog_.search(namePattern, categoryPattern, idsFound);
     }
 
-    inline CPP11_shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
+    inline std::shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
       return catalog_.retrieveEntry(id);
     }
 
diff --git a/Alignment/Geners/interface/WriteOnlyCatalog.hh b/Alignment/Geners/interface/WriteOnlyCatalog.hh
index 4a6e7dba871bc..2434e2f6b60dc 100644
--- a/Alignment/Geners/interface/WriteOnlyCatalog.hh
+++ b/Alignment/Geners/interface/WriteOnlyCatalog.hh
@@ -20,7 +20,7 @@ namespace gs {
 
     // The following methods will cause a run-time error: there is
     // no way to read a write-only catalog or to search it
-    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long) const override;
+    std::shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long) const override;
 
     bool retrieveStreampos(unsigned long long id,
                            unsigned *compressionCode,
diff --git a/Alignment/Geners/interface/binaryIO.hh b/Alignment/Geners/interface/binaryIO.hh
index e1562cd8bd8e4..e5df7129e5fb6 100644
--- a/Alignment/Geners/interface/binaryIO.hh
+++ b/Alignment/Geners/interface/binaryIO.hh
@@ -15,15 +15,15 @@
 #ifndef GENERS_BINARYIO_HH_
 #define GENERS_BINARYIO_HH_
 
-#include <cassert>
-#include <iostream>
-#include <vector>
-
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 
+#include <cassert>
+#include <iostream>
+#include <memory>
+#include <vector>
+
 namespace gs {
   // The following functions perform binary I/O of built-in types.
   // Note that all of them are "void". It is assumed that the
@@ -192,13 +192,13 @@ namespace gs {
   // The following assumes that the array contains a bunch of
   // shared pointers and that class T has the "read" function
   template <typename T>
-  inline void read_heap_obj_array(std::istream &in, CPP11_shared_ptr<T> *arr, const unsigned long len) {
+  inline void read_heap_obj_array(std::istream &in, std::shared_ptr<T> *arr, const unsigned long len) {
     if (len) {
       assert(arr);
       const ClassId id(in, 1);
       for (unsigned long i = 0; i < len; ++i) {
         T *obj = T::read(id, in);
-        arr[i] = CPP11_shared_ptr<T>(obj);
+        arr[i] = std::shared_ptr<T>(obj);
       }
     }
   }
@@ -207,7 +207,7 @@ namespace gs {
   template <typename Reader>
   inline void read_base_obj_array(std::istream &in,
                                   const Reader &f,
-                                  CPP11_shared_ptr<typename Reader::value_type> *arr,
+                                  std::shared_ptr<typename Reader::value_type> *arr,
                                   const unsigned long len) {
     typedef typename Reader::value_type T;
     if (len) {
@@ -215,7 +215,7 @@ namespace gs {
       const ClassId id(in, 1);
       for (unsigned long i = 0; i < len; ++i) {
         T *obj = f.read(id, in);
-        arr[i] = CPP11_shared_ptr<T>(obj);
+        arr[i] = std::shared_ptr<T>(obj);
       }
     }
   }
@@ -249,7 +249,7 @@ namespace gs {
   // The following assumes that the vector contains a bunch of
   // shared pointers
   template <typename T>
-  inline void read_heap_obj_vector(std::istream &in, std::vector<CPP11_shared_ptr<T>> *pv) {
+  inline void read_heap_obj_vector(std::istream &in, std::vector<std::shared_ptr<T>> *pv) {
     unsigned long vlen = 0UL;
     read_pod(in, &vlen);
     if (in.fail())
@@ -289,7 +289,7 @@ namespace gs {
   template <typename Reader>
   inline void read_base_obj_vector(std::istream &in,
                                    const Reader &f,
-                                   std::vector<CPP11_shared_ptr<typename Reader::value_type>> *pv) {
+                                   std::vector<std::shared_ptr<typename Reader::value_type>> *pv) {
     unsigned long vlen = 0UL;
     read_pod(in, &vlen);
     if (in.fail())
diff --git a/Alignment/Geners/src/AbsArchive.cc b/Alignment/Geners/src/AbsArchive.cc
index de3321296db95..6ccc41402bf00 100644
--- a/Alignment/Geners/src/AbsArchive.cc
+++ b/Alignment/Geners/src/AbsArchive.cc
@@ -65,7 +65,7 @@ namespace gs {
       throw gs::IOInvalidArgument(
           "In gs::AbsArchive::copyItem: "
           "destination archive is not writable");
-    CPP11_shared_ptr<const CatalogEntry> entry(catalogEntry(id));
+    std::shared_ptr<const CatalogEntry> entry(catalogEntry(id));
     if (!entry)
       throw gs::IOInvalidArgument(
           "In gs::AbsArchive::copyItem: no item "
diff --git a/Alignment/Geners/src/AbsReference.cc b/Alignment/Geners/src/AbsReference.cc
index b01ee5f776a66..83fc0a1f56f4b 100644
--- a/Alignment/Geners/src/AbsReference.cc
+++ b/Alignment/Geners/src/AbsReference.cc
@@ -23,7 +23,7 @@ namespace gs {
     if (searchId_) {
       // Make sure that the searchId_ item id is going to produce
       // a valid item
-      CPP11_shared_ptr<const CatalogEntry> record = archive_.catalogEntry(searchId_);
+      std::shared_ptr<const CatalogEntry> record = archive_.catalogEntry(searchId_);
       const unsigned long long idFound = record->id();
 
       // Check for valid id in the archive
@@ -88,7 +88,7 @@ namespace gs {
           "index out of range");
   }
 
-  CPP11_shared_ptr<const CatalogEntry> AbsReference::indexedCatalogEntry(const unsigned long index) const {
+  std::shared_ptr<const CatalogEntry> AbsReference::indexedCatalogEntry(const unsigned long index) const {
     return archive_.catalogEntry(id(index));
   }
 
diff --git a/Alignment/Geners/src/BinaryArchiveBase.cc b/Alignment/Geners/src/BinaryArchiveBase.cc
index 1a6abd7b8814f..6779b298237b6 100644
--- a/Alignment/Geners/src/BinaryArchiveBase.cc
+++ b/Alignment/Geners/src/BinaryArchiveBase.cc
@@ -355,7 +355,7 @@ namespace gs {
       catalog_->search(reference.namePattern(), reference.categoryPattern(), &idlist);
       const unsigned long nfound = idlist.size();
       for (unsigned long i = 0; i < nfound; ++i) {
-        CPP11_shared_ptr<const CatalogEntry> pentry = catalog_->retrieveEntry(idlist[i]);
+        std::shared_ptr<const CatalogEntry> pentry = catalog_->retrieveEntry(idlist[i]);
         if (reference.isIOCompatible(*pentry))
           addItemToReference(reference, idlist[i]);
       }
diff --git a/Alignment/Geners/src/ContiguousCatalog.cc b/Alignment/Geners/src/ContiguousCatalog.cc
index 80e2e0c86b49c..3f3327505b805 100644
--- a/Alignment/Geners/src/ContiguousCatalog.cc
+++ b/Alignment/Geners/src/ContiguousCatalog.cc
@@ -175,12 +175,12 @@ namespace gs {
     return catalog.release();
   }
 
-  CPP11_shared_ptr<const CatalogEntry> ContiguousCatalog::retrieveEntry(const unsigned long long id) const {
+  std::shared_ptr<const CatalogEntry> ContiguousCatalog::retrieveEntry(const unsigned long long id) const {
     if (id >= firstId_ && id < records_.size() + firstId_)
       return records_[id - firstId_];
     else {
       CatalogEntry *ptr = nullptr;
-      return CPP11_shared_ptr<const CatalogEntry>(ptr);
+      return std::shared_ptr<const CatalogEntry>(ptr);
     }
   }
 
@@ -193,7 +193,7 @@ namespace gs {
     assert(pos);
 
     if (id >= firstId_ && id < records_.size() + firstId_) {
-      const CPP11_shared_ptr<const CatalogEntry> &rec(records_[id - firstId_]);
+      const std::shared_ptr<const CatalogEntry> &rec(records_[id - firstId_]);
       *compressionCode = rec->compressionCode();
       *length = rec->itemLength();
       *pos = rec->location().streamPosition();
diff --git a/Alignment/Geners/src/GeneralCatalog.cc b/Alignment/Geners/src/GeneralCatalog.cc
index c82b44c8b19b2..7ce76da2d4459 100644
--- a/Alignment/Geners/src/GeneralCatalog.cc
+++ b/Alignment/Geners/src/GeneralCatalog.cc
@@ -1,12 +1,12 @@
-#include <algorithm>
-#include <cassert>
-#include <utility>
-
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/GeneralCatalog.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/binaryIO.hh"
 
+#include <algorithm>
+#include <cassert>
+#include <memory>
+#include <utility>
+
 namespace gs {
   GeneralCatalog::GeneralCatalog() : smallestId_(1ULL), largestId_(0) {}
 
@@ -223,7 +223,7 @@ namespace gs {
     for (long long recnum = 0; ok && recnum < nRecords; ++recnum) {
       CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
       if (rec) {
-        if (!catalog->addEntry(CPP11_shared_ptr<const CatalogEntry>(rec)))
+        if (!catalog->addEntry(std::shared_ptr<const CatalogEntry>(rec)))
           ok = false;
       } else
         ok = false;
@@ -248,7 +248,7 @@ namespace gs {
     for (in.peek(); ok && !in.eof(); in.peek()) {
       CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
       if (rec) {
-        if (!catalog->addEntry(CPP11_shared_ptr<const CatalogEntry>(rec)))
+        if (!catalog->addEntry(std::shared_ptr<const CatalogEntry>(rec)))
           ok = false;
       } else
         ok = false;
@@ -264,11 +264,11 @@ namespace gs {
     return catalog;
   }
 
-  CPP11_shared_ptr<const CatalogEntry> GeneralCatalog::retrieveEntry(const unsigned long long id) const {
+  std::shared_ptr<const CatalogEntry> GeneralCatalog::retrieveEntry(const unsigned long long id) const {
     IdMap::const_iterator it = records_.find(id);
     if (it == records_.end()) {
       CatalogEntry *ptr = nullptr;
-      return CPP11_shared_ptr<const CatalogEntry>(ptr);
+      return std::shared_ptr<const CatalogEntry>(ptr);
     } else
       return it->second;
   }
diff --git a/Alignment/Geners/src/MultiFileArchive.cc b/Alignment/Geners/src/MultiFileArchive.cc
index 6093d0eed49ad..4a2584f1cda66 100644
--- a/Alignment/Geners/src/MultiFileArchive.cc
+++ b/Alignment/Geners/src/MultiFileArchive.cc
@@ -245,7 +245,7 @@ namespace gs {
         }
       } else {
         // Here, we have to do a full catalog search
-        CPP11_shared_ptr<const CatalogEntry> sptr = catalog()->retrieveEntry(id);
+        std::shared_ptr<const CatalogEntry> sptr = catalog()->retrieveEntry(id);
         const CatalogEntry *pe = sptr.get();
         if (!pe) {
           std::ostringstream os;
diff --git a/Alignment/Geners/src/StringArchive.cc b/Alignment/Geners/src/StringArchive.cc
index 397816f9dd308..62bd21a95a84e 100644
--- a/Alignment/Geners/src/StringArchive.cc
+++ b/Alignment/Geners/src/StringArchive.cc
@@ -11,7 +11,7 @@ namespace gs {
     catalog_.search(reference.namePattern(), reference.categoryPattern(), &idlist);
     const unsigned long nfound = idlist.size();
     for (unsigned long i = 0; i < nfound; ++i) {
-      CPP11_shared_ptr<const CatalogEntry> pentry = catalog_.retrieveEntry(idlist[i]);
+      std::shared_ptr<const CatalogEntry> pentry = catalog_.retrieveEntry(idlist[i]);
       if (reference.isIOCompatible(*pentry))
         addItemToReference(reference, idlist[i]);
     }
diff --git a/Alignment/Geners/src/WriteOnlyCatalog.cc b/Alignment/Geners/src/WriteOnlyCatalog.cc
index e85e3df905411..242f337141f9a 100644
--- a/Alignment/Geners/src/WriteOnlyCatalog.cc
+++ b/Alignment/Geners/src/WriteOnlyCatalog.cc
@@ -1,9 +1,10 @@
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/binaryIO.hh"
 
+#include <memory>
+
 namespace gs {
   WriteOnlyCatalog::WriteOnlyCatalog(std::ostream &os, const unsigned long long firstId)
       : AbsCatalog(), os_(os), count_(0), smallestId_(firstId ? firstId : 1ULL), largestId_(0) {}
@@ -88,12 +89,12 @@ namespace gs {
     return cat.release();
   }
 
-  CPP11_shared_ptr<const CatalogEntry> WriteOnlyCatalog::retrieveEntry(unsigned long long) const {
+  std::shared_ptr<const CatalogEntry> WriteOnlyCatalog::retrieveEntry(unsigned long long) const {
     throw IOReadFailure(
         "In gs::WriteOnlyCatalog::retrieveEntry: "
         "entries can not be retrieved "
         "from a write-only catalog");
-    return CPP11_shared_ptr<CatalogEntry>(reinterpret_cast<CatalogEntry *>(0));
+    return std::shared_ptr<CatalogEntry>(reinterpret_cast<CatalogEntry *>(0));
   }
 
   bool WriteOnlyCatalog::retrieveStreampos(unsigned long long /* id */,
diff --git a/Alignment/Geners/test/CmdLine.hh b/Alignment/Geners/test/CmdLine.hh
index 0e005c1a9073d..d95e5389a6cb7 100644
--- a/Alignment/Geners/test/CmdLine.hh
+++ b/Alignment/Geners/test/CmdLine.hh
@@ -97,12 +97,11 @@
 
 #include <cstdio>
 #include <cstring>
+#include <memory>
 #include <list>
 #include <sstream>
 #include <utility>
 
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
-
 // Subsequent classes will throw exceptions of the following class
 class CmdLineError {
 public:
@@ -120,7 +119,7 @@ public:
   inline std::string str() const { return os_->str(); }
 
 private:
-  CPP11_shared_ptr<std::ostringstream> os_;
+  std::shared_ptr<std::ostringstream> os_;
 };
 
 template <typename T>
diff --git a/Alignment/Geners/test/cdump.cc b/Alignment/Geners/test/cdump.cc
index 6dcc2288655de..174d5741418a8 100644
--- a/Alignment/Geners/test/cdump.cc
+++ b/Alignment/Geners/test/cdump.cc
@@ -113,7 +113,7 @@ int main(int argc, char const *argv[]) {
     if (!cat->itemExists(id))
       continue;
 
-    CPP11_shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
+    std::shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
     if (fullDump) {
       if (id != first)
         cout << '\n';
diff --git a/Alignment/Geners/test/cmerge.cc b/Alignment/Geners/test/cmerge.cc
index eb4c5dd9b7153..1eef3ebe5bc04 100644
--- a/Alignment/Geners/test/cmerge.cc
+++ b/Alignment/Geners/test/cmerge.cc
@@ -129,7 +129,7 @@ int main(int argc, char const *argv[]) {
     for (unsigned long long id = cat->smallestId(); id <= last; ++id) {
       if (!cat->itemExists(id))
         continue;
-      CPP11_shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
+      std::shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
       const unsigned long long newid = merged.makeEntry(*e,
                                                         e->compressionCode(),
                                                         e->itemLength(),
diff --git a/Alignment/Geners/test/gssa_dump.cc b/Alignment/Geners/test/gssa_dump.cc
index 23cb9541301fe..827e93b06aeaa 100644
--- a/Alignment/Geners/test/gssa_dump.cc
+++ b/Alignment/Geners/test/gssa_dump.cc
@@ -75,7 +75,7 @@ int main(int argc, char const *argv[]) {
     if (!ar->itemExists(id))
       continue;
 
-    CPP11_shared_ptr<const CatalogEntry> e = ar->catalogEntry(id);
+    std::shared_ptr<const CatalogEntry> e = ar->catalogEntry(id);
     if (fullDump) {
       if (id != first)
         cout << '\n';
diff --git a/Alignment/Geners/test/print_items.cc b/Alignment/Geners/test/print_items.cc
index fe0e11840de8a..bbb18e0453f51 100644
--- a/Alignment/Geners/test/print_items.cc
+++ b/Alignment/Geners/test/print_items.cc
@@ -8,10 +8,6 @@
 // statements already present in this program.
 //
 
-#include <iostream>
-#include <map>
-#include <set>
-
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/MultiFileArchive.hh"
@@ -20,6 +16,11 @@
 
 #include "CmdLine.hh"
 
+#include <iostream>
+#include <map>
+#include <memory>
+#include <set>
+
 using namespace gs;
 using namespace std;
 
@@ -129,7 +130,7 @@ int main(int argc, char const *argv[]) {
   std::set<std::string> typenames;
   unsigned long nprinted = 0;
   for (unsigned long i = 0; i < nfound; ++i) {
-    CPP11_shared_ptr<const CatalogEntry> entry = mar.catalogEntry(found[i]);
+    std::shared_ptr<const CatalogEntry> entry = mar.catalogEntry(found[i]);
     const ClassId &type = entry->type();
     const std::string &tname = type.name();
     if (typenames.insert(tname).second) {