--- library/tulip-qt/src/CMakeLists.txt.orig	2012-06-13 09:54:25.000000000 +0200
+++ library/tulip-qt/src/CMakeLists.txt	2012-06-13 09:54:41.000000000 +0200
@@ -194,7 +194,7 @@
 ADD_DEFINITIONS(-DQT_DLL)
 ADD_DEFINITIONS(-DQT_THREAD_SUPPORT)
 
-INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip)
+INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${OPENGL_INCLUDE_DIR})
 ADD_LIBRARY(${LibTulipQtName} SHARED ${tulip-qt_UI_SRCS} ${tulip-qt_MOC_SRCS} ${tulip-qt_RCC_SRCS} ${tulip-qt_LIB_SRCS})
 TARGET_LINK_LIBRARIES(${LibTulipQtName} ${GLEW_LIBRARY})
 TARGET_LINK_LIBRARIES(${LibTulipQtName} ${OPENGL_glu_LIBRARY})
--- software/tulip/src/CMakeLists.txt.orig	2012-02-22 16:57:38.000000000 +0100
+++ software/tulip/src/CMakeLists.txt	2012-02-22 16:58:06.000000000 +0100
@@ -33,7 +33,7 @@
 TULIP_QT4_WRAP_CPP(tulip_MOC_SRCS ${tulip_MOC} OPTIONS "-DQT_MINOR_REL=${QT_VERSION_MINOR}")
 QT4_ADD_RESOURCES(tulip_RCC_SRCS ${tulip_RCC})
 
-INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude})
+INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude} ${OPENGL_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/software/crash_handling)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_MINOR_REL=${QT_VERSION_MINOR}")
--- plugins/colors/CMakeLists.txt.orig	2011-08-04 11:14:55.000000000 +0200
+++ plugins/colors/CMakeLists.txt	2011-08-04 11:15:05.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)
+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})
 
 ##----------------------------------------------------------------------------------------------------------------------------
 SET(ColorMapping_SRCS
--- plugins/view/spreadsheet/CMakeLists.txt.orig	2011-08-04 11:53:35.000000000 +0200
+++ plugins/view/spreadsheet/CMakeLists.txt	2011-08-04 11:53:48.000000000 +0200
@@ -1,6 +1,6 @@
 INCLUDE("${PROJECT_SOURCE_DIR}/${TulipUseFile}")
 
-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)	
+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})	
 
 SET(spreadsheet_LIB_SRCS
     SpreadView.cpp 
--- plugins/view/pythonscriptview/CMakeLists.txt.orig	2012-02-22 16:59:26.000000000 +0100
+++ plugins/view/pythonscriptview/CMakeLists.txt	2012-02-22 16:59:54.000000000 +0100
@@ -6,7 +6,7 @@
 INCLUDE("${PROJECT_SOURCE_DIR}/${TulipUseFile}")
 
 # Force to use SIP headers located in thirdparty and not those installed in the system
-INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH})
 
 SET(pythonscriptview_LIB_SRCS
--- plugins/interactor/CMakeLists.txt.orig	2011-08-04 12:22:38.000000000 +0200
+++ plugins/interactor/CMakeLists.txt	2011-08-04 12:22:48.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude})
+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${OPENGL_INCLUDE_DIR})
 
 ##----------------------------------------------------------------------------------------------------------------------------
 SET(InteractorNavigation_SRCS
--- library/tulip-python/tulip-ogl/CMakeLists.txt.orig	2012-06-13 10:59:41.000000000 +0200
+++ library/tulip-python/tulip-ogl/CMakeLists.txt	2012-06-13 11:00:08.000000000 +0200
@@ -41,7 +41,7 @@
 # instead of those installed in the system
 INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 
 ADD_LIBRARY(${LibTulipOglPythonName} SHARED ${TULIPOGL_PYTHON_BINDINGS_SRC})
 
--- library/tulip-python/tulipgui/CMakeLists.txt.orig	2012-06-13 11:04:02.000000000 +0200
+++ library/tulip-python/tulipgui/CMakeLists.txt	2012-06-13 11:04:21.000000000 +0200
@@ -30,7 +30,7 @@
 # instead of those installed in the system
 INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude} ${OPENGL_INCLUDE_DIR})
 
 ADD_LIBRARY(tulipgui SHARED ${TULIP_GUI_PYTHON_BINDINGS_SRC})