Index: trunk/src/stl/assert.cc
===================================================================
--- trunk/src/stl/assert.cc	(revision 406)
+++ trunk/src/stl/assert.cc	(revision 410)
@@ -5,13 +5,10 @@
 // For conditions of distribution and use, see copying.txt file in root folder.
 
-#define NV_BASE_COMMON_HH
-#define NV_INTERNAL_INCLUDE
-#include "nv/base/assert.hh"
-#undef NV_BASE_COMMON_HH
+#include "nv/base/common.hh"
 #include "nv/core/logging.hh"
 
 extern "C" {
 #if NV_COMPILER == NV_MSVC
-	NV_NORETURN void __cdecl exit( _In_ int _Code );
+	_ACRTIMP NV_NORETURN void __cdecl exit( _In_ int _Code );
 #else
 	void exit( int status_code ) NV_NORETURN;