diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 2b4fdd3eb..da79a829f 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -3115,7 +3115,7 @@ void MainWindow::PlaylistDelete() {
     app_->player()->Next();
   }
 
-  std::shared_ptr<MusicStorage> storage(new FilesystemMusicStorage("/"));
+  std::shared_ptr<MusicStorage> storage = std::make_shared<FilesystemMusicStorage>("/");
   DeleteFiles *delete_files = new DeleteFiles(app_->task_manager(), storage, true);
   //QObject::connect(delete_files, &DeleteFiles::Finished, this, &MainWindow::DeleteFinished);
   delete_files->Start(selected_songs);
diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index ef194f76b..c16bdccde 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -809,7 +809,7 @@ std::shared_ptr<GstEnginePipeline> GstEngine::CreatePipeline() {
 
   EnsureInitialized();
 
-  std::shared_ptr<GstEnginePipeline> ret(new GstEnginePipeline(this));
+  std::shared_ptr<GstEnginePipeline> ret = std::make_shared<GstEnginePipeline>(this);
   ret->set_output_device(output_, device_);
   ret->set_volume_enabled(volume_control_);
   ret->set_stereo_balancer_enabled(stereo_balancer_enabled_);
diff --git a/src/main.cpp b/src/main.cpp
index e230d7b40..7a617be49 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -282,7 +282,7 @@ int main(int argc, char *argv[]) {
   QNetworkProxyFactory::setApplicationProxyFactory(NetworkProxyFactory::Instance());
 
   // Create the tray icon and OSD
-  std::shared_ptr<SystemTrayIcon> tray_icon(new SystemTrayIcon);
+  std::shared_ptr<SystemTrayIcon> tray_icon = std::make_shared<SystemTrayIcon>();
 
 #if defined(Q_OS_MACOS)
   OSDMac osd(tray_icon, &app);
diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp
index 98c14e9c8..e909346f9 100644
--- a/src/playlist/playlistbackend.cpp
+++ b/src/playlist/playlistbackend.cpp
@@ -199,7 +199,7 @@ QList<PlaylistItemPtr> PlaylistBackend::GetPlaylistItems(int playlist) {
     if (db_->CheckErrors(q)) return QList<PlaylistItemPtr>();
 
     // it's probable that we'll have a few songs associated with the same CUE so we're caching results of parsing CUEs
-    std::shared_ptr<NewSongFromQueryState> state_ptr(new NewSongFromQueryState());
+    std::shared_ptr<NewSongFromQueryState> state_ptr = std::make_shared<NewSongFromQueryState>();
     while (q.next()) {
       playlistitems << NewPlaylistItemFromQuery(SqlRow(q), state_ptr);
     }
@@ -225,7 +225,7 @@ QList<Song> PlaylistBackend::GetPlaylistSongs(int playlist) {
     if (db_->CheckErrors(q)) return QList<Song>();
 
     // it's probable that we'll have a few songs associated with the same CUE so we're caching results of parsing CUEs
-    std::shared_ptr<NewSongFromQueryState> state_ptr(new NewSongFromQueryState());
+    std::shared_ptr<NewSongFromQueryState> state_ptr = std::make_shared<NewSongFromQueryState>();
     while (q.next()) {
       songs << NewSongFromQuery(SqlRow(q), state_ptr);
     }
diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.cpp b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
index f6a0f119b..c9694b27f 100644
--- a/src/smartplaylists/smartplaylistquerywizardplugin.cpp
+++ b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
@@ -212,7 +212,7 @@ void SmartPlaylistQueryWizardPlugin::SetGenerator(PlaylistGeneratorPtr g) {
 
 PlaylistGeneratorPtr SmartPlaylistQueryWizardPlugin::CreateGenerator() const {
 
-  std::shared_ptr<PlaylistQueryGenerator> gen(new PlaylistQueryGenerator);
+  std::shared_ptr<PlaylistQueryGenerator> gen = std::make_shared<PlaylistQueryGenerator>();
   gen->Load(MakeSearch());
 
   return std::static_pointer_cast<PlaylistGenerator>(gen);
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index 8a6da3477..11e6bf91d 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -411,7 +411,7 @@ void Transcoder::JobState::ReportError(GstMessage *msg) const {
 
 bool Transcoder::StartJob(const Job &job) {
 
-  std::shared_ptr<JobState> state(new JobState(job, this));
+  std::shared_ptr<JobState> state = std::make_shared<JobState>(job, this);
 
   emit LogLine(tr("Starting %1").arg(QDir::toNativeSeparators(job.input)));