diff --git a/glava/glava.c b/glava/glava.c
index c779153..692b640 100644
--- a/glava/glava.c
+++ b/glava/glava.c
@@ -76,8 +76,8 @@ static volatile bool reload = false;
 
 __attribute__((noreturn, visibility("default"))) void glava_return_builtin(void) { exit(EXIT_SUCCESS); }
 __attribute__((noreturn, visibility("default"))) void glava_abort_builtin (void) { exit(EXIT_FAILURE); }
-__attribute__((noreturn, visibility("default"))) void (*glava_return)     (void) = glava_return_builtin;
-__attribute__((noreturn, visibility("default"))) void (*glava_abort)      (void) = glava_abort_builtin;
+__attribute__((noreturn, visibility("default"))) static void (*glava_return)     (void) = glava_return_builtin;
+__attribute__((noreturn, visibility("default"))) static void (*glava_abort)      (void) = glava_abort_builtin;
 
 /* Copy installed shaders/configuration from the installed location
    (usually /etc/xdg). Modules (folders) will be linked instead of
diff --git a/glava/glava.h b/glava/glava.h
index 570abc3..7b0b9f0 100644
--- a/glava/glava.h
+++ b/glava/glava.h
@@ -14,8 +14,8 @@ struct glava_renderer;
 /* External API */
 
 typedef struct glava_renderer* volatile glava_handle;
-__attribute__((noreturn, visibility("default"))) void (*glava_abort)            (void);
-__attribute__((noreturn, visibility("default"))) void (*glava_return)           (void);
+__attribute__((noreturn, visibility("default"))) static void (*glava_abort)            (void);
+__attribute__((noreturn, visibility("default"))) static void (*glava_return)           (void);
 __attribute__((visibility("default")))           void glava_assign_external_ctx (void* ctx);
 __attribute__((visibility("default")))           void glava_entry               (int argc, char** argv, glava_handle* ret);
 __attribute__((visibility("default")))           void glava_terminate           (glava_handle* ref);
diff --git a/glfft/glfft_gl_interface.hpp b/glfft/glfft_gl_interface.hpp
index 43929c7..ab06deb 100644
--- a/glfft/glfft_gl_interface.hpp
+++ b/glfft/glfft_gl_interface.hpp
@@ -30,6 +30,8 @@ extern "C" {
     #include <stdlib.h>
     #include <string.h>
     #include <error.h>
+    #include <stdio.h>
+    #include <errno.h>
 }
 
 #ifndef GLFFT_GLSL_LANG_STRING
diff --git a/glfft/glfft_wisdom.cpp b/glfft/glfft_wisdom.cpp
index ad18317..fca9891 100644
--- a/glfft/glfft_wisdom.cpp
+++ b/glfft/glfft_wisdom.cpp
@@ -20,6 +20,7 @@
 #include "glfft_interface.hpp"
 #include "glfft.hpp"
 #include <utility>
+#include <stdexcept>
 
 /* GLAVA NOTICE: automatic wisdom serialization support may be added at a late date */
 #ifdef GLFFT_SERIALIZATION