prep for merge

diff --git a/exit_menu.c b/exit_menu.c
index 8811ed71530486717496cb0b2330caa4b2f29b7f..2c24ce0815bf85277d07856a6c824d1b11315601 100644 (file)
--- a/exit_menu.c
+++ b/exit_menu.c
@@ -33,7 +33,9 @@
 #include "soapy_protocol.h"
 #endif
 #include "actions.h"
+#ifdef GPIO
 #include "gpio.h"
+#endif
 
 static GtkWidget *parent_window=NULL;
 

diff --git a/main.c b/main.c
index 4fb2ced1c7304ecc151b3197f843ad4127f504cb..d93fe9b1057b03f2d1ed88e619b4fbe15272c68e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -41,9 +41,9 @@
 #include "main.h"
 #include "channel.h"
 #include "discovered.h"
-#ifdef GPIO
-#include "actions.h"
 #include "configure.h"
+#include "actions.h"
+#ifdef GPIO
 #include "gpio.h"
 #endif
 #include "wdsp.h"