From 3dc6820e9eb033338d2256e0fdd054766581df7b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 14 Jan 2019 12:58:23 +0100
Subject: Don't use __ in defines or declarations, it's reserved

SPA_TYPE -> SPA_TYPE_INFO for type info strings
improve includes

Fixes #115
---
 src/tools/pipewire-cli.c     | 1 +
 src/tools/pipewire-monitor.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c
index b0188a46..a607760f 100644
--- a/src/tools/pipewire-cli.c
+++ b/src/tools/pipewire-cli.c
@@ -31,6 +31,7 @@
 #include <spa/debug/pod.h>
 #include <spa/debug/format.h>
 
+#include <pipewire/map.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/command.h>
 #include <pipewire/interfaces.h>
diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c
index 37d65087..db084997 100644
--- a/src/tools/pipewire-monitor.c
+++ b/src/tools/pipewire-monitor.c
@@ -29,9 +29,11 @@
 #include <spa/debug/format.h>
 #include <spa/debug/types.h>
 
-#include <pipewire/pipewire.h>
 #include <pipewire/interfaces.h>
 #include <pipewire/type.h>
+#include <pipewire/remote.h>
+#include <pipewire/main-loop.h>
+#include <pipewire/pipewire.h>
 
 struct proxy_data;
 
-- 
cgit v1.2.3