Index: trunk/src/engine/particle_engine.cc
===================================================================
--- trunk/src/engine/particle_engine.cc	(revision 368)
+++ trunk/src/engine/particle_engine.cc	(revision 374)
@@ -7,7 +7,7 @@
 #include <nv/interface/device.hh>
 #include <nv/core/random.hh>
+#include <nv/stl/utility.hh>
 #include <nv/lua/lua_glm.hh>
 #include <nv/core/logging.hh>
-#include <cmath>
 
 static const char *nv_particle_engine_vertex_shader_world =
@@ -203,5 +203,5 @@
 	if ( datap->average )
 	{
-		float norm_factor = glm::min( factor, 1.0f );
+		float norm_factor = nv::min( factor, 1.0f );
 		for ( uint32 i = 0; i < count; ++i ) 
 			p[i].velocity = datap->force_vector * norm_factor + p[i].velocity * ( 1.0f - norm_factor );
@@ -696,5 +696,5 @@
 			{
 				info->count--;
-				std::swap( info->particles[i], info->particles[info->count] );
+				swap( info->particles[i], info->particles[info->count] );
 			}
 		}