diff --git a/CMakeLists.txt b/CMakeLists.txt
index b513311..43d789c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,23 +28,45 @@ include_directories(.)
 #Create src file list
 set(src_files
 	esvg/Base.cpp
+	esvg/Base.h
 	esvg/Circle.cpp
+	esvg/Circle.h
 	esvg/debug.cpp
+	esvg/debug.h
 	esvg/Ellipse.cpp
+	esvg/Ellipse.h
 	esvg/Group.cpp
+	esvg/Group.h
 	esvg/Line.cpp
+	esvg/Line.h
 	esvg/esvg.cpp
+	esvg/esvg.h
 	esvg/Path.cpp
+	esvg/Path.h
 	esvg/Polygon.cpp
+	esvg/Polygon.h
 	esvg/Polyline.cpp
+	esvg/Polyline.h
 	esvg/Rectangle.cpp
+	esvg/Rectangle.h
 	esvg/Renderer.cpp
+	esvg/Renderer.h
 	esvg/Stroking.cpp
+	esvg/Stroking.h
 	esvg/Text.cpp
+	esvg/Text.h
 )
 
 add_definitions( -DDEBUG_LEVEL=3 )
 add_definitions( -DDEBUG=1 )
+if (APPLE)
+	add_definitions( -D__TARGET_OS__MacOs )
+elseif (UNIX)
+	add_definitions( -D__TARGET_OS__Linux )
+elseif (WIN32)
+	add_definitions( -D__TARGET_OS__Windows )
+endif ()
+
 
 include_directories(${etk_SOURCE_DIR})
 include_directories(${linearmath_SOURCE_DIR}/bullet/src/)
diff --git a/esvg/Base.cpp b/esvg/Base.cpp
index e2132d9..626e688 100644
--- a/esvg/Base.cpp
+++ b/esvg/Base.cpp
@@ -166,10 +166,6 @@ int32_t extractPartOfStyle(const std::string& _data, std::string& _outputType, s
 	if (_pos == -1) {
 		return -2;
 	}
-	int32_t typeStart = _pos;
-	int32_t typeStop = _pos;
-	int32_t dataStart = _pos;
-	int32_t dataStop = _pos;
 	bool processFirst=true;
 	//SVG_DEBUG("parse : '" << _data.Extract(_pos) << "'");
 	for( int32_t iii=_pos; iii<_data.size(); iii++) {
diff --git a/esvg/Polygon.h b/esvg/Polygon.h
index 9eafc48..922db8f 100644
--- a/esvg/Polygon.h
+++ b/esvg/Polygon.h
@@ -13,14 +13,16 @@
 #include <vector>
 
 namespace esvg {
+	/*
 	enum polygonMode {
 		polygoneModeNonZero,
 		polygoneModeEvenOdd
 	};
+	*/
 	class Polygon : public esvg::Base {
 		private:
 			std::vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polygone
-			enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode
+			//enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode
 		public:
 			Polygon(PaintState parentPaintState);
 			~Polygon(void);