From ca0f6a4d105a1b66491a3674a4a07ff2bf8e2004 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 11 Jul 2013 09:30:45 -0700
Subject: [PATCH] header re-arranging and changing

---
 animation-server/src/main.cpp           | 10 ++++++----
 libraries/voxels/src/SceneUtils.cpp     |  7 +++++--
 libraries/voxels/src/SquarePixelMap.cpp |  9 ++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp
index 963d8f73b8..8123fa439c 100644
--- a/animation-server/src/main.cpp
+++ b/animation-server/src/main.cpp
@@ -10,14 +10,16 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#include <OctalCode.h>
+#include <iostream>
+
+#include <EnvironmentData.h>
 #include <NodeList.h>
 #include <NodeTypes.h>
-#include <EnvironmentData.h>
-#include <VoxelTree.h>
-#include <SharedUtil.h>
+#include <OctalCode.h>
 #include <PacketHeaders.h>
 #include <SceneUtils.h>
+#include <SharedUtil.h>
+#include <VoxelTree.h>
 
 #ifdef _WIN32
 #include "Syssocket.h"
diff --git a/libraries/voxels/src/SceneUtils.cpp b/libraries/voxels/src/SceneUtils.cpp
index da92734350..bd126ebf31 100644
--- a/libraries/voxels/src/SceneUtils.cpp
+++ b/libraries/voxels/src/SceneUtils.cpp
@@ -3,12 +3,15 @@
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 5/7/2013.
-//
+//  Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
 //
 
-#include "SceneUtils.h"
+#include <algorithm>
+
 #include <glm/gtc/noise.hpp>
 
+#include "SceneUtils.h"
+
 void addCornersAndAxisLines(VoxelTree* tree) {
     // We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...    
     float voxelSize = 0.5f / TREE_SCALE;
diff --git a/libraries/voxels/src/SquarePixelMap.cpp b/libraries/voxels/src/SquarePixelMap.cpp
index bdc97624a7..f37bee4757 100644
--- a/libraries/voxels/src/SquarePixelMap.cpp
+++ b/libraries/voxels/src/SquarePixelMap.cpp
@@ -3,12 +3,15 @@
 //  hifi
 //
 //  Created by Tomáš Horáček on 6/25/13.
-//
+//  Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
 //
 
-#include "SquarePixelMap.h"
-#include <string.h>
+#include <algorithm>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "SquarePixelMap.h"
 
 #define CHILD_COORD_X_IS_1 0x1
 #define CHILD_COORD_Y_IS_1 0x2