diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//CMakeLists.txt opencollada-9999//CMakeLists.txt
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//CMakeLists.txt	2011-10-02 21:52:37.516882396 +0200
+++ opencollada-9999//CMakeLists.txt	2011-10-02 21:42:47.785882579 +0200
@@ -14,6 +14,7 @@
 
 IF (NOT WIN32)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	add_definitions("-D_wfopen=fopen" "-D_ftelli64=ftell" "-D_fseeki64=fseek" "-D__int64=int64_t")
 ENDIF (NOT WIN32)
 
 OPTION(USE_STATIC "Build static libraries" ON)
@@ -66,10 +67,10 @@
 ENDIF (PCRE_FOUND)
 
 #building required libs
-ADD_SUBDIRECTORY(common/libftoa)
-ADD_SUBDIRECTORY(common/libBuffer)	
 ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/UTF)
 ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ADD_SUBDIRECTORY(common/libftoa)
+ADD_SUBDIRECTORY(common/libBuffer)	
 
 #building OpenCOLLADA libs
 ADD_SUBDIRECTORY(COLLADABaseUtils)
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h	2011-10-02 21:52:37.519882396 +0200
+++ opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h	2011-10-02 21:47:39.706882488 +0200
@@ -13,7 +13,6 @@
 
 #include "COLLADABUMathVector3.h"
 #include "COLLADABUMathMatrix3.h"
-#include "COLLADABUMathUtils.h"
 
 namespace COLLADABU
 {
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//bin/OpenCOLLADAValidator and opencollada-9999//bin/OpenCOLLADAValidator differ
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/CMakeLists.txt opencollada-9999//common/libBuffer/CMakeLists.txt
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/CMakeLists.txt	2011-10-02 21:52:38.039882396 +0200
+++ opencollada-9999//common/libBuffer/CMakeLists.txt	2011-10-02 21:42:17.274882588 +0200
@@ -20,7 +20,7 @@
 
 SET(libBuffer_libs ftoa)
 
-INCLUDE_DIRECTORIES(${libBuffer_include_dirs} ${libftoa_include_dirs})
+INCLUDE_DIRECTORIES(${libBuffer_include_dirs} ${libUTF_include_dirs} ${libftoa_include_dirs})
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
 
 IF (USE_STATIC)
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonBuffer.h opencollada-9999//common/libBuffer/include/CommonBuffer.h
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonBuffer.h	2011-10-02 21:52:38.039882396 +0200
+++ opencollada-9999//common/libBuffer/include/CommonBuffer.h	2011-10-02 21:39:59.802882631 +0200
@@ -11,6 +11,8 @@
 #ifndef __COMMON_BUFFER_H__
 #define __COMMON_BUFFER_H__
 
+#include <cstdlib>
+
 #include "CommonIBufferFlusher.h"
 
 namespace Common
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h	2011-10-02 21:52:38.040882396 +0200
+++ opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h	2011-10-02 21:44:54.924882539 +0200
@@ -11,12 +11,16 @@
 #ifndef __COMMON_FWRITEBUFFERFLUSHER_H__
 #define __COMMON_FWRITEBUFFERFLUSHER_H__
 
+#include <cstdlib>
+#include <cstdio>
+#include <cerrno>
+
 #include "CommonIBufferFlusher.h"
 
 #if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) || (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
-#	include <unordered_map>
+#	include <unordered_map>
 #else
-#	include <tr1/unordered_map>
+#	include <tr1/unordered_map>
 #endif
 
 
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h	2011-10-02 21:52:38.040882396 +0200
+++ opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h	2011-10-02 21:43:28.628882566 +0200
@@ -11,6 +11,8 @@
 #ifndef __COMMON_IBUFFERFLUSHER_H__
 #define __COMMON_IBUFFERFLUSHER_H__
 
+#include <cstdlib>
+
 namespace Common
 {
 	/** Derived classes of this interface are used by Buffer.*/
diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp
--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp	2011-10-02 21:52:38.041882396 +0200
+++ opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp	2011-10-02 21:47:05.885882499 +0200
@@ -35,12 +35,6 @@
 	FWriteBufferFlusher::FWriteBufferFlusher( const wchar_t* fileName, size_t bufferSize, const wchar_t* mode/*=L"wb"*/ )
 		: mBufferSize(bufferSize)
 		, mBuffer( new char[bufferSize] )
-#ifdef _WIN32
-		, mError( (int)_wfopen_s( &mStream, fileName, mode ) )
-#else
-		, mStream(_wfopen( fileName, mode ))
-		, mError( mStream ? 0 : errno )
-#endif
 		, mLastMarkId(END_OF_STREAM)
 		, mMarkIds()
 	{
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libGeneratedSaxParser.a and opencollada-9999//lib/libGeneratedSaxParser.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libMathMLSolver.a and opencollada-9999//lib/libMathMLSolver.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADABaseUtils.a and opencollada-9999//lib/libOpenCOLLADABaseUtils.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADAFramework.a and opencollada-9999//lib/libOpenCOLLADAFramework.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADASaxFrameworkLoader.a and opencollada-9999//lib/libOpenCOLLADASaxFrameworkLoader.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADAStreamWriter.a and opencollada-9999//lib/libOpenCOLLADAStreamWriter.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libUTF.a and opencollada-9999//lib/libUTF.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libbuffer.a and opencollada-9999//lib/libbuffer.a differ
Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libftoa.a and opencollada-9999//lib/libftoa.a differ