diff --git a/code/ASEParser.h b/code/ASEParser.h
index 48f475c78..221223bcb 100644
--- a/code/ASEParser.h
+++ b/code/ASEParser.h
@@ -556,6 +556,7 @@ public:
 };
 
 
-};};
+} // Namespace ASE
+} // Namespace ASSIMP
 
 #endif // !! include guard
diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index 34ad0a45b..176efae68 100644
--- a/code/ByteSwap.h
+++ b/code/ByteSwap.h
@@ -136,7 +136,8 @@ public:
 		Swap8(fOut);
 	}
 };
-};
+
+} // Namespace Assimp
 
 // byteswap macros for BigEndian/LittleEndian support 
 #if (defined AI_BUILD_BIG_ENDIAN)
diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h
index 5ae9ed2a5..18d71e5dc 100644
--- a/code/GenVertexNormalsProcess.h
+++ b/code/GenVertexNormalsProcess.h
@@ -45,7 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/aiMesh.h"
+
 class GenNormalsTest;
+
 namespace Assimp {
 
 // ---------------------------------------------------------------------------
@@ -102,6 +104,6 @@ private:
 	float configMaxAngle;
 };
 
-}; // end of namespace Assimp
+} // end of namespace Assimp
 
-#endif // !!AI_GENVERTEXNORMALPROCESS_H_INC
\ No newline at end of file
+#endif // !!AI_GENVERTEXNORMALPROCESS_H_INC
diff --git a/code/HMPLoader.h b/code/HMPLoader.h
index 2633b08eb..203784c82 100644
--- a/code/HMPLoader.h
+++ b/code/HMPLoader.h
@@ -152,8 +152,8 @@ protected:
 
 private:
 
-
 };
-}; // end of namespace Assimp
 
-#endif // AI_HMPIMPORTER_H_INC
\ No newline at end of file
+} // end of namespace Assimp
+
+#endif // AI_HMPIMPORTER_H_INC
diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h
index 7e0aa4ff2..00e1c248e 100644
--- a/code/HalfLifeFileData.h
+++ b/code/HalfLifeFileData.h
@@ -142,5 +142,7 @@ struct Header_HL2
 
 #include "./Compiler/poppack1.h"
 
-};}; // end namespaces
-#endif // ! AI_MDLFILEHELPER2_H_INC
\ No newline at end of file
+}
+} // end namespaces
+
+#endif // ! AI_MDLFILEHELPER2_H_INC
diff --git a/code/KillNormalsProcess.h b/code/KillNormalsProcess.h
index ab3d3b1e2..ab6710b22 100644
--- a/code/KillNormalsProcess.h
+++ b/code/KillNormalsProcess.h
@@ -81,6 +81,7 @@ public:
 private:
 	bool KillMeshNormals (aiMesh* pcMesh);
 };
-}; // end of namespace Assimp
 
-#endif // !!AI_KILLNORMALPROCESS_H_INC
\ No newline at end of file
+} // end of namespace Assimp
+
+#endif // !!AI_KILLNORMALPROCESS_H_INC
diff --git a/code/MD2FileData.h b/code/MD2FileData.h
index cbca9b7a5..5d7e94b0c 100644
--- a/code/MD2FileData.h
+++ b/code/MD2FileData.h
@@ -163,7 +163,7 @@ struct Skin
 void LookupNormalIndex(uint8_t index,aiVector3D& vOut);
 
 
-};
-};
+}
+}
 
-#endif // !! include guard
\ No newline at end of file
+#endif // !! include guard
diff --git a/code/MD3FileData.h b/code/MD3FileData.h
index 36f5168c4..40f447d2c 100644
--- a/code/MD3FileData.h
+++ b/code/MD3FileData.h
@@ -294,7 +294,7 @@ inline void Vec3NormalToLatLng( const aiVector3D& p_vIn, uint16_t& p_iOut )
 	}
 }
 
-};
-};
+}
+}
 
 #endif // !! AI_MD3FILEHELPER_H_INC
diff --git a/code/MDCLoader.h b/code/MDCLoader.h
index c31affbc6..e394c2abf 100644
--- a/code/MDCLoader.h
+++ b/code/MDCLoader.h
@@ -129,4 +129,4 @@ protected:
 
 } // end of namespace Assimp
 
-#endif // AI_3DSIMPORTER_H_INC
\ No newline at end of file
+#endif // AI_3DSIMPORTER_H_INC
diff --git a/code/MDLFileData.h b/code/MDLFileData.h
index d4910e198..be0eed673 100644
--- a/code/MDLFileData.h
+++ b/code/MDLFileData.h
@@ -142,7 +142,7 @@ struct Header
 	int32_t num_skins;       
 
 	//! Texture width in pixels
-	int32_t skinwidth;        
+	int32_t skinwidth;
 
 	//! Texture height in pixels
 	int32_t skinheight;       
@@ -959,6 +959,7 @@ struct IntSplittedGroupData_MDL7
 };
 
 
-};}; // end namespaces
+}
+} // end namespaces
 
-#endif // !! AI_MDLFILEHELPER_H_INC
\ No newline at end of file
+#endif // !! AI_MDLFILEHELPER_H_INC
diff --git a/code/MDLLoader.h b/code/MDLLoader.h
index b62e467ba..62e3bf0b2 100644
--- a/code/MDLLoader.h
+++ b/code/MDLLoader.h
@@ -461,6 +461,7 @@ protected:
 	 */
 	unsigned int iFileSize;
 };
-}; // end of namespace Assimp
 
-#endif // AI_3DSIMPORTER_H_INC
\ No newline at end of file
+} // end of namespace Assimp
+
+#endif // AI_3DSIMPORTER_H_INC
diff --git a/code/PlyParser.h b/code/PlyParser.h
index 617b7f511..914bf28d5 100644
--- a/code/PlyParser.h
+++ b/code/PlyParser.h
@@ -551,8 +551,8 @@ TYPE PLY::PropertyInstance::ConvertTo(
 	};
 	return (TYPE)0;
 }
-};
 
-};
+} // Namespace PLY
+} // Namespace AssImp
 
-#endif // !! include guard
\ No newline at end of file
+#endif // !! include guard
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index eab3c7b85..b08a9aacb 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -86,4 +86,4 @@ public:
 };
 } // ! Assimp
 
-#endif // !! AI_REMOVE_COMMENTS_H_INC
\ No newline at end of file
+#endif // !! AI_REMOVE_COMMENTS_H_INC
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index 82e8144e5..4578ddb31 100644
--- a/code/RemoveRedundantMaterials.h
+++ b/code/RemoveRedundantMaterials.h
@@ -80,6 +80,7 @@ public:
 	*/
 	void Execute( aiScene* pScene);
 };
-}; // end of namespace Assimp
 
-#endif // !!AI_REMOVEREDUNDANTMATERIALS_H_INC
\ No newline at end of file
+} // end of namespace Assimp
+
+#endif // !!AI_REMOVEREDUNDANTMATERIALS_H_INC
diff --git a/code/SMDLoader.h b/code/SMDLoader.h
index 0c469f881..f91ccf85d 100644
--- a/code/SMDLoader.h
+++ b/code/SMDLoader.h
@@ -166,7 +166,7 @@ struct Bone
 	bool bIsUsed;
 };
 
-}; //! namespace SMD
+} //! namespace SMD
 
 // ---------------------------------------------------------------------------
 /** Used to load Half-life 1 and 2 SMD models
@@ -416,6 +416,7 @@ private:
 	unsigned int iLineNumber;
 
 };
-}; // end of namespace Assimp
 
-#endif // AI_SMDIMPORTER_H_INC
\ No newline at end of file
+} // end of namespace Assimp
+
+#endif // AI_SMDIMPORTER_H_INC
diff --git a/code/SpatialSort.h b/code/SpatialSort.h
index da19797eb..fbaf8a7f9 100644
--- a/code/SpatialSort.h
+++ b/code/SpatialSort.h
@@ -97,7 +97,7 @@ protected:
 
 		Entry() { /** intentionally not initialized.*/ }
 		Entry( unsigned int pIndex, const aiVector3D& pPosition, float pDistance) 
-			: mPosition( pPosition), mIndex( pIndex), mDistance( pDistance)
+			: mIndex( pIndex), mPosition( pPosition), mDistance( pDistance)
 		{ 	}
 
 		bool operator < (const Entry& e) const { return mDistance < e.mDistance; }
@@ -109,4 +109,4 @@ protected:
 
 } // end of namespace Assimp
 
-#endif // AI_SPATIALSORT_H_INC
\ No newline at end of file
+#endif // AI_SPATIALSORT_H_INC
diff --git a/code/TextureTransform.h b/code/TextureTransform.h
index 8efbdf8f4..2f4b96fe8 100644
--- a/code/TextureTransform.h
+++ b/code/TextureTransform.h
@@ -202,6 +202,6 @@ public:
 		const Dot3DS::Material* pcMatIn);
 };
 
-};
+}
 
-#endif //! AI_TEXTURE_TRANSFORM_H_INCLUDED
\ No newline at end of file
+#endif //! AI_TEXTURE_TRANSFORM_H_INCLUDED
diff --git a/include/aiMaterial.h b/include/aiMaterial.h
index 269972741..d26bf0bdf 100644
--- a/include/aiMaterial.h
+++ b/include/aiMaterial.h
@@ -76,7 +76,7 @@ enum aiPropertyTypeInfo
 
     /** Simple binary buffer
     */
-    aiPTI_Buffer = 0x5,
+    aiPTI_Buffer = 0x5
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/aiPostProcess.h b/include/aiPostProcess.h
index c9ccdca07..8258aec98 100644
--- a/include/aiPostProcess.h
+++ b/include/aiPostProcess.h
@@ -173,7 +173,7 @@ enum aiPostProcessSteps
 	 * The step inverts all infacing normals. Generally it is recommended
 	 * to enable this step.
 	*/
-	aiProcess_FixInfacingNormals = 0x2000,
+	aiProcess_FixInfacingNormals = 0x2000
 };
 
 
diff --git a/include/assimp.hpp b/include/assimp.hpp
index 5848d87cb..62ce25884 100644
--- a/include/assimp.hpp
+++ b/include/assimp.hpp
@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp
 {
 	class Importer;
-};
+}
 
 // internal ASSIMP headers - for plugin development
 #include "./../code/BaseImporter.h"