diff --git a/meson.build b/meson.build
index f7d82831e..af6bac822 100644
--- a/meson.build
+++ b/meson.build
@@ -330,8 +330,8 @@ sources = [
   'src/playlist/Print.cxx',
   'src/db/PlaylistVector.cxx',
   'src/queue/Queue.cxx',
-  'src/queue/QueuePrint.cxx',
-  'src/queue/QueueSave.cxx',
+  'src/queue/Print.cxx',
+  'src/queue/Save.cxx',
   'src/queue/Playlist.cxx',
   'src/queue/PlaylistControl.cxx',
   'src/queue/PlaylistEdit.cxx',
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 45dfe12d2..d01718f05 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -21,7 +21,7 @@
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"
 #include "queue/Playlist.hxx"
-#include "queue/QueuePrint.hxx"
+#include "queue/Print.hxx"
 #include "protocol/RangeArg.hxx"
 
 #define SONG_FILE "file: "
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx
index 85f54d045..35569db4d 100644
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@@ -27,7 +27,7 @@
 #include "Playlist.hxx"
 #include "SingleMode.hxx"
 #include "StateFileConfig.hxx"
-#include "queue/QueueSave.hxx"
+#include "Save.hxx"
 #include "io/LineReader.hxx"
 #include "io/BufferedOutputStream.hxx"
 #include "player/Control.hxx"
diff --git a/src/queue/QueuePrint.cxx b/src/queue/Print.cxx
similarity index 99%
rename from src/queue/QueuePrint.cxx
rename to src/queue/Print.cxx
index f11d4b8d8..c2b455acd 100644
--- a/src/queue/QueuePrint.cxx
+++ b/src/queue/Print.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "QueuePrint.hxx"
+#include "Print.hxx"
 #include "Queue.hxx"
 #include "song/Filter.hxx"
 #include "SongPrint.hxx"
diff --git a/src/queue/QueuePrint.hxx b/src/queue/Print.hxx
similarity index 95%
rename from src/queue/QueuePrint.hxx
rename to src/queue/Print.hxx
index 3c649f0de..cd597d638 100644
--- a/src/queue/QueuePrint.hxx
+++ b/src/queue/Print.hxx
@@ -22,8 +22,7 @@
  * client.
  */
 
-#ifndef MPD_QUEUE_PRINT_HXX
-#define MPD_QUEUE_PRINT_HXX
+#pragma once
 
 #include <cstdint>
 
@@ -52,5 +51,3 @@ queue_print_changes_position(Response &r, const Queue &queue,
 void
 queue_find(Response &response, const Queue &queue,
 	   const SongFilter &filter);
-
-#endif
diff --git a/src/queue/QueueSave.cxx b/src/queue/Save.cxx
similarity index 99%
rename from src/queue/QueueSave.cxx
rename to src/queue/Save.cxx
index f4639f599..07b0458e0 100644
--- a/src/queue/QueueSave.cxx
+++ b/src/queue/Save.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "QueueSave.hxx"
+#include "Save.hxx"
 #include "Queue.hxx"
 #include "PlaylistError.hxx"
 #include "song/DetachedSong.hxx"
diff --git a/src/queue/QueueSave.hxx b/src/queue/Save.hxx
similarity index 95%
rename from src/queue/QueueSave.hxx
rename to src/queue/Save.hxx
index 9ffdafc22..17b6a0dbe 100644
--- a/src/queue/QueueSave.hxx
+++ b/src/queue/Save.hxx
@@ -22,8 +22,7 @@
  * back into memory.
  */
 
-#ifndef MPD_QUEUE_SAVE_HXX
-#define MPD_QUEUE_SAVE_HXX
+#pragma once
 
 struct Queue;
 class BufferedOutputStream;
@@ -41,5 +40,3 @@ queue_save(BufferedOutputStream &os, const Queue &queue);
 void
 queue_load_song(LineReader &file, const SongLoader &loader,
 		const char *line, Queue &queue);
-
-#endif