diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index d7473e4d0..68e2cd765 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -222,7 +222,7 @@ private:
 
 			const MeshGeometry* const mesh = dynamic_cast<const MeshGeometry*>(geo);
 			if(mesh) {
-				std::vector<unsigned int>& indices = ConvertMesh(*mesh, model);
+				const std::vector<unsigned int>& indices = ConvertMesh(*mesh, model);
 				std::copy(indices.begin(),indices.end(),std::back_inserter(meshes) );
 			}
 			else {
diff --git a/code/FBXProperties.h b/code/FBXProperties.h
index 62af59a6b..5e386444d 100644
--- a/code/FBXProperties.h
+++ b/code/FBXProperties.h
@@ -143,7 +143,7 @@ inline T PropertyGet(const PropertyTable& in, const std::string& name,
 	const T& defaultValue, 
 	bool ignoreTemplate = false)
 {
-	const Property* const prop = PropertyGet(in,name);
+	const Property* const prop = in.Get(name);
 	if(!prop) {
 		return defaultValue;
 	}
diff --git a/code/FBXUtil.h b/code/FBXUtil.h
index 89b213732..b2651181e 100644
--- a/code/FBXUtil.h
+++ b/code/FBXUtil.h
@@ -46,12 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 #include "FBXCompileConfig.h"
+#include "FBXTokenizer.h"
 
 namespace Assimp {
 namespace FBX {
 
-	class Token;
-	enum TokenType;
 
 namespace Util {