diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index 6d3594eaa..775add800 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -106,7 +106,7 @@ private:
  * imports the given file. ReadFile is not overridable, it just calls 
  * InternReadFile() and catches any ImportErrorException that might occur.
  */
-class BaseImporter
+class ASSIMP_API BaseImporter
 {
 	friend class Importer;
 
diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h
index b63cdd600..c82e10976 100644
--- a/code/FindDegenerates.h
+++ b/code/FindDegenerates.h
@@ -53,7 +53,7 @@ namespace Assimp	{
 // ---------------------------------------------------------------------------
 /** FindDegeneratesProcess: Searches a mesh for degenerated triangles.
 */
-class FindDegeneratesProcess : public BaseProcess
+class ASSIMP_API FindDegeneratesProcess : public BaseProcess
 {
 public:
 
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index 4f9f6259e..8b47a65a8 100644
--- a/code/FindInvalidDataProcess.h
+++ b/code/FindInvalidDataProcess.h
@@ -51,13 +51,12 @@ class FindInvalidDataProcessTest;
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
-/** The FindInvalidData postprocessing step. It searches the mesh data
+/** The FindInvalidData post-processing step. It searches the mesh data
  *  for parts that are obviously invalid and removes them.
  *
  *  Originally this was a workaround for some models written by Blender
  *  which have zero normal vectors. */
-class FindInvalidDataProcess 
-	: public BaseProcess
+class ASSIMP_API FindInvalidDataProcess : public BaseProcess
 {
 public:
 
diff --git a/code/LimitBoneWeightsProcess.h b/code/LimitBoneWeightsProcess.h
index 59d04d500..dbb3d4d80 100644
--- a/code/LimitBoneWeightsProcess.h
+++ b/code/LimitBoneWeightsProcess.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseProcess.h"
 
 struct aiMesh;
+
 class LimitBoneWeightsTest;
 
 namespace Assimp
@@ -69,7 +70,7 @@ namespace Assimp
 * The other weights on this bone are then renormalized to assure the sum weight
 * to be 1.
 */
-class LimitBoneWeightsProcess : public BaseProcess
+class ASSIMP_API LimitBoneWeightsProcess : public BaseProcess
 {
 public:
 
diff --git a/code/OgreParsingUtils.h b/code/OgreParsingUtils.h
index dfe655571..ac1e58173 100644
--- a/code/OgreParsingUtils.h
+++ b/code/OgreParsingUtils.h
@@ -7,7 +7,7 @@
 #include "ParsingUtils.h"
 #include "irrXMLWrapper.h"
 #include "fast_atof.h"
-
+#include <functional>
 namespace Assimp
 {
 namespace Ogre
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index b1b42c00e..f69875587 100644
--- a/code/PretransformVertices.h
+++ b/code/PretransformVertices.h
@@ -52,11 +52,11 @@ class PretransformVerticesTest;
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
-/** The PretransformVertices pretransforms all vertices in the nodegraph
+/** The PretransformVertices pre-transforms all vertices in the node tree
  *  and removes the whole graph. The output is a list of meshes, one for
  *  each material.
 */
-class PretransformVertices : public BaseProcess
+class ASSIMP_API PretransformVertices : public BaseProcess
 {
 public:
 
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index 8b8185fcb..fd372618b 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -55,7 +55,7 @@ namespace Assimp	{
  *  to those in C or C++ so this code has been moved to a separate
  *  module.
  */
-class CommentRemover
+class ASSIMP_API CommentRemover
 {
 	// class cannot be instanced
 	CommentRemover() {}
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index 07496b489..e2874900f 100644
--- a/code/RemoveRedundantMaterials.h
+++ b/code/RemoveRedundantMaterials.h
@@ -51,10 +51,10 @@ class RemoveRedundantMatsTest;
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
-/** RemoveRedundantMatsProcess: Postprocessing steo to remove redundant 
+/** RemoveRedundantMatsProcess: Post-processing step to remove redundant 
  *  materials from the imported scene.
  */
-class RemoveRedundantMatsProcess : public BaseProcess
+class ASSIMP_API RemoveRedundantMatsProcess : public BaseProcess
 {
 public:
 
diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h
index 79cc0fbea..07afdb876 100644
--- a/code/RemoveVCProcess.h
+++ b/code/RemoveVCProcess.h
@@ -46,17 +46,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/mesh.h"
 
 class RemoveVCProcessTest;
-namespace Assimp	{
+
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** RemoveVCProcess: Class to exclude specific parts of the data structure
  *  from further processing by removing them,
 */
-class RemoveVCProcess : public BaseProcess
+class ASSIMP_API RemoveVCProcess : public BaseProcess
 {
 public:
-
+    /// The class constructor.
 	RemoveVCProcess();
+
+    /// The class destructor.
 	~RemoveVCProcess();
 
 public:
@@ -85,7 +88,7 @@ public:
 	// -------------------------------------------------------------------
 	/** Manually setup the configuration flags for the step
 	 *
-	 *  @param Bitwise combintion of the #aiComponent enumerated values.
+	 *  @param Bitwise combination of the #aiComponent enumerated values.
 	*/
 	void SetDeleteFlags(unsigned int f)	
 	{
@@ -113,6 +116,8 @@ private:
 	aiScene* mScene;
 };
 
+// ---------------------------------------------------------------------------
+
 } // end of namespace Assimp
 
 #endif // !!AI_REMOVEVCPROCESS_H_INCLUDED
diff --git a/code/ScenePreprocessor.h b/code/ScenePreprocessor.h
index 700fd10d3..062c069b7 100644
--- a/code/ScenePreprocessor.h
+++ b/code/ScenePreprocessor.h
@@ -54,7 +54,7 @@ namespace Assimp	{
  *  importer, such as aiMesh::mPrimitiveTypes.
 */
 // ----------------------------------------------------------------------------------
-class ScenePreprocessor
+class ASSIMP_API ScenePreprocessor
 {
 	// Make ourselves a friend of the corresponding test unit.
 	friend class ::ScenePreprocessorTest;
diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h
index 556dd2038..b3d66ff39 100644
--- a/code/SortByPTypeProcess.h
+++ b/code/SortByPTypeProcess.h
@@ -55,7 +55,7 @@ namespace Assimp	{
  *  A mesh with 5 lines, 3 points and 145 triangles would be split in 3 
  * submeshes.
 */
-class SortByPTypeProcess : public BaseProcess
+class ASSIMP_API SortByPTypeProcess : public BaseProcess
 {
 public:
 
diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h
index 8623150d2..c64ba8e2f 100644
--- a/code/SplitLargeMeshes.h
+++ b/code/SplitLargeMeshes.h
@@ -76,12 +76,12 @@ class SplitLargeMeshesProcess_Vertex;
 #endif
 
 // ---------------------------------------------------------------------------
-/** Postprocessing filter to split large meshes into submeshes
+/** Post-processing filter to split large meshes into sub-meshes
  *
  * Applied BEFORE the JoinVertices-Step occurs.
  * Returns NON-UNIQUE vertices, splits by triangle number.
 */
-class SplitLargeMeshesProcess_Triangle : public BaseProcess
+class ASSIMP_API SplitLargeMeshesProcess_Triangle : public BaseProcess
 {
 	friend class SplitLargeMeshesProcess_Vertex;
 
@@ -144,12 +144,12 @@ public:
 
 
 // ---------------------------------------------------------------------------
-/** Postprocessing filter to split large meshes into submeshes
+/** Post-processing filter to split large meshes into sub-meshes
  *
  * Applied AFTER the JoinVertices-Step occurs.
  * Returns UNIQUE vertices, splits by vertex number.
 */
-class SplitLargeMeshesProcess_Vertex : public BaseProcess
+class ASSIMP_API SplitLargeMeshesProcess_Vertex : public BaseProcess
 {
 public:
 
diff --git a/code/TriangulateProcess.h b/code/TriangulateProcess.h
index ae9039df3..186160f3b 100644
--- a/code/TriangulateProcess.h
+++ b/code/TriangulateProcess.h
@@ -49,15 +49,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 struct aiMesh;
 
 class TriangulateProcessTest;
-namespace Assimp
-{
+
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** The TriangulateProcess splits up all faces with more than three indices
  * into triangles. You usually want this to happen because the graphics cards
  * need their data as triangles.
  */
-class TriangulateProcess : public BaseProcess
+class ASSIMP_API TriangulateProcess : public BaseProcess
 {
 public:
 
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index aa9517a9b..d2341e973 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -56,7 +56,7 @@ namespace Assimp	{
  *  @note Although it is called #VertexTriangleAdjacency, the current version does also
  *    support arbitrary polygons. */
 // --------------------------------------------------------------------------------------------
-class VertexTriangleAdjacency
+class ASSIMP_API VertexTriangleAdjacency
 {
 public: