diff --git a/src/DatabaseCommands.hxx b/src/DatabaseCommands.hxx
index 24ff71329..2b93faf4a 100644
--- a/src/DatabaseCommands.hxx
+++ b/src/DatabaseCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_lsinfo2(struct client *client, int argc, char *argv[]);
 
@@ -54,6 +52,4 @@ handle_list(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_listallinfo(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/MessageCommands.hxx b/src/MessageCommands.hxx
index 4fc10bf24..111c06ff7 100644
--- a/src/MessageCommands.hxx
+++ b/src/MessageCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_subscribe(struct client *client, int argc, char *argv[]);
 
@@ -39,6 +37,4 @@ handle_read_messages(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_send_message(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/OtherCommands.hxx b/src/OtherCommands.hxx
index d0dc1953c..c4cc3ac22 100644
--- a/src/OtherCommands.hxx
+++ b/src/OtherCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_urlhandlers(struct client *client, int argc, char *argv[]);
 
@@ -66,6 +64,4 @@ handle_config(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_idle(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/OutputCommands.hxx b/src/OutputCommands.hxx
index e0d28c975..1dc4c5ee6 100644
--- a/src/OutputCommands.hxx
+++ b/src/OutputCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_enableoutput(struct client *client, int argc, char *argv[]);
 
@@ -33,6 +31,4 @@ handle_disableoutput(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_devices(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/PlayerCommands.hxx b/src/PlayerCommands.hxx
index 8abc147fa..40a8a779a 100644
--- a/src/PlayerCommands.hxx
+++ b/src/PlayerCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_play(struct client *client, int argc, char *argv[]);
 
@@ -87,6 +85,4 @@ handle_replay_gain_mode(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_replay_gain_status(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/PlaylistCommands.hxx b/src/PlaylistCommands.hxx
index 8f83f6557..267ed5c95 100644
--- a/src/PlaylistCommands.hxx
+++ b/src/PlaylistCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_save(struct client *client, int argc, char *argv[]);
 
@@ -57,6 +55,4 @@ handle_playlistadd(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_listplaylists(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/QueueCommands.hxx b/src/QueueCommands.hxx
index ec3230f7f..b28608f62 100644
--- a/src/QueueCommands.hxx
+++ b/src/QueueCommands.hxx
@@ -22,8 +22,6 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_add(struct client *client, int argc, char *argv[]);
 
@@ -81,6 +79,4 @@ handle_swap(struct client *client, int argc, char *argv[]);
 enum command_return
 handle_swapid(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif
diff --git a/src/StickerCommands.hxx b/src/StickerCommands.hxx
index f4dff7755..c253d0bb7 100644
--- a/src/StickerCommands.hxx
+++ b/src/StickerCommands.hxx
@@ -22,11 +22,7 @@
 
 #include "command.h"
 
-G_BEGIN_DECLS
-
 enum command_return
 handle_sticker(struct client *client, int argc, char *argv[]);
 
-G_END_DECLS
-
 #endif