diff --git a/audio/pulse.c b/audio/pulse.c
index f34bde177a..af52de9fbd 100644
--- a/audio/pulse.c
+++ b/audio/pulse.c
@@ -133,10 +133,10 @@ static void buffer_attr_cb(pa_stream *s, void *data)
 
 static void *pulse_init(const char *device, unsigned rate, unsigned latency)
 {
+   const pa_buffer_attr *server_attr = NULL;
    pa_sample_spec spec;
    memset(&spec, 0, sizeof(spec));
    pa_buffer_attr buffer_attr = {0};
-
    pa_t *pa = (pa_t*)calloc(1, sizeof(*pa));
    if (!pa)
       goto error;
@@ -191,7 +191,7 @@ static void *pulse_init(const char *device, unsigned rate, unsigned latency)
    if (pa_stream_get_state(pa->stream) != PA_STREAM_READY)
       goto unlock_error;
 
-   const pa_buffer_attr *server_attr = pa_stream_get_buffer_attr(pa->stream);
+   server_attr = pa_stream_get_buffer_attr(pa->stream);
    if (server_attr)
    {
       pa->buffer_size = server_attr->tlength;
diff --git a/input/overlay.h b/input/overlay.h
index b6362ada30..c5f08491cb 100644
--- a/input/overlay.h
+++ b/input/overlay.h
@@ -19,6 +19,10 @@
 #include "../boolean.h"
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Overlay driver acts as a medium between input drivers and video driver.
 // Coordinates are fetched from input driver, and an overlay with pressable actions are
 // displayed on-screen.
@@ -49,5 +53,9 @@ void input_overlay_set_scale_factor(input_overlay_t *ol, float scale);
 
 void input_overlay_next(input_overlay_t *ol);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif