diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 179f4c17ed..313538b283 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -1,6 +1,8 @@
 ADD_DEFINITIONS(-DPCBNEW)
 
-INCLUDE_DIRECTORIES(../pcbnew ../polygon)
+INCLUDE_DIRECTORIES(
+	../pcbnew
+	../polygon)
 
 SET(3D-VIEWER_SRCS
 	3d_aux.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c411bf25a..f14e39ad70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,7 @@ IF(wxWidgets_FOUND)
 	ADD_SUBDIRECTORY(gerbview)
 	ADD_SUBDIRECTORY(kicad)
 	ADD_SUBDIRECTORY(pcbnew)
+	ADD_SUBDIRECTORY(polygon)
 ELSE(wxWidgets_FOUND)
 	# For convenience. When we cannot continue, inform the user.
 	MESSAGE(STATUS "Check for installed wxWidgets -- not found")
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index ea9b5b6d85..8f9000e36a 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -4,8 +4,8 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	bitmaps
 	../3d-viewer
-	../polygon
-	../pcbnew)
+	../pcbnew
+	../polygon)
 
 SET(CVPCB_SRCS
 	autosel.cpp
@@ -36,7 +36,6 @@ SET(CVPCB_SRCS
 SET(CVPCB_EXTRA_SRCS
 	../pcbnew/basepcbframe.cpp
 	../pcbnew/class_board.cpp
-	../pcbnew/class_zone.cpp
 	../pcbnew/class_cotation.cpp
 	../pcbnew/class_edge_mod.cpp
 	../pcbnew/class_equipot.cpp
@@ -46,6 +45,7 @@ SET(CVPCB_EXTRA_SRCS
 	../pcbnew/class_pcb_text.cpp
 	../pcbnew/class_text_mod.cpp
 	../pcbnew/class_track.cpp
+	../pcbnew/class_zone.cpp
 	../pcbnew/classpcb.cpp
 	../pcbnew/collectors.cpp
 	../pcbnew/ioascii.cpp
@@ -74,6 +74,6 @@ ENDIF(APPLE)
 
 ADD_EXECUTABLE(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVPCB_RESOURCES})
 
-TARGET_LINK_LIBRARIES(cvpcb common 3d-viewer ${wxWidgets_LIBRARIES})
+TARGET_LINK_LIBRARIES(cvpcb common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
 INSTALL(TARGETS cvpcb RUNTIME DESTINATION ${KICAD_BIN})
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 0355977ca1..19b73c92c3 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -42,11 +42,11 @@ SET(GERBVIEW_SRCS
 SET(GERBVIEW_EXTRA_SRCS
 	../pcbnew/basepcbframe.cpp
 	../pcbnew/class_board.cpp
-	../pcbnew/class_zone.cpp
 	../pcbnew/class_drc_item.cpp
 	../pcbnew/class_marker.cpp
 	../pcbnew/class_pcb_text.cpp
 	../pcbnew/class_track.cpp
+	../pcbnew/class_zone.cpp
 	../pcbnew/classpcb.cpp
 	../pcbnew/collectors.cpp
 	../pcbnew/sel_layer.cpp
@@ -76,6 +76,6 @@ ENDIF(APPLE)
 
 ADD_EXECUTABLE(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
 
-TARGET_LINK_LIBRARIES(gerbview common 3d-viewer lib_polygon ${wxWidgets_LIBRARIES})
+TARGET_LINK_LIBRARIES(gerbview common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
 INSTALL(TARGETS gerbview RUNTIME DESTINATION ${KICAD_BIN})
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 9a1835d638..67fc743b27 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -139,8 +139,6 @@ SET(PCBNEW_SRCS
 	)
 
 SET(PCBNEW_EXTRA_SRCS
-#	../polygon/PolyLine.cpp
-
 	../share/drawframe.cpp
 	../share/drawpanel.cpp
 	../share/infospgm.cpp
@@ -176,6 +174,6 @@ ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp)
 TARGET_LINK_LIBRARIES(specctra_test common ${wxWidgets_LIBRARIES})
 
 
-TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer ${wxWidgets_LIBRARIES})
+TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
 INSTALL(TARGETS pcbnew RUNTIME DESTINATION ${KICAD_BIN})
diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp
index 6cae3d0636..1c13331537 100644
--- a/pcbnew/tracepcb.cpp
+++ b/pcbnew/tracepcb.cpp
@@ -8,7 +8,7 @@
  *  Routines d'affichage grille, Boite de coordonnees, Curseurs, marqueurs ...
  */
 
-#include <vector.h>
+#include <vector>
 
 #include "fctsys.h"
 #include "gr_basic.h"
diff --git a/polygon/CMakeLists.txt b/polygon/CMakeLists.txt
new file mode 100644
index 0000000000..d1517e042f
--- /dev/null
+++ b/polygon/CMakeLists.txt
@@ -0,0 +1,9 @@
+SET(POLYGON_SRCS
+	cdisplaylist_stuff.cpp
+	GenericPolygonClipperLibrary.cpp
+	math_for_graphics.cpp
+	php_polygon.cpp
+	php_polygon_vertex.cpp
+	PolyLine.cpp)
+
+ADD_LIBRARY(polygon ${POLYGON_SRCS})