From 170ce422ceb20126cd7dc7b184b5edbc0685c7e7 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 6 Oct 2014 15:45:14 -0400
Subject: [PATCH] forward declare HeadlessDisplay in headless_view.hpp

---
 common/headless_display.cpp |  2 +-
 common/headless_display.hpp |  9 +--------
 common/headless_view.cpp    |  1 +
 common/headless_view.hpp    | 10 +++++++++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common/headless_display.cpp b/common/headless_display.cpp
index 580d3ef58..38d123034 100644
--- a/common/headless_display.cpp
+++ b/common/headless_display.cpp
@@ -1,4 +1,4 @@
-#include "headless_view.hpp"
+#include "headless_display.hpp"
 
 #include <stdexcept>
 
diff --git a/common/headless_display.hpp b/common/headless_display.hpp
index 4fc03da08..0eb41911e 100644
--- a/common/headless_display.hpp
+++ b/common/headless_display.hpp
@@ -1,14 +1,7 @@
 #ifndef MBGL_COMMON_HEADLESS_DISPLAY
 #define MBGL_COMMON_HEADLESS_DISPLAY
 
-#ifdef __APPLE__
-#define MBGL_USE_CGL 1
-#else
-#include <GL/glx.h>
-#define MBGL_USE_GLX 1
-#endif
-
-#include <mbgl/platform/gl.hpp>
+#include "headless_view.hpp"
 
 namespace mbgl {
 
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 47cf3bd66..86fa445fc 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -1,4 +1,5 @@
 #include "headless_view.hpp"
+#include "headless_display.hpp"
 
 #include <stdexcept>
 
diff --git a/common/headless_view.hpp b/common/headless_view.hpp
index d1b09ce70..381988ae9 100644
--- a/common/headless_view.hpp
+++ b/common/headless_view.hpp
@@ -1,12 +1,20 @@
 #ifndef MBGL_COMMON_HEADLESS_VIEW
 #define MBGL_COMMON_HEADLESS_VIEW
 
-#include "headless_display.hpp"
+#ifdef __APPLE__
+#define MBGL_USE_CGL 1
+#else
+#include <GL/glx.h>
+#define MBGL_USE_GLX 1
+#endif
 
 #include <mbgl/map/view.hpp>
+#include <mbgl/platform/gl.hpp>
 
 namespace mbgl {
 
+class HeadlessDisplay;
+
 class HeadlessView : public View {
 public:
     HeadlessView();