From 86bcbfb92c4ca76b59fc6b84f0bd17003ccd7064 Mon Sep 17 00:00:00 2001
From: Michael Nilsson <michaelnilsson90@hotmail.com>
Date: Mon, 13 Jun 2016 16:27:59 -0400
Subject: [PATCH] windows fix

---
 modules/iswa/rendering/iswacygnet.h | 4 ----
 modules/kameleon/ext/kameleon       | 2 +-
 src/util/transformationmanager.cpp  | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index af4a2e8747..6040f26f99 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -25,10 +25,6 @@
 #ifndef __ISWACYGNET_H__
 #define __ISWACYGNET_H__
 
-#define _USE_MATH_DEFINES
-#include <math.h>
-
-#include <memory>
 #include <chrono>
 #include <modules/iswa/util/iswamanager.h>
 #include <ghoul/designpattern/event.h>
diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index 3de739a553..f9ba0caae4 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit 3de739a55387051fb6fdfd327ad761dffa317420
+Subproject commit f9ba0caae41dc13a752c71a2e873c02bb0dce7c3
diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp
index c9818205a8..3b5448baf0 100644
--- a/src/util/transformationmanager.cpp
+++ b/src/util/transformationmanager.cpp
@@ -25,6 +25,8 @@
 #include <openspace/util/spicemanager.h>
 #include <ghoul/logging/logmanager.h>
 
+#define _USE_MATH_DEFINES
+#include <math.h>
 
  namespace {
     const std::string _loggerCat = "TransformationManager";