diff --git a/polygon/polygon_test_point_inside.cpp b/polygon/polygon_test_point_inside.cpp
index f62b1a4c86..476de2df0d 100644
--- a/polygon/polygon_test_point_inside.cpp
+++ b/polygon/polygon_test_point_inside.cpp
@@ -50,7 +50,9 @@
 
 #define OUTSIDE false
 #define INSIDE true
-#if 0
+
+#if 1   // Will be removed whe deprecated CPOLYGONS_LIST will be rmoved
+#include <PolyLine.h>
 bool TestPointInsidePolygon( const CPOLYGONS_LIST& aPolysList,
                              int             aIdxstart,
                              int             aIdxend,
diff --git a/polygon/polygon_test_point_inside.h b/polygon/polygon_test_point_inside.h
index e3834110f3..cbf8430f57 100644
--- a/polygon/polygon_test_point_inside.h
+++ b/polygon/polygon_test_point_inside.h
@@ -22,19 +22,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __WXWINDOWS__
+#if 1   // Set to 0 to compile outside wxWidgets
+#include <wx/gdicmn.h>      // for wxPoint definition
+#else
 // define here wxPoint if we want to compile outside wxWidgets
 class wxPoint
 {
 public:
     int x, y;
 };
-#else
-#include <wx/gdicmn.h>                          // for wxPoint definition
 #endif
 
 
-#if 0
+#if 1       // set to 0 when deprecated CPOLYGONS_LIST will be removed
 class CPOLYGONS_LIST;
 
 /**