7 files changed, 12 insertions, 12 deletions
diff --git a/src/PlayerControl.cxx b/src/player/Control.cxx
index 4f1c3d2ac..d7352ad57 100644
--- a/src/PlayerControl.cxx
+++ b/src/player/Control.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "Idle.hxx"
 #include "DetachedSong.hxx"
 
diff --git a/src/PlayerControl.hxx b/src/player/Control.hxx
index 4d06a1827..a2807a9a1 100644
--- a/src/PlayerControl.hxx
+++ b/src/player/Control.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/CrossFade.cxx b/src/player/CrossFade.cxx
index e3cc95b0d..6d7b41440 100644
--- a/src/CrossFade.cxx
+++ b/src/player/CrossFade.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/CrossFade.hxx b/src/player/CrossFade.hxx
index 81e96e8d3..672abb718 100644
--- a/src/CrossFade.hxx
+++ b/src/player/CrossFade.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/PlayerListener.hxx b/src/player/Listener.hxx
index 06f00a4f5..e10f2547b 100644
--- a/src/PlayerListener.hxx
+++ b/src/player/Listener.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/PlayerThread.cxx b/src/player/Thread.cxx
index eeebcdb96..60e253f4c 100644
--- a/src/PlayerThread.cxx
+++ b/src/player/Thread.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "PlayerThread.hxx"
-#include "PlayerListener.hxx"
+#include "Thread.hxx"
+#include "Listener.hxx"
 #include "decoder/DecoderThread.hxx"
 #include "decoder/DecoderControl.hxx"
 #include "MusicPipe.hxx"
@@ -28,7 +28,7 @@
 #include "DetachedSong.hxx"
 #include "system/FatalError.hxx"
 #include "CrossFade.hxx"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"
diff --git a/src/PlayerThread.hxx b/src/player/Thread.hxx
index 537e38399..fc6ea4364 100644
--- a/src/PlayerThread.hxx
+++ b/src/player/Thread.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  * audio outputs via audio_output_all_play().
  *
  * It is controlled by the main thread (the playlist code), see
- * PlayerControl.hxx.  The playlist enqueues new songs into the player
+ * Control.hxx.  The playlist enqueues new songs into the player
  * thread and sends it commands.
  *
  * The player thread itself does not do any I/O.  It synchronizes with