diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca80590476ccea8086ccb6ace21ce86f39b3caf4..f44650942991e0be2b785a2c90a9c3c615414e83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,10 +151,7 @@ target_compile_definitions(shadertoy PUBLIC
 set_property(TARGET shadertoy PROPERTY CXX_STANDARD 14)
 
 # Include directories for install
-set_property(TARGET shadertoy APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-			 $<BUILD_INTERFACE:${INCLUDE_DIR}>
-			 $<INSTALL_INTERFACE:include>
-			 $<INSTALL_INTERFACE:${Boost_INCLUDE_DIR}>)
+target_include_directories(shadertoy INTERFACE $<INSTALL_INTERFACE:include>)
 
 # Set library file version
 set_target_properties(shadertoy PROPERTIES
diff --git a/examples/00-build/CMakeLists.txt b/examples/00-build/CMakeLists.txt
index 6fe914bf8b60f11eaefbd7d1ebb203b15da0b5d0..d456ee7d67dc8a62799930f5da4208f353680e54 100644
--- a/examples/00-build/CMakeLists.txt
+++ b/examples/00-build/CMakeLists.txt
@@ -14,8 +14,7 @@ find_package(shadertoy REQUIRED)
 include_directories(
 	${OPENGL_INCLUDE_DIRS}
 	${GLEW_INCLUDE_DIRS}
-	${glfw3_INCLUDE_DIRS}
-	${shadertoy_INCLUDE_DIRS})
+	${glfw3_INCLUDE_DIRS})
 
 add_executable(example00-build
 	${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
@@ -24,7 +23,7 @@ target_link_libraries(example00-build
 	${OPENGL_LIBRARY}
 	${GLEW_LIBRARIES}
 	${glfw3_LIBRARIES}
-	${shadertoy_LIBRARIES})
+	shadertoy)
 
 # C++14
 set_property(TARGET example00-build PROPERTY CXX_STANDARD 14)
diff --git a/examples/10-gradient/CMakeLists.txt b/examples/10-gradient/CMakeLists.txt
index aef06113c71a10d2384952206bd5956c12cfd44c..b08fc587f33632de26f1268977f32b4d42103d74 100644
--- a/examples/10-gradient/CMakeLists.txt
+++ b/examples/10-gradient/CMakeLists.txt
@@ -8,19 +8,13 @@ find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 pkg_search_module(glfw3 REQUIRED glfw3)
 
-# oglplus config
-set(oglplus_CONFIGURE_EXTRA_ARGS --use-glew --use-glfw3)
-set(shadertoy_LOAD_OGLPLUS ON)
-
 # libshadertoy
 find_package(shadertoy REQUIRED)
 
 include_directories(
 	${OPENGL_INCLUDE_DIRS}
 	${GLEW_INCLUDE_DIRS}
-	${glfw3_INCLUDE_DIRS}
-	${oglplus_INCLUDE_DIRS}
-	${shadertoy_INCLUDE_DIRS})
+	${glfw3_INCLUDE_DIRS})
 
 add_executable(example10-gradient
 	${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
@@ -29,7 +23,7 @@ target_link_libraries(example10-gradient
 	${OPENGL_LIBRARY}
 	${GLEW_LIBRARIES}
 	${glfw3_LIBRARIES}
-	${shadertoy_LIBRARIES})
+	shadertoy)
 
 # C++14
 set_property(TARGET example10-gradient PROPERTY CXX_STANDARD 14)
diff --git a/examples/50-shadertoy/CMakeLists.txt b/examples/50-shadertoy/CMakeLists.txt
index 17483efb68fc7b2851f4302cca882c66e7696cb9..d0b6b4e3e4e56f48428a7f858c31f6731abbd800 100644
--- a/examples/50-shadertoy/CMakeLists.txt
+++ b/examples/50-shadertoy/CMakeLists.txt
@@ -21,8 +21,7 @@ include_directories(
 	${glfw3_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
 	${CURL_INCLUDE_DIRS}
-	${jsoncpp_INCLUDE_DIRS}
-	${shadertoy_INCLUDE_DIRS})
+	${jsoncpp_INCLUDE_DIRS})
 
 add_executable(example50-shadertoy
 	${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
@@ -34,7 +33,7 @@ target_link_libraries(example50-shadertoy
 	${Boost_LIBRARIES}
 	${CURL_LIBRARIES}
 	${jsoncpp_LIBRARIES}
-	${shadertoy_LIBRARIES})
+	shadertoy)
 
 # C++14
 set_property(TARGET example50-shadertoy PROPERTY CXX_STANDARD 14)