diff --git a/es-core/src/math/Misc.h b/es-core/src/math/Misc.h
index a571796f1..ea07e2e7e 100644
--- a/es-core/src/math/Misc.h
+++ b/es-core/src/math/Misc.h
@@ -29,7 +29,7 @@ namespace Math
 		float bounce(const float _delayTime, const float _scrollTime, const float _currentTime, const float _scrollLength);
 		float loop  (const float _delayTime, const float _scrollTime, const float _currentTime, const float _scrollLength);
 
-	} // Math::Scroll::
+	} // Scroll::
 
 } // Math::
 
diff --git a/es-core/src/math/Vector2f.h b/es-core/src/math/Vector2f.h
index 061684284..b9c91fda0 100644
--- a/es-core/src/math/Vector2f.h
+++ b/es-core/src/math/Vector2f.h
@@ -46,10 +46,10 @@ public:
 	      float&   operator[](const int _index)             { assert(_index < 2 && "index out of range"); return (&mX)[_index]; }
 	const float&   operator[](const int _index) const       { assert(_index < 2 && "index out of range"); return (&mX)[_index]; }
 
-	      float& x()       { return mX; }
-	      float& y()       { return mY; }
-	const float& x() const { return mX; }
-	const float& y() const { return mY; }
+	inline       float& x()       { return mX; }
+	inline       float& y()       { return mY; }
+	inline const float& x() const { return mX; }
+	inline const float& y() const { return mY; }
 
 	Vector2f& round();
 	Vector2f& lerp (const Vector2f& _start, const Vector2f& _end, const float _fraction);
diff --git a/es-core/src/math/Vector2i.h b/es-core/src/math/Vector2i.h
index 7cc020ea5..0c91a1155 100644
--- a/es-core/src/math/Vector2i.h
+++ b/es-core/src/math/Vector2i.h
@@ -40,10 +40,10 @@ public:
 	      int&     operator[](const int _index)             { assert(_index < 2 && "index out of range"); return (&mX)[_index]; }
 	const int&     operator[](const int _index) const       { assert(_index < 2 && "index out of range"); return (&mX)[_index]; }
 
-	      int& x()       { return mX; }
-	      int& y()       { return mY; }
-	const int& x() const { return mX; }
-	const int& y() const { return mY; }
+	inline       int& x()       { return mX; }
+	inline       int& y()       { return mY; }
+	inline const int& x() const { return mX; }
+	inline const int& y() const { return mY; }
 
 	static const Vector2i Zero () { return { 0, 0 }; }
 	static const Vector2i UnitX() { return { 1, 0 }; }
diff --git a/es-core/src/math/Vector3f.h b/es-core/src/math/Vector3f.h
index c6237bc2c..8126e70d2 100644
--- a/es-core/src/math/Vector3f.h
+++ b/es-core/src/math/Vector3f.h
@@ -47,12 +47,12 @@ public:
 	      float&   operator[](const int _index)             { assert(_index < 3 && "index out of range"); return (&mX)[_index]; }
 	const float&   operator[](const int _index) const       { assert(_index < 3 && "index out of range"); return (&mX)[_index]; }
 
-	      float& x()       { return mX; }
-	      float& y()       { return mY; }
-	      float& z()       { return mZ; }
-	const float& x() const { return mX; }
-	const float& y() const { return mY; }
-	const float& z() const { return mZ; }
+	inline       float& x()       { return mX; }
+	inline       float& y()       { return mY; }
+	inline       float& z()       { return mZ; }
+	inline const float& x() const { return mX; }
+	inline const float& y() const { return mY; }
+	inline const float& z() const { return mZ; }
 
 	inline       Vector2f& v2()       { return *(Vector2f*)this; }
 	inline const Vector2f& v2() const { return *(Vector2f*)this; }
diff --git a/es-core/src/math/Vector4f.h b/es-core/src/math/Vector4f.h
index 518c1450b..1776c80fe 100644
--- a/es-core/src/math/Vector4f.h
+++ b/es-core/src/math/Vector4f.h
@@ -49,14 +49,14 @@ public:
 	      float&   operator[](const int _index)             { assert(_index < 4 && "index out of range"); return (&mX)[_index]; }
 	const float&   operator[](const int _index) const       { assert(_index < 4 && "index out of range"); return (&mX)[_index]; }
 
-	      float& x()       { return mX; }
-	      float& y()       { return mY; }
-	      float& z()       { return mZ; }
-	      float& w()       { return mW; }
-	const float& x() const { return mX; }
-	const float& y() const { return mY; }
-	const float& z() const { return mZ; }
-	const float& w() const { return mW; }
+	inline       float& x()       { return mX; }
+	inline       float& y()       { return mY; }
+	inline       float& z()       { return mZ; }
+	inline       float& w()       { return mW; }
+	inline const float& x() const { return mX; }
+	inline const float& y() const { return mY; }
+	inline const float& z() const { return mZ; }
+	inline const float& w() const { return mW; }
 
 	inline       Vector2f& v2()       { return *(Vector2f*)this; }
 	inline const Vector2f& v2() const { return *(Vector2f*)this; }