From b3fc378a0f3008c73dd521904e3e5033c733ce83 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jul 2013 16:14:17 -0700
Subject: [PATCH 1/2] don't include XnCppWrapper if Q_MOC_RUN is defined

---
 interface/src/Webcam.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/interface/src/Webcam.h b/interface/src/Webcam.h
index 6c6d250897..19f0265530 100644
--- a/interface/src/Webcam.h
+++ b/interface/src/Webcam.h
@@ -9,6 +9,10 @@
 #ifndef __interface__Webcam__
 #define __interface__Webcam__
 
+#if defined(HAVE_OPENNI) && !defined(Q_MOC_RUN)
+#include <XnCppWrapper.h>
+#endif
+
 #include <QMetaType>
 #include <QObject>
 #include <QThread>
@@ -19,9 +23,6 @@
 
 #include <opencv2/opencv.hpp>
 
-#ifdef HAVE_OPENNI
-    #include <XnCppWrapper.h>
-#endif
 
 #include <vpx_codec.h>
 

From 8166ed3a77c5028c3455e92530ed304dab76111e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jul 2013 16:15:39 -0700
Subject: [PATCH 2/2] move OpenNI include

---
 interface/src/Webcam.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/src/Webcam.h b/interface/src/Webcam.h
index 19f0265530..3910bb4a19 100644
--- a/interface/src/Webcam.h
+++ b/interface/src/Webcam.h
@@ -9,10 +9,6 @@
 #ifndef __interface__Webcam__
 #define __interface__Webcam__
 
-#if defined(HAVE_OPENNI) && !defined(Q_MOC_RUN)
-#include <XnCppWrapper.h>
-#endif
-
 #include <QMetaType>
 #include <QObject>
 #include <QThread>
@@ -23,6 +19,9 @@
 
 #include <opencv2/opencv.hpp>
 
+#if defined(HAVE_OPENNI) && !defined(Q_MOC_RUN)
+#include <XnCppWrapper.h>
+#endif
 
 #include <vpx_codec.h>