diff --git a/libraries/particles/src/ParticleCollisionSystem.cpp b/libraries/particles/src/ParticleCollisionSystem.cpp
index 6711dc2d13..24d907667a 100644
--- a/libraries/particles/src/ParticleCollisionSystem.cpp
+++ b/libraries/particles/src/ParticleCollisionSystem.cpp
@@ -7,6 +7,7 @@
 //
 //
 
+#include <algorithm>
 #include <AbstractAudioInterface.h>
 #include <VoxelTree.h>
 #include <AvatarData.h>
@@ -98,7 +99,7 @@ void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particleA)
     if (_particles->findSpherePenetration(center, radius, penetration, (void**)&particleB)) {
         // NOTE: 'penetration' is the depth that 'particleA' overlaps 'particleB'.
         // That is, it points from A into B.
-    
+
         // Even if the particles overlap... when the particles are already moving appart
         // we don't want to count this as a collision.
         glm::vec3 relativeVelocity = particleA->getVelocity() - particleB->getVelocity();
@@ -115,7 +116,7 @@ void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particleA)
             float massA = (particleA->getInHand()) ? MAX_MASS : particleA->getMass();
             float massB = (particleB->getInHand()) ? MAX_MASS : particleB->getMass();
             float totalMass = massA + massB;
-    
+
             particleA->setVelocity(particleA->getVelocity() - axialVelocity * (2.0f * massB / totalMass));
 
             ParticleEditHandle particleEditHandle(_packetSender, _particles, particleA->getID());
@@ -294,9 +295,9 @@ void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm
         //  Noise is a function of the angle of collision
         //  Duration of the sound is a function of both base frequency and velocity of impact
         _audio->startCollisionSound(
-                    fmin(COLLISION_LOUDNESS * velocityTowardCollision, 1.f),
+                    std::min(COLLISION_LOUDNESS * velocityTowardCollision, 1.f),
                     frequency * (1.f + velocityTangentToCollision / velocityTowardCollision),
-                    fmin(velocityTangentToCollision / velocityTowardCollision * NOISE_SCALING, 1.f),
+                    std::min(velocityTangentToCollision / velocityTowardCollision * NOISE_SCALING, 1.f),
                     1.f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision, false);
     }
 }
diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp
index 29e26fa0ed..3f305605e7 100644
--- a/libraries/voxels/src/VoxelTree.cpp
+++ b/libraries/voxels/src/VoxelTree.cpp
@@ -6,9 +6,11 @@
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
+#include <algorithm>
+
 #include <glm/gtc/noise.hpp>
 
-//#include <QtCore/QDebug>
+#include <QtCore/QDebug>
 #include <QImage>
 #include <QRgb>
 
@@ -83,13 +85,13 @@ float findNewLeafSize(const glm::vec3& nudgeAmount, float leafSize) {
 
     float newLeafSize = leafSize;
     if (newLeafSizeX) {
-        newLeafSize = fmin(newLeafSize, newLeafSizeX);
+        newLeafSize = std::min(newLeafSize, newLeafSizeX);
     }
     if (newLeafSizeY) {
-        newLeafSize = fmin(newLeafSize, newLeafSizeY);
+        newLeafSize = std::min(newLeafSize, newLeafSizeY);
     }
     if (newLeafSizeZ) {
-        newLeafSize = fmin(newLeafSize, newLeafSizeZ);
+        newLeafSize = std::min(newLeafSize, newLeafSizeZ);
     }
     return newLeafSize;
 }