diff --git a/common/headless_view.hpp b/common/headless_view.hpp
index a203d477e..b3e1c11b9 100644
--- a/common/headless_view.hpp
+++ b/common/headless_view.hpp
@@ -29,14 +29,14 @@ private:
 
 
 private:
-#ifdef LLMR_USE_CGL
+#if LLMR_USE_CGL
     CGLContextObj gl_context;
     GLuint fbo = 0;
     GLuint fbo_depth_stencil = 0;
     GLuint fbo_color = 0;
 #endif
 
-#ifdef LLMR_USE_GLX
+#if LLMR_USE_GLX
     GLXContext gl_context = nullptr;
     XVisualInfo *x_info = nullptr;
     Display *x_display = nullptr;
diff --git a/src/util/io.cpp b/src/util/io.cpp
index fb36998e0..1312b907b 100644
--- a/src/util/io.cpp
+++ b/src/util/io.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
+#include <stdexcept>
 
 namespace llmr {
 namespace util {
diff --git a/test/headless.cpp b/test/headless.cpp
index 108d7627b..2428b1a2f 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -5,9 +5,10 @@
 #include <llmr/util/io.hpp>
 #include <llmr/util/std.hpp>
 
-#include "../common/headless_view.hpp"
 #include <rapidjson/document.h>
 
+#include "../common/headless_view.hpp"
+
 const std::string base_directory = []{
     std::string fn = __FILE__;
     fn.erase(fn.find_last_of("/"));