From 9827c9085156be3eadb996ff1a906bc3b1736b1e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 2 Oct 2015 16:03:38 -0700
Subject: [PATCH] Rebase fixes

---
 interface/src/Application.cpp          | 3 +--
 interface/src/FileLogger.cpp           | 2 +-
 interface/src/ui/Stats.cpp             | 1 +
 interface/src/ui/overlays/Overlays.cpp | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 04c7eafc4f..472b516e6c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -402,7 +402,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
 
     _myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
 
-    qCDebug(interfaceapp) << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
+    qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
 
     _bookmarks = new Bookmarks();  // Before setting up the menu
 
@@ -781,7 +781,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
 
     connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
     
-    
     qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0f);
 }
 
diff --git a/interface/src/FileLogger.cpp b/interface/src/FileLogger.cpp
index f09397322f..10dce38fbc 100644
--- a/interface/src/FileLogger.cpp
+++ b/interface/src/FileLogger.cpp
@@ -59,7 +59,7 @@ protected:
                 _lastRollTime = now;
                 file.open(QIODevice::WriteOnly | QIODevice::Truncate);
                 file.close();
-                qDebug() << "Rolled log file: " << newFileName;
+                qDebug() << "Rolled log file:" << newFileName;
             }
         }
     }
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index fe5769c65c..5e73e62832 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -18,6 +18,7 @@
 
 #include <avatar/AvatarManager.h>
 #include <Application.h>
+#include <AudioClient.h>
 #include <GeometryCache.h>
 #include <LODManager.h>
 #include <OffscreenUi.h>
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index 29e9d62542..96553843c8 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -10,10 +10,11 @@
 
 #include "Overlays.h"
 
-#include <QtScript/QScriptValueIterator>
-
 #include <limits>
 
+#include <QtScript/QScriptValueIterator>
+
+#include <OffscreenUi.h>
 #include <render/Scene.h>
 #include <RegisteredMetaTypes.h>