diff --git a/CMakeLists.txt b/CMakeLists.txt
index 209c1ae4..33258acc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ include_directories(
 	${Boost_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIR}
 	${SIMGEAR_INCLUDE_DIR}
+	${GPC_INCLUDE_DIR}
 	)
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
diff --git a/CMakeModules/FindGPC.cmake b/CMakeModules/FindGPC.cmake
index 054e4e1d..632ef5bc 100644
--- a/CMakeModules/FindGPC.cmake
+++ b/CMakeModules/FindGPC.cmake
@@ -1,7 +1,7 @@
 
 FIND_PATH(GPC_INCLUDE_DIR gpc.h
   HINTS $ENV{GPC_DIR}
-  PATH_SUFFIXES include
+  PATH_SUFFIXES include include/gpcl
   PATHS
   /usr/local
   /usr
@@ -10,9 +10,8 @@ FIND_PATH(GPC_INCLUDE_DIR gpc.h
 
 
 FIND_LIBRARY(GPC_LIBRARY
-  NAMES genpolyclip gpc
-  HINTS
-  $ENV{GPC_DIR}
+  NAMES genpolyclip gpc gpcl agggpc
+  HINTS $ENV{GPC_DIR}
   PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
   PATHS
   /usr/local