diff --git a/src/lib/sw_engine/tvgSwCommon.h b/src/lib/sw_engine/tvgSwCommon.h
index 37a40c57..f90f44bb 100644
--- a/src/lib/sw_engine/tvgSwCommon.h
+++ b/src/lib/sw_engine/tvgSwCommon.h
@@ -23,6 +23,7 @@
 #define _TVG_SW_COMMON_H_
 
 #include "tvgCommon.h"
+#include "tvgRender.h"
 
 #ifdef THORVG_AVX_VECTOR_SUPPORT
     #include <immintrin.h>
diff --git a/src/lib/sw_engine/tvgSwFill.cpp b/src/lib/sw_engine/tvgSwFill.cpp
index ecb33947..c4213717 100644
--- a/src/lib/sw_engine/tvgSwFill.cpp
+++ b/src/lib/sw_engine/tvgSwFill.cpp
@@ -19,6 +19,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <float.h>
+#include <math.h>
 #include "tvgSwCommon.h"
 
 
diff --git a/src/lib/sw_engine/tvgSwRaster.cpp b/src/lib/sw_engine/tvgSwRaster.cpp
index 7b5b9868..d75bc2b1 100644
--- a/src/lib/sw_engine/tvgSwRaster.cpp
+++ b/src/lib/sw_engine/tvgSwRaster.cpp
@@ -20,6 +20,7 @@
  * SOFTWARE.
  */
 #include "tvgSwCommon.h"
+#include "tvgRender.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/sw_engine/tvgSwRenderer.cpp b/src/lib/sw_engine/tvgSwRenderer.cpp
index ff1055f4..8c6ee95f 100644
--- a/src/lib/sw_engine/tvgSwRenderer.cpp
+++ b/src/lib/sw_engine/tvgSwRenderer.cpp
@@ -20,6 +20,7 @@
  * SOFTWARE.
  */
 #include "tvgSwCommon.h"
+#include "tvgTaskScheduler.h"
 #include "tvgSwRenderer.h"
 
 /************************************************************************/
diff --git a/src/lib/sw_engine/tvgSwRenderer.h b/src/lib/sw_engine/tvgSwRenderer.h
index 016e4444..5b399900 100644
--- a/src/lib/sw_engine/tvgSwRenderer.h
+++ b/src/lib/sw_engine/tvgSwRenderer.h
@@ -22,6 +22,9 @@
 #ifndef _TVG_SW_RENDERER_H_
 #define _TVG_SW_RENDERER_H_
 
+#include <vector>
+#include "tvgRender.h"
+
 struct SwSurface;
 struct SwTask;
 
diff --git a/src/lib/sw_engine/tvgSwRle.cpp b/src/lib/sw_engine/tvgSwRle.cpp
index 545237d9..de20d617 100644
--- a/src/lib/sw_engine/tvgSwRle.cpp
+++ b/src/lib/sw_engine/tvgSwRle.cpp
@@ -22,6 +22,7 @@
 #include <setjmp.h>
 #include <limits.h>
 #include <memory.h>
+
 #include "tvgSwCommon.h"
 
 /************************************************************************/
diff --git a/src/lib/sw_engine/tvgSwShape.cpp b/src/lib/sw_engine/tvgSwShape.cpp
index 49bcd12b..0c6391c5 100644
--- a/src/lib/sw_engine/tvgSwShape.cpp
+++ b/src/lib/sw_engine/tvgSwShape.cpp
@@ -19,7 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <math.h>
 #include "tvgSwCommon.h"
+#include "tvgBezier.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/sw_engine/tvgSwStroke.cpp b/src/lib/sw_engine/tvgSwStroke.cpp
index e87ec4c6..9f2dfe19 100644
--- a/src/lib/sw_engine/tvgSwStroke.cpp
+++ b/src/lib/sw_engine/tvgSwStroke.cpp
@@ -19,6 +19,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <string.h>
+#include <math.h>
 #include "tvgSwCommon.h"
 
 
diff --git a/src/lib/tvgBezier.cpp b/src/lib/tvgBezier.cpp
index db4d58be..4129e719 100644
--- a/src/lib/tvgBezier.cpp
+++ b/src/lib/tvgBezier.cpp
@@ -19,8 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
-
+#include <float.h>
+#include <math.h>
+#include "tvgBezier.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/tvgBezier.h b/src/lib/tvgBezier.h
index df21719d..89c80497 100644
--- a/src/lib/tvgBezier.h
+++ b/src/lib/tvgBezier.h
@@ -22,6 +22,8 @@
 #ifndef _TVG_BEZIER_H_
 #define _TVG_BEZIER_H_
 
+#include "tvgCommon.h"
+
 namespace tvg
 {
 
diff --git a/src/lib/tvgCanvas.cpp b/src/lib/tvgCanvas.cpp
index 0720e048..eb08768e 100644
--- a/src/lib/tvgCanvas.cpp
+++ b/src/lib/tvgCanvas.cpp
@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
 #include "tvgCanvasImpl.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgCanvasImpl.h b/src/lib/tvgCanvasImpl.h
index 81312849..e2de0333 100644
--- a/src/lib/tvgCanvasImpl.h
+++ b/src/lib/tvgCanvasImpl.h
@@ -22,6 +22,7 @@
 #ifndef _TVG_CANVAS_IMPL_H_
 #define _TVG_CANVAS_IMPL_H_
 
+#include <vector>
 #include "tvgPaint.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgCommon.h b/src/lib/tvgCommon.h
index ecacc828..5eb57439 100644
--- a/src/lib/tvgCommon.h
+++ b/src/lib/tvgCommon.h
@@ -23,15 +23,6 @@
 #define _TVG_COMMON_H_
 
 #include "config.h"
-
-#include <iostream>
-#include <vector>
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <memory>
-#include <future>
-
 #include "thorvg.h"
 
 using namespace std;
@@ -42,10 +33,4 @@ using namespace tvg;
 
 #define TVG_UNUSED __attribute__ ((__unused__))
 
-#include "tvgBezier.h"
-#include "tvgLoader.h"
-#include "tvgLoaderMgr.h"
-#include "tvgRender.h"
-#include "tvgTaskScheduler.h"
-
 #endif //_TVG_COMMON_H_
diff --git a/src/lib/tvgFill.h b/src/lib/tvgFill.h
index 5036337d..a0db5847 100644
--- a/src/lib/tvgFill.h
+++ b/src/lib/tvgFill.h
@@ -22,6 +22,7 @@
 #ifndef _TVG_FILL_H_
 #define _TVG_FILL_H_
 
+#include <string.h>
 #include "tvgCommon.h"
 
 template<typename T>
diff --git a/src/lib/tvgGlCanvas.cpp b/src/lib/tvgGlCanvas.cpp
index 85bcd1d4..416ed447 100644
--- a/src/lib/tvgGlCanvas.cpp
+++ b/src/lib/tvgGlCanvas.cpp
@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
 #include "tvgCanvasImpl.h"
 
 #ifdef THORVG_GL_RASTER_SUPPORT
diff --git a/src/lib/tvgInitializer.cpp b/src/lib/tvgInitializer.cpp
index 7dcc8b91..bc0a65fb 100644
--- a/src/lib/tvgInitializer.cpp
+++ b/src/lib/tvgInitializer.cpp
@@ -20,6 +20,7 @@
  * SOFTWARE.
  */
 #include "tvgCommon.h"
+#include "tvgTaskScheduler.h"
 #include "tvgLoaderMgr.h"
 
 #ifdef THORVG_SW_RASTER_SUPPORT
diff --git a/src/lib/tvgLinearGradient.cpp b/src/lib/tvgLinearGradient.cpp
index f647d449..ffd9a00d 100644
--- a/src/lib/tvgLinearGradient.cpp
+++ b/src/lib/tvgLinearGradient.cpp
@@ -19,6 +19,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <float.h>
+#include <math.h>
 #include "tvgFill.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgLoader.h b/src/lib/tvgLoader.h
index 9c7279eb..c02baff6 100644
--- a/src/lib/tvgLoader.h
+++ b/src/lib/tvgLoader.h
@@ -22,6 +22,8 @@
 #ifndef _TVG_LOADER_H_
 #define _TVG_LOADER_H_
 
+#include "tvgCommon.h"
+
 namespace tvg
 {
 
diff --git a/src/lib/tvgLoaderMgr.cpp b/src/lib/tvgLoaderMgr.cpp
index 6ec32132..6ed2d3ed 100644
--- a/src/lib/tvgLoaderMgr.cpp
+++ b/src/lib/tvgLoaderMgr.cpp
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
+#include "tvgLoaderMgr.h"
 
 #ifdef THORVG_SVG_LOADER_SUPPORT
     #include "tvgSvgLoader.h"
diff --git a/src/lib/tvgLoaderMgr.h b/src/lib/tvgLoaderMgr.h
index 95a06767..81623f29 100644
--- a/src/lib/tvgLoaderMgr.h
+++ b/src/lib/tvgLoaderMgr.h
@@ -22,6 +22,8 @@
 #ifndef _TVG_LOADER_MGR_H_
 #define _TVG_LOADER_MGR_H_
 
+#include "tvgLoader.h"
+
 struct LoaderMgr
 {
     static bool init();
diff --git a/src/lib/tvgPaint.h b/src/lib/tvgPaint.h
index 071a45fa..4b49520b 100644
--- a/src/lib/tvgPaint.h
+++ b/src/lib/tvgPaint.h
@@ -22,7 +22,9 @@
 #ifndef _TVG_PAINT_H_
 #define _TVG_PAINT_H_
 
-#include "tvgCommon.h"
+#include <float.h>
+#include <math.h>
+#include "tvgRender.h"
 
 namespace tvg
 {
diff --git a/src/lib/tvgPictureImpl.h b/src/lib/tvgPictureImpl.h
index 9b742aab..0f07ed1c 100644
--- a/src/lib/tvgPictureImpl.h
+++ b/src/lib/tvgPictureImpl.h
@@ -23,6 +23,7 @@
 #define _TVG_PICTURE_IMPL_H_
 
 #include "tvgPaint.h"
+#include "tvgLoaderMgr.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/tvgRadialGradient.cpp b/src/lib/tvgRadialGradient.cpp
index 03164ae3..73533503 100644
--- a/src/lib/tvgRadialGradient.cpp
+++ b/src/lib/tvgRadialGradient.cpp
@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <float.h>
 #include "tvgFill.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgRender.cpp b/src/lib/tvgRender.cpp
index 10a23e8c..84413f04 100644
--- a/src/lib/tvgRender.cpp
+++ b/src/lib/tvgRender.cpp
@@ -19,7 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
+#include <float.h>
+#include <math.h>
+#include "tvgRender.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/tvgRender.h b/src/lib/tvgRender.h
index 9beb72b6..f710a0f6 100644
--- a/src/lib/tvgRender.h
+++ b/src/lib/tvgRender.h
@@ -22,6 +22,8 @@
 #ifndef _TVG_RENDER_H_
 #define _TVG_RENDER_H_
 
+#include "tvgCommon.h"
+
 namespace tvg
 {
 
diff --git a/src/lib/tvgSceneImpl.h b/src/lib/tvgSceneImpl.h
index 8073a707..c384d8c7 100644
--- a/src/lib/tvgSceneImpl.h
+++ b/src/lib/tvgSceneImpl.h
@@ -22,6 +22,7 @@
 #ifndef _TVG_SCENE_IMPL_H_
 #define _TVG_SCENE_IMPL_H_
 
+#include <vector>
 #include "tvgPaint.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgShape.cpp b/src/lib/tvgShape.cpp
index a68c0851..0a0a622a 100644
--- a/src/lib/tvgShape.cpp
+++ b/src/lib/tvgShape.cpp
@@ -20,7 +20,6 @@
  * SOFTWARE.
  */
 #include <limits>
-
 #include "tvgShapeImpl.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgShapePath.h b/src/lib/tvgShapePath.h
index f3b1f6e7..bfbdcf5f 100644
--- a/src/lib/tvgShapePath.h
+++ b/src/lib/tvgShapePath.h
@@ -22,6 +22,7 @@
 #ifndef _TVG_SHAPE_PATH_H_
 #define _TVG_SHAPE_PATH_H_
 
+#include <string.h>
 #include "tvgCommon.h"
 
 /************************************************************************/
diff --git a/src/lib/tvgSwCanvas.cpp b/src/lib/tvgSwCanvas.cpp
index 1a2261a2..03337a72 100644
--- a/src/lib/tvgSwCanvas.cpp
+++ b/src/lib/tvgSwCanvas.cpp
@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "tvgCommon.h"
 #include "tvgCanvasImpl.h"
 
 #ifdef THORVG_SW_RASTER_SUPPORT
diff --git a/src/lib/tvgTaskScheduler.cpp b/src/lib/tvgTaskScheduler.cpp
index bdf6edc7..d4c21f17 100644
--- a/src/lib/tvgTaskScheduler.cpp
+++ b/src/lib/tvgTaskScheduler.cpp
@@ -21,7 +21,8 @@
  */
 #include <deque>
 #include <thread>
-#include "tvgCommon.h"
+#include <vector>
+#include "tvgTaskScheduler.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
diff --git a/src/lib/tvgTaskScheduler.h b/src/lib/tvgTaskScheduler.h
index 31d1ee1a..d94a3189 100644
--- a/src/lib/tvgTaskScheduler.h
+++ b/src/lib/tvgTaskScheduler.h
@@ -22,6 +22,7 @@
 #ifndef _TVG_TASK_SCHEDULER_H_
 #define _TVG_TASK_SCHEDULER_H_
 
+#include <future>
 #include "tvgCommon.h"
 
 namespace tvg
diff --git a/src/loaders/svg/tvgSimpleXmlParser.cpp b/src/loaders/svg/tvgSimpleXmlParser.cpp
index d287ba76..3918af14 100644
--- a/src/loaders/svg/tvgSimpleXmlParser.cpp
+++ b/src/loaders/svg/tvgSimpleXmlParser.cpp
@@ -20,6 +20,10 @@
  * SOFTWARE.
  */
 
+#include <ctype.h>
+#include <cstring>
+#include <alloca.h>
+
 #include "tvgSimpleXmlParser.h"
 
 static const char* _simpleXmlFindWhiteSpace(const char* itr, const char* itrEnd)
diff --git a/src/loaders/svg/tvgSimpleXmlParser.h b/src/loaders/svg/tvgSimpleXmlParser.h
index a9f999db..9c195470 100644
--- a/src/loaders/svg/tvgSimpleXmlParser.h
+++ b/src/loaders/svg/tvgSimpleXmlParser.h
@@ -23,9 +23,7 @@
 #ifndef _TVG_SIMPLE_XML_PARSER_H_
 #define _TVG_SIMPLE_XML_PARSER_H_
 
-#include <ctype.h>
-#include <cstring>
-#include <alloca.h>
+#include "tvgSvgLoaderCommon.h"
 
 enum class SimpleXMLType
 {
diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index f86f9df4..3495fcad 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -21,9 +21,13 @@
  */
 #include <stddef.h>
 #include <fstream>
+#include <string.h>
+#include <float.h>
+#include <math.h>
+#include "tvgLoaderMgr.h"
+#include "tvgSimpleXmlParser.h"
 #include "tvgSvgLoader.h"
 
-
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
diff --git a/src/loaders/svg/tvgSvgLoader.h b/src/loaders/svg/tvgSvgLoader.h
index 3cf4cf20..cd04d7d2 100644
--- a/src/loaders/svg/tvgSvgLoader.h
+++ b/src/loaders/svg/tvgSvgLoader.h
@@ -22,7 +22,7 @@
 #ifndef _TVG_SVG_LOADER_H_
 #define _TVG_SVG_LOADER_H_
 
-#include "tvgSvgLoaderCommon.h"
+#include "tvgTaskScheduler.h"
 #include "tvgSvgSceneBuilder.h"
 
 class SvgLoader : public Loader, public Task
diff --git a/src/loaders/svg/tvgSvgLoaderCommon.h b/src/loaders/svg/tvgSvgLoaderCommon.h
index 91896bcc..3cbe22dc 100644
--- a/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -23,7 +23,6 @@
 #define _TVG_SVG_LOADER_COMMON_H_
 
 #include "tvgCommon.h"
-#include "tvgSimpleXmlParser.h"
 
 enum class SvgNodeType
 {
diff --git a/src/loaders/svg/tvgSvgPath.cpp b/src/loaders/svg/tvgSvgPath.cpp
index e3ea03e2..3ede0e09 100644
--- a/src/loaders/svg/tvgSvgPath.cpp
+++ b/src/loaders/svg/tvgSvgPath.cpp
@@ -19,9 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <string.h>
+#include <math.h>
 #include "tvgSvgPath.h"
 
-
 static char* _skipComma(const char* content)
 {
     while (*content && isspace(*content)) {
diff --git a/src/loaders/svg/tvgSvgPath.h b/src/loaders/svg/tvgSvgPath.h
index 9d853d19..5324a041 100644
--- a/src/loaders/svg/tvgSvgPath.h
+++ b/src/loaders/svg/tvgSvgPath.h
@@ -23,7 +23,8 @@
 #ifndef _TVG_SVG_PATH_H_
 #define _TVG_SVG_PATH_H_
 
-#include "tvgCommon.h"
+#include <vector>
+#include "tvgSvgLoaderCommon.h"
 
 tuple<vector<tvg::PathCommand>, vector<tvg::Point>> svgPathToTvgPath(const char* svg_path_data);
 
diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp
index 0f1f80b3..f3922cb5 100644
--- a/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -19,7 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <math.h>
 #include "tvgSvgSceneBuilder.h"
+#include "tvgSvgPath.h"
 
 unique_ptr<LinearGradient> _applyLinearGradientProperty(SvgStyleGradient* g, Shape* vg, float rx, float ry, float rw, float rh)
 {
diff --git a/src/loaders/svg/tvgSvgSceneBuilder.h b/src/loaders/svg/tvgSvgSceneBuilder.h
index 0f93d961..79f111bc 100644
--- a/src/loaders/svg/tvgSvgSceneBuilder.h
+++ b/src/loaders/svg/tvgSvgSceneBuilder.h
@@ -24,7 +24,6 @@
 #define _TVG_SVG_SCENE_BUILDER_H_
 
 #include "tvgSvgLoaderCommon.h"
-#include "tvgSvgPath.h"
 
 class SvgSceneBuilder
 {