4 files changed, 4 insertions, 6 deletions
diff --git a/src/client/ClientEvent.cxx b/src/client/ClientEvent.cxx
index cfc638f63..0d330e975 100644
--- a/src/client/ClientEvent.cxx
+++ b/src/client/ClientEvent.cxx
@@ -18,8 +18,7 @@
  */
 
 #include "config.h"
-#include "ClientInternal.hxx"
-#include "util/Error.hxx"
+#include "Client.hxx"
 #include "Log.hxx"
 
 void
diff --git a/src/client/ClientFile.cxx b/src/client/ClientFile.cxx
index 72e9d9931..37979c1f9 100644
--- a/src/client/ClientFile.cxx
+++ b/src/client/ClientFile.cxx
@@ -24,7 +24,6 @@
 #include "fs/FileInfo.hxx"
 #include "util/Error.hxx"
 
-#include <sys/stat.h>
 #include <unistd.h>
 
 bool
diff --git a/src/client/ClientMessage.hxx b/src/client/ClientMessage.hxx
index 3c39fb9d5..13804e715 100644
--- a/src/client/ClientMessage.hxx
+++ b/src/client/ClientMessage.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_CLIENT_MESSAGE_H
-#define MPD_CLIENT_MESSAGE_H
+#ifndef MPD_CLIENT_MESSAGE_HXX
+#define MPD_CLIENT_MESSAGE_HXX
 
 #include "Compiler.h"
 
diff --git a/src/client/ClientWrite.cxx b/src/client/ClientWrite.cxx
index a06719770..88611ee25 100644
--- a/src/client/ClientWrite.cxx
+++ b/src/client/ClientWrite.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "ClientInternal.hxx"
+#include "Client.hxx"
 #include "util/FormatString.hxx"
 
 #include <string.h>