diff --git a/include/aiVector2D.h b/include/aiVector2D.h
index 5e60a9da6..640e05104 100644
--- a/include/aiVector2D.h
+++ b/include/aiVector2D.h
@@ -96,8 +96,8 @@ typedef aiVector2t<float> aiVector2D;
 
 #else
 
-struct aiVector2t {
-	TReal x,y;
+struct aiVector2D {
+	float x,y;
 };
 
 #endif // __cplusplus
diff --git a/include/aiVector3D.h b/include/aiVector3D.h
index 8326cd5e0..6ff94ea42 100644
--- a/include/aiVector3D.h
+++ b/include/aiVector3D.h
@@ -127,7 +127,7 @@ typedef aiVector3t<float> aiVector3D;
 
 struct aiVector3D {
 
-	float x,y,y;
+	float x,y,z;
 } PACK_STRUCT;
 
 #endif // __cplusplus
diff --git a/include/assimp.h b/include/assimp.h
index 32d43cdc7..44411627e 100644
--- a/include/assimp.h
+++ b/include/assimp.h
@@ -81,7 +81,7 @@ struct aiLogStream
  *  @see aiSetPropertyString
  */
 // --------------------------------------------------------------------------------
-struct aiPropertyStore {};
+struct aiPropertyStore { char sentinel; };
 
 /** Our own C boolean type */
 typedef int aiBool;
@@ -344,7 +344,7 @@ ASSIMP_API C_STRUCT aiPropertyStore* aiCreatePropertyStore(void);
 /** Delete a property store.
  * @param p Property store to be deleted.
  */
-ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p);
+ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
 
 // --------------------------------------------------------------------------------
 /** Set an integer property. 
@@ -358,7 +358,7 @@ ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p);
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyInteger(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName, 
 	int value);
 
@@ -374,7 +374,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyFloat(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName,
 	float value);
 
@@ -391,7 +391,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyString(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName,
 	const C_STRUCT aiString* st);