diff --git a/Common/OpenCL/Factories/itkGPUImageFactory.h b/Common/OpenCL/Factories/itkGPUImageFactory.h
index 4af1dd2d8..255699bfc 100644
--- a/Common/OpenCL/Factories/itkGPUImageFactory.h
+++ b/Common/OpenCL/Factories/itkGPUImageFactory.h
@@ -19,7 +19,7 @@
 #define itkGPUImageFactory_h
 
 #include "itkGPUObjectFactoryBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Factories/itkGPUObjectFactoryBase.hxx b/Common/OpenCL/Factories/itkGPUObjectFactoryBase.hxx
index 2adc42e13..39fefdb49 100644
--- a/Common/OpenCL/Factories/itkGPUObjectFactoryBase.hxx
+++ b/Common/OpenCL/Factories/itkGPUObjectFactoryBase.hxx
@@ -19,7 +19,7 @@
 #define itkGPUObjectFactoryBase_hxx
 
 #include "itkGPUObjectFactoryBase.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUAdvancedBSplineDeformableTransform.hxx b/Common/OpenCL/Filters/itkGPUAdvancedBSplineDeformableTransform.hxx
index 0866e8ca6..dd5034beb 100644
--- a/Common/OpenCL/Filters/itkGPUAdvancedBSplineDeformableTransform.hxx
+++ b/Common/OpenCL/Filters/itkGPUAdvancedBSplineDeformableTransform.hxx
@@ -21,7 +21,7 @@
 #include "itkGPUAdvancedBSplineDeformableTransform.h"
 
 #include "itkGPUMatrixOffsetTransformBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUBSplineBaseTransform.h b/Common/OpenCL/Filters/itkGPUBSplineBaseTransform.h
index e2baf01ef..b196d3bb6 100644
--- a/Common/OpenCL/Filters/itkGPUBSplineBaseTransform.h
+++ b/Common/OpenCL/Filters/itkGPUBSplineBaseTransform.h
@@ -18,8 +18,8 @@
 #ifndef itkGPUBSplineBaseTransform_h
 #define itkGPUBSplineBaseTransform_h
 
-#include "itkGPUDataManager.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
 #include "itkGPUTransformBase.h"
 
 namespace itk
diff --git a/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.h b/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.h
index 0f8a4ce36..6f3268925 100644
--- a/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.h
+++ b/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.h
@@ -19,7 +19,7 @@
 #define itkGPUBSplineDecompositionImageFilter_h
 
 #include "itkBSplineDecompositionImageFilter.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.hxx b/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.hxx
index 954ca072b..0628ca188 100644
--- a/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.hxx
+++ b/Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.hxx
@@ -20,8 +20,8 @@
 
 #include "itkGPUBSplineDecompositionImageFilter.h"
 #include "itkGPUCastImageFilter.h"
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUBSplineInterpolateImageFunction.h b/Common/OpenCL/Filters/itkGPUBSplineInterpolateImageFunction.h
index b38036f25..05365d0bf 100644
--- a/Common/OpenCL/Filters/itkGPUBSplineInterpolateImageFunction.h
+++ b/Common/OpenCL/Filters/itkGPUBSplineInterpolateImageFunction.h
@@ -19,8 +19,8 @@
 #define itkGPUBSplineInterpolateImageFunction_h
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkGPUDataManager.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkVersion.h"
diff --git a/Common/OpenCL/Filters/itkGPUBSplineTransform.hxx b/Common/OpenCL/Filters/itkGPUBSplineTransform.hxx
index f9a69976d..bf9321af9 100644
--- a/Common/OpenCL/Filters/itkGPUBSplineTransform.hxx
+++ b/Common/OpenCL/Filters/itkGPUBSplineTransform.hxx
@@ -21,7 +21,7 @@
 #include "itkGPUBSplineTransform.h"
 
 #include "itkGPUMatrixOffsetTransformBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUCastImageFilter.h b/Common/OpenCL/Filters/itkGPUCastImageFilter.h
index d81a657d6..dae708045 100644
--- a/Common/OpenCL/Filters/itkGPUCastImageFilter.h
+++ b/Common/OpenCL/Filters/itkGPUCastImageFilter.h
@@ -21,9 +21,9 @@
 #include "itkCastImageFilter.h"
 #include "itkSimpleDataObjectDecorator.h"
 
-#include "itkGPUFunctorBase.h"
-#include "itkOpenCLKernelManager.h"
-#include "itkGPUUnaryFunctorImageFilter.h"
+#include "../ITKimprovements/itkGPUFunctorBase.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkGPUUnaryFunctorImageFilter.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUCastImageFilter.hxx b/Common/OpenCL/Filters/itkGPUCastImageFilter.hxx
index bead8e324..3606bf15b 100644
--- a/Common/OpenCL/Filters/itkGPUCastImageFilter.hxx
+++ b/Common/OpenCL/Filters/itkGPUCastImageFilter.hxx
@@ -19,7 +19,7 @@
 #define itkGPUCastImageFilter_hxx
 
 #include "itkGPUCastImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.hxx b/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.hxx
index de8b09be0..29f514b2b 100644
--- a/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.hxx
+++ b/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.hxx
@@ -19,7 +19,7 @@
 #define itkGPUInterpolateImageFunction_hxx
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkOpenCLOstreamSupport.h"
+#include "../ITKimprovements/itkOpenCLOstreamSupport.h"
 
 // begin of unnamed namespace
 namespace
diff --git a/Common/OpenCL/Filters/itkGPUInterpolatorBase.h b/Common/OpenCL/Filters/itkGPUInterpolatorBase.h
index 0ddff17f5..2d53e7949 100644
--- a/Common/OpenCL/Filters/itkGPUInterpolatorBase.h
+++ b/Common/OpenCL/Filters/itkGPUInterpolatorBase.h
@@ -18,7 +18,7 @@
 #ifndef itkGPUInterpolatorBase_h
 #define itkGPUInterpolatorBase_h
 
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h
index 33e6f3bbe..4f9d04596 100644
--- a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h
+++ b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h
@@ -19,7 +19,7 @@
 #define itkGPUInterpolatorCopier_h
 
 #include "itkInterpolateImageFunction.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPULinearInterpolateImageFunction.h b/Common/OpenCL/Filters/itkGPULinearInterpolateImageFunction.h
index 3b82760cd..6d082139a 100644
--- a/Common/OpenCL/Filters/itkGPULinearInterpolateImageFunction.h
+++ b/Common/OpenCL/Filters/itkGPULinearInterpolateImageFunction.h
@@ -22,7 +22,7 @@
 #include "itkVersion.h"
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.h b/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.h
index 5cac30bcf..2698da6c4 100644
--- a/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.h
+++ b/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.h
@@ -19,7 +19,7 @@
 #define itkGPURecursiveGaussianImageFilter_h
 
 #include "itkRecursiveGaussianImageFilter.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.hxx b/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.hxx
index ffbfe7ea0..cd413bcda 100644
--- a/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.hxx
+++ b/Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.hxx
@@ -19,9 +19,9 @@
 #define itkGPURecursiveGaussianImageFilter_hxx
 
 #include "itkGPURecursiveGaussianImageFilter.h"
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLEvent.h"
-#include "itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUResampleImageFilter.h b/Common/OpenCL/Filters/itkGPUResampleImageFilter.h
index 2e7497bf8..941469ff9 100644
--- a/Common/OpenCL/Filters/itkGPUResampleImageFilter.h
+++ b/Common/OpenCL/Filters/itkGPUResampleImageFilter.h
@@ -20,7 +20,7 @@
 
 #include "itkResampleImageFilter.h"
 
-#include "itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
 #include "itkGPUInterpolateImageFunction.h"
 #include "itkGPUBSplineInterpolateImageFunction.h"
 #include "itkGPUBSplineBaseTransform.h"
diff --git a/Common/OpenCL/Filters/itkGPUResampleImageFilter.hxx b/Common/OpenCL/Filters/itkGPUResampleImageFilter.hxx
index 9f3872031..11d8da0f7 100644
--- a/Common/OpenCL/Filters/itkGPUResampleImageFilter.hxx
+++ b/Common/OpenCL/Filters/itkGPUResampleImageFilter.hxx
@@ -28,8 +28,8 @@
 #include "itkTimeProbe.h"
 #include "itkImageRegionSplitterSlowDimension.h"
 
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLKernelToImageBridge.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLKernelToImageBridge.h"
 
 namespace
 {
diff --git a/Common/OpenCL/Filters/itkGPUShrinkImageFilter.h b/Common/OpenCL/Filters/itkGPUShrinkImageFilter.h
index 7a219ab64..e5b647e63 100644
--- a/Common/OpenCL/Filters/itkGPUShrinkImageFilter.h
+++ b/Common/OpenCL/Filters/itkGPUShrinkImageFilter.h
@@ -20,8 +20,8 @@
 
 #include "itkShrinkImageFilter.h"
 
-#include "itkGPUImageToImageFilter.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImage.h"
 #include "itkVersion.h"
 
 namespace itk
diff --git a/Common/OpenCL/Filters/itkGPUShrinkImageFilter.hxx b/Common/OpenCL/Filters/itkGPUShrinkImageFilter.hxx
index ea9262bfe..058d8cb10 100644
--- a/Common/OpenCL/Filters/itkGPUShrinkImageFilter.hxx
+++ b/Common/OpenCL/Filters/itkGPUShrinkImageFilter.hxx
@@ -19,7 +19,7 @@
 #define itkGPUShrinkImageFilter_hxx
 
 #include "itkGPUShrinkImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/Filters/itkGPUTransformBase.h b/Common/OpenCL/Filters/itkGPUTransformBase.h
index a79288dcf..a4e3f659b 100644
--- a/Common/OpenCL/Filters/itkGPUTransformBase.h
+++ b/Common/OpenCL/Filters/itkGPUTransformBase.h
@@ -18,7 +18,7 @@
 #ifndef itkGPUTransformBase_h
 #define itkGPUTransformBase_h
 
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUDataManager.cxx b/Common/OpenCL/ITKimprovements/itkGPUDataManager.cxx
index c7b7928a2..5126e2b03 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUDataManager.cxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUDataManager.cxx
@@ -32,7 +32,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUDataManager.h b/Common/OpenCL/ITKimprovements/itkGPUDataManager.h
index 87646b63f..40551b26e 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUDataManager.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUDataManager.h
@@ -38,7 +38,7 @@
 #include "itkObject.h"
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include <mutex>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkGPUFunctorBase.h b/Common/OpenCL/ITKimprovements/itkGPUFunctorBase.h
index 629e96453..ef466c73d 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUFunctorBase.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUFunctorBase.h
@@ -35,7 +35,7 @@
 #ifndef itkGPUFunctorBase_h
 #define itkGPUFunctorBase_h
 
-#include "itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImage.h b/Common/OpenCL/ITKimprovements/itkGPUImage.h
index d6e5a21d2..41706d444 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImage.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUImage.h
@@ -36,7 +36,7 @@
 #define itkGPUImage_h
 
 #include "itkImage.h"
-#include "itkGPUImageDataManager.h"
+#include "../ITKimprovements/itkGPUImageDataManager.h"
 #include "itkVersion.h"
 #include "itkObjectFactoryBase.h"
 
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImage.hxx b/Common/OpenCL/ITKimprovements/itkGPUImage.hxx
index a408b4305..c9ccfa0d3 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImage.hxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUImage.hxx
@@ -35,7 +35,7 @@
 #ifndef itkGPUImage_hxx
 #define itkGPUImage_hxx
 
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.h b/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.h
index e8188d11d..6e61e7609 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.h
@@ -39,8 +39,8 @@
 #include <itkTimeStamp.h>
 #include <itkLightObject.h>
 #include <itkObjectFactory.h>
-#include "itkGPUImage.h"
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.hxx b/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.hxx
index 68a38af25..c04ee8ca7 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.hxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUImageDataManager.hxx
@@ -35,7 +35,7 @@
 #ifndef itkGPUImageDataManager_hxx
 #define itkGPUImageDataManager_hxx
 
-#include "itkGPUImageDataManager.h"
+#include "../ITKimprovements/itkGPUImageDataManager.h"
 
 // #define VERBOSE
 
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.h b/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.h
index fb22e7363..44aa741c4 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.h
@@ -36,7 +36,7 @@
 #define itkGPUImageToImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.hxx b/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.hxx
index 549baf3d5..abac39991 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.hxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.hxx
@@ -35,8 +35,8 @@
 #ifndef itkGPUImageToImageFilter_hxx
 #define itkGPUImageToImageFilter_hxx
 
-#include "itkGPUImageToImageFilter.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.h b/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.h
index 807538ec1..87095a513 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.h
@@ -36,7 +36,7 @@
 #define itkGPUInPlaceImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
-#include "itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx b/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx
index 4437a5448..7ae0f91c7 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx
@@ -35,7 +35,7 @@
 #ifndef itkGPUInPlaceImageFilter_hxx
 #define itkGPUInPlaceImageFilter_hxx
 
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.h b/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.h
index 18d4c6dea..dc4336f6e 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.h
+++ b/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.h
@@ -35,8 +35,8 @@
 #ifndef itkGPUUnaryFunctorImageFilter_h
 #define itkGPUUnaryFunctorImageFilter_h
 
-#include "itkGPUFunctorBase.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUFunctorBase.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.hxx b/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.hxx
index a2a474ce9..c3889bc69 100644
--- a/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.hxx
+++ b/Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.hxx
@@ -35,8 +35,8 @@
 #ifndef itkGPUUnaryFunctorImageFilter_hxx
 #define itkGPUUnaryFunctorImageFilter_hxx
 
-#include "itkGPUUnaryFunctorImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkGPUUnaryFunctorImageFilter.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCL.h b/Common/OpenCL/ITKimprovements/itkOpenCL.h
index 9749a43cb..a566dd7ff 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCL.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCL.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCL_h
 #define itkOpenCL_h
 
-#include "itkOpenCLExport.h"
+#include "../ITKimprovements/itkOpenCLExport.h"
 
 #ifndef CL_TARGET_OPENCL_VERSION
 #  define CL_TARGET_OPENCL_VERSION 120
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.cxx
index 9425b838d..b408bd22e 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.cxx
@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLBuffer.h"
-#include "itkOpenCLImage.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLImage.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.h b/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.h
index 5dc7279b9..aedf97ebf 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLBuffer.h
@@ -35,8 +35,8 @@
 #ifndef itkOpenCLBuffer_h
 #define itkOpenCLBuffer_h
 
-#include "itkOpenCLMemoryObject.h"
-#include "itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.cxx
index 4fa9653d2..c4c627d89 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.cxx
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLCommandQueue.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLCommandQueue.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.h b/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.h
index 9d7329135..50d072d13 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLCommandQueue_h
 #define itkOpenCLCommandQueue_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 #include <ostream>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx
index 4fa580570..b3b837849 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include "itkOpenCLKernels.h"
-#include "itkOpenCLProfilingTimeProbe.h"
+#include "../ITKimprovements/itkOpenCLProfilingTimeProbe.h"
 
 #include <iostream>
 #include <fstream>
 
 #include "itksys/MD5.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLContext.h b/Common/OpenCL/ITKimprovements/itkOpenCLContext.h
index 2a68c7c63..ca32c29a3 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLContext.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLContext.h
@@ -21,14 +21,14 @@
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
 
-#include "itkOpenCLDevice.h"
-#include "itkOpenCLCommandQueue.h"
-#include "itkOpenCLBuffer.h"
-#include "itkOpenCLVector.h"
-#include "itkOpenCLImage.h"
-#include "itkOpenCLSampler.h"
-#include "itkOpenCLProgram.h"
-#include "itkOpenCLUserEvent.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLCommandQueue.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLVector.h"
+#include "../ITKimprovements/itkOpenCLImage.h"
+#include "../ITKimprovements/itkOpenCLSampler.h"
+#include "../ITKimprovements/itkOpenCLProgram.h"
+#include "../ITKimprovements/itkOpenCLUserEvent.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLDevice.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLDevice.cxx
index 9dd2ba368..86a58fa75 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLDevice.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLDevice.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLDevice.h"
-#include "itkOpenCLExtension.h"
-#include "itkOpenCLStringUtils.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCLStringUtils.h"
 
 #include <vector>
 #include <set>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLDevice.h b/Common/OpenCL/ITKimprovements/itkOpenCLDevice.h
index 1f7f3d1f9..65eaf0636 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLDevice.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLDevice.h
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLDevice_h
 #define itkOpenCLDevice_h
 
-#include "itkOpenCLPlatform.h"
-#include "itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLPlatform.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx
index 52f59442d..3c53a29ee 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLEvent.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLEvent.h b/Common/OpenCL/ITKimprovements/itkOpenCLEvent.h
index ac84a535f..64eae0751 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLEvent.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLEvent.h
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLEvent_h
 #define itkOpenCLEvent_h
 
-#include "itkOpenCL.h"
-#include "itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
 #include <ostream>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLEventList.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLEventList.cxx
index 179cfcf5f..29581b6c1 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLEventList.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLEventList.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLEventList.h"
-#include "itkOpenCLMacro.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLEventList.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLEventList.h b/Common/OpenCL/ITKimprovements/itkOpenCLEventList.h
index 9b97ab443..9bcc08564 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLEventList.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLEventList.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLEventList_h
 #define itkOpenCLEventList_h
 
-#include "itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
 #include <vector>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLExtension.h b/Common/OpenCL/ITKimprovements/itkOpenCLExtension.h
index b249bd806..a211ec8a2 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLExtension.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLExtension.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLExtension_h
 #define itkOpenCLExtension_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 
 // This file provides standard OpenCL definitions
 // that may not be present in the system headers.
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLImage.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLImage.cxx
index 771a179b2..ca7c07a5b 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLImage.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLImage.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLImage.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLImage.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLImage.h b/Common/OpenCL/ITKimprovements/itkOpenCLImage.h
index ff1e66456..d4ecd362a 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLImage.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLImage.h
@@ -18,10 +18,10 @@
 #ifndef itkOpenCLImage_h
 #define itkOpenCLImage_h
 
-#include "itkOpenCLMemoryObject.h"
-#include "itkOpenCLImageFormat.h"
-#include "itkOpenCLEvent.h"
-#include "itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLImageFormat.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.cxx
index 9a77bf507..afedf9b9b 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLImageFormat.h"
+#include "../ITKimprovements/itkOpenCLImageFormat.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.h b/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.h
index 6b033abb5..c1192a637 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLImageFormat.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLImageFormat_h
 #define itkOpenCLImageFormat_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 #include <ostream>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernel.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLKernel.cxx
index fa8f913a4..f59a7509d 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernel.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernel.cxx
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLKernel.h"
-#include "itkOpenCLProgram.h"
-#include "itkOpenCLBuffer.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLExtension.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLKernel.h"
+#include "../ITKimprovements/itkOpenCLProgram.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernel.h b/Common/OpenCL/ITKimprovements/itkOpenCLKernel.h
index b697b2799..ec9a4d45f 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernel.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernel.h
@@ -18,13 +18,13 @@
 #ifndef itkOpenCLKernel_h
 #define itkOpenCLKernel_h
 
-#include "itkOpenCL.h"
-#include "itkOpenCLGlobal.h"
-#include "itkOpenCLEvent.h"
-#include "itkOpenCLSize.h"
-#include "itkOpenCLMemoryObject.h"
-#include "itkOpenCLSampler.h"
-#include "itkOpenCLVector.h"
+#include "../ITKimprovements/itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCLGlobal.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLSampler.h"
+#include "../ITKimprovements/itkOpenCLVector.h"
 
 #include "itkIndex.h"
 #include "itkPoint.h"
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.cxx
index d3df3d0a6..563647afc 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.cxx
@@ -32,9 +32,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLKernelManager.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.h b/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.h
index 0694faea3..c5e89f9f1 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernelManager.h
@@ -38,9 +38,9 @@
 #include <itkLightObject.h>
 #include <itkObjectFactory.h>
 
-#include "itkGPUDataManager.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLKernel.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLKernel.h"
 
 #include <vector>
 
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.h b/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.h
index 972a1861d..ad46869c1 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.h
@@ -26,10 +26,10 @@
 #ifndef itkOpenCLKernelToImageBridge_h
 #define itkOpenCLKernelToImageBridge_h
 
-#include "itkGPUImage.h"
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
-#include "itkOpenCLKernel.h"
+#include "../ITKimprovements/itkOpenCLKernel.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.hxx b/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.hxx
index 301e73c09..2fa7545d7 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.hxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLKernelToImageBridge.hxx
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLKernelToImageBridge_hxx
 #define itkOpenCLKernelToImageBridge_hxx
 
-#include "itkOpenCLKernelToImageBridge.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLKernelToImageBridge.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 // begin of ITKOpenCLKernelToImageBridge namespace
 namespace ITKOpenCLKernelToImageBridge
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLLogger.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLLogger.cxx
index cdd35e0fd..1be6b78c2 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLLogger.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLLogger.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
 
 #include "itkLogger.h"
 #include <sstream>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLMacro.h b/Common/OpenCL/ITKimprovements/itkOpenCLMacro.h
index 21af7123a..677c06c47 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLMacro.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLMacro.h
@@ -26,7 +26,7 @@
 #define itkOpenCLMacro_h
 
 #include "itkMacro.h"
-#include "itkOpenCLExport.h"
+#include "../ITKimprovements/itkOpenCLExport.h"
 
 #include <string>
 #include <sstream>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.cxx
index 74a28d0ac..f8c55c0a6 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLMemoryObject.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.h b/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.h
index 45039bc58..cbb5df795 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLMemoryObject.h
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLMemoryObject_h
 #define itkOpenCLMemoryObject_h
 
-#include "itkOpenCLEventList.h"
-#include "itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLEventList.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
 #include "itkPoint.h"
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLOstreamSupport.h b/Common/OpenCL/ITKimprovements/itkOpenCLOstreamSupport.h
index 61fc047a4..86a48f934 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLOstreamSupport.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLOstreamSupport.h
@@ -26,7 +26,7 @@
 #ifndef itkOpenCLOstreamSupport_h
 #define itkOpenCLOstreamSupport_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 
 #include <ostream>
 #include <iomanip>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.cxx
index f8934754d..540f1fdaa 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLPlatform.h"
-#include "itkOpenCLExtension.h"
-#include "itkOpenCLStringUtils.h"
+#include "../ITKimprovements/itkOpenCLPlatform.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCLStringUtils.h"
 
 #include <vector>
 #include <iostream>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.h b/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.h
index 95bc6cf07..6557ac388 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLPlatform.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLPlatform_h
 #define itkOpenCLPlatform_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 
 #include <string>
 #include <list>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.cxx
index 756016157..c5e9cd402 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLProfilingTimeProbe.h"
+#include "../ITKimprovements/itkOpenCLProfilingTimeProbe.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.h b/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.h
index 7dc8a29d2..2d626dbe1 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLProfilingTimeProbe.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLProfilingTimeProbe_h
 #define itkOpenCLProfilingTimeProbe_h
 
-#include "itkOpenCLExport.h"
+#include "../ITKimprovements/itkOpenCLExport.h"
 #include "itkTimeProbe.h"
 
 #include <string>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLProgram.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLProgram.cxx
index 538a0b9f9..789558258 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLProgram.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLProgram.cxx
@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLProgram.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLProfilingTimeProbe.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLProgram.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLProfilingTimeProbe.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 // begin of OpenCLProgramSupport namespace
 namespace OpenCLProgramSupport
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLProgram.h b/Common/OpenCL/ITKimprovements/itkOpenCLProgram.h
index 016c8b276..8eb6ff1dd 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLProgram.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLProgram.h
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLProgram_h
 #define itkOpenCLProgram_h
 
-#include "itkOpenCLDevice.h"
-#include "itkOpenCLKernel.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLKernel.h"
 
 #include <string>
 
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLSampler.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLSampler.cxx
index 14c021c9c..2cb4b513a 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLSampler.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLSampler.cxx
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLSampler.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLSampler.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLSampler.h b/Common/OpenCL/ITKimprovements/itkOpenCLSampler.h
index 7cffa60cc..4af0e5af3 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLSampler.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLSampler.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLSampler_h
 #define itkOpenCLSampler_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 #include <ostream>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLSize.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLSize.cxx
index 445de0073..19fac6cc8 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLSize.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLSize.cxx
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLSize.h"
-#include "itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLSize.h b/Common/OpenCL/ITKimprovements/itkOpenCLSize.h
index 317b88b12..75c904d02 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLSize.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLSize.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLWorkSize_h
 #define itkOpenCLWorkSize_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 #include "itkSize.h"
 #include <string>
 
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.cxx
index 81225970f..ba29c87c0 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLStringUtils.h"
+#include "../ITKimprovements/itkOpenCLStringUtils.h"
 
 #include <iosfwd>
 #include <sstream>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.h b/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.h
index 75e65ca2c..dae2f69f3 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLStringUtils.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLStringUtils_h
 #define itkOpenCLStringUtils_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 
 #include <list>
 #include <string>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.cxx
index 30c5658b9..2a247208e 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLUserEvent.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLMacro.h"
+#include "../ITKimprovements/itkOpenCLUserEvent.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLMacro.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.h b/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.h
index 3b6a299ee..8d5fcae4e 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLUserEvent.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLUserEvent_h
 #define itkOpenCLUserEvent_h
 
-#include "itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLUtil.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLUtil.cxx
index 3d4e62b9d..76b0c123a 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLUtil.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLUtil.cxx
@@ -32,7 +32,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 #include <itkVector.h>
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLVector.h b/Common/OpenCL/ITKimprovements/itkOpenCLVector.h
index a445ac958..d2a40001f 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLVector.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLVector.h
@@ -18,8 +18,8 @@
 #ifndef itkOpenCLVector_h
 #define itkOpenCLVector_h
 
-#include "itkOpenCLVectorBase.h"
-#include "itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLVectorBase.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
 #include "itkMacro.h"
 
 namespace itk
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLVector.hxx b/Common/OpenCL/ITKimprovements/itkOpenCLVector.hxx
index 43122287c..c60fc2b3b 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLVector.hxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLVector.hxx
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLVector_hxx
 #define itkOpenCLVector_hxx
 
-#include "itkOpenCLVector.h"
+#include "../ITKimprovements/itkOpenCLVector.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.cxx
index 3b234e1e9..f1ecb1524 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.cxx
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.cxx
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLVectorBase.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLVectorBase.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 // thread/SMP safe reference counter
 #include <vcl_atomic_count.h>
diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.h b/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.h
index 6f66123ea..0611d1311 100644
--- a/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.h
+++ b/Common/OpenCL/ITKimprovements/itkOpenCLVectorBase.h
@@ -18,7 +18,7 @@
 #ifndef itkOpenCLVectorBase_h
 #define itkOpenCLVectorBase_h
 
-#include "itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
 
 namespace itk
 {
diff --git a/Common/OpenCL/itkGPUKernelManagerHelperFunctions.h b/Common/OpenCL/itkGPUKernelManagerHelperFunctions.h
index 707f0351d..cb79fe833 100644
--- a/Common/OpenCL/itkGPUKernelManagerHelperFunctions.h
+++ b/Common/OpenCL/itkGPUKernelManagerHelperFunctions.h
@@ -26,11 +26,11 @@
 #ifndef itkGPUKernelManagerHelperFunctions_h
 #define itkGPUKernelManagerHelperFunctions_h
 
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
-#include "itkOpenCLKernelManager.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLOstreamSupport.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLOstreamSupport.h"
 #include <string>
 
 namespace itk
diff --git a/Common/OpenCL/itkOpenCLSetup.cxx b/Common/OpenCL/itkOpenCLSetup.cxx
index e0a79ba0b..15028e31f 100644
--- a/Common/OpenCL/itkOpenCLSetup.cxx
+++ b/Common/OpenCL/itkOpenCLSetup.cxx
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #include "itkOpenCLSetup.h"
 
-#include "itkOpenCLLogger.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include <sstream>
 
 namespace itk
diff --git a/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.h b/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.h
index 8b36304c7..7b49ffb4c 100644
--- a/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.h
+++ b/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.h
@@ -217,7 +217,7 @@ class ITK_TEMPLATE_EXPORT AdvancedBSplineDeformableTransformBase
    * Warning: use either the SetParameters() or SetCoefficientImages()
    * API. Mixing the two modes may results in unexpected results.
    */
-  void
+  virtual void
   SetCoefficientImages(ImagePointer images[]);
 
   /** Typedefs for specifying the extend to the grid. */
diff --git a/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.h b/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.h
index 03aa804b7..8f498a2e3 100644
--- a/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.h
+++ b/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.h
@@ -20,7 +20,7 @@
 
 #include "elxIncludes.h" // include first to avoid MSVS warning
 #include "elxFixedGenericPyramid.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace elastix
 {
diff --git a/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.hxx b/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.hxx
index 4028b9f5d..9520d2f77 100644
--- a/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.hxx
+++ b/Components/FixedImagePyramids/OpenCLFixedGenericPyramid/elxOpenCLFixedGenericPyramid.hxx
@@ -23,7 +23,7 @@
 
 // GPU includes
 #include "itkGPUImageFactory.h"
-#include "itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
 
 // GPU factory includes
 #include "itkGPURecursiveGaussianImageFilterFactory.h"
diff --git a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/CMakeLists.txt b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/CMakeLists.txt
index a680fbd58..b079772d3 100644
--- a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/CMakeLists.txt
+++ b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/CMakeLists.txt
@@ -7,7 +7,7 @@ if(ELASTIX_USE_OPENCL)
 
   include_directories(../MovingGenericPyramid)
 
-  if(USE_OpenCLMovingdGenericPyramid)
+  if(USE_OpenCLMovingGenericPyramid)
     target_link_libraries(OpenCLMovingGenericPyramid elxOpenCL)
   endif()
 else()
diff --git a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.h b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.h
index 3eae1f4be..263f66638 100644
--- a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.h
+++ b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.h
@@ -20,7 +20,7 @@
 
 #include "elxIncludes.h" // include first to avoid MSVS warning
 #include "elxMovingGenericPyramid.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace elastix
 {
diff --git a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.hxx b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.hxx
index b72d42297..585462a58 100644
--- a/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.hxx
+++ b/Components/MovingImagePyramids/OpenCLMovingGenericPyramid/elxOpenCLMovingGenericPyramid.hxx
@@ -23,7 +23,7 @@
 
 // GPU includes
 #include "itkGPUImageFactory.h"
-#include "itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
 
 // GPU factory includes
 #include "itkGPURecursiveGaussianImageFilterFactory.h"
diff --git a/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.hxx b/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.hxx
index a74b11d7e..6175bc317 100644
--- a/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.hxx
+++ b/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.hxx
@@ -19,7 +19,7 @@
 #define elxOpenCLResampler_hxx
 
 #include "elxOpenCLResampler.h"
-#include "itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
 
 namespace elastix
 {
diff --git a/Core/Kernel/elxElastixMain.cxx b/Core/Kernel/elxElastixMain.cxx
index 8d99ada38..8f03d14f7 100644
--- a/Core/Kernel/elxElastixMain.cxx
+++ b/Core/Kernel/elxElastixMain.cxx
@@ -20,7 +20,7 @@
 #include <itkDeref.h>
 
 #ifdef ELASTIX_USE_OPENCL
-#  include "itkOpenCLContext.h"
+#  include "../ITKimprovements/itkOpenCLContext.h"
 #  include "itkOpenCLSetup.h"
 #endif
 
diff --git a/Core/Kernel/elxMainBase.cxx b/Core/Kernel/elxMainBase.cxx
index f42ae6054..0b6a57d1c 100644
--- a/Core/Kernel/elxMainBase.cxx
+++ b/Core/Kernel/elxMainBase.cxx
@@ -33,7 +33,7 @@
 #include "itkMultiThreaderBase.h"
 
 #ifdef ELASTIX_USE_OPENCL
-#  include "itkOpenCLContext.h"
+#  include "../ITKimprovements/itkOpenCLContext.h"
 #  include "itkOpenCLSetup.h"
 #endif
 
diff --git a/Core/Kernel/elxTransformixMain.cxx b/Core/Kernel/elxTransformixMain.cxx
index 454668c74..74f10bf78 100644
--- a/Core/Kernel/elxTransformixMain.cxx
+++ b/Core/Kernel/elxTransformixMain.cxx
@@ -30,7 +30,7 @@
 #include "elxMacro.h"
 
 #ifdef ELASTIX_USE_OPENCL
-#  include "itkOpenCLContext.h"
+#  include "../ITKimprovements/itkOpenCLContext.h"
 #  include "itkOpenCLSetup.h"
 #endif
 
diff --git a/Testing/itkGPUBSplineDecompositionImageFilterTest.cxx b/Testing/itkGPUBSplineDecompositionImageFilterTest.cxx
index d30ded8cd..7ac2873e3 100644
--- a/Testing/itkGPUBSplineDecompositionImageFilterTest.cxx
+++ b/Testing/itkGPUBSplineDecompositionImageFilterTest.cxx
@@ -21,7 +21,7 @@
 #include "itkGPUImageFactory.h"
 #include "itkGPUBSplineDecompositionImageFilterFactory.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // ITK include files
 #include "itkImageFileReader.h"
diff --git a/Testing/itkGPUCastImageFilterTest.cxx b/Testing/itkGPUCastImageFilterTest.cxx
index ecbf0edfd..a14b0c6f4 100644
--- a/Testing/itkGPUCastImageFilterTest.cxx
+++ b/Testing/itkGPUCastImageFilterTest.cxx
@@ -21,7 +21,7 @@
 #include "itkGPUImageFactory.h"
 #include "itkGPUCastImageFilterFactory.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // ITK include files
 #include "itkImageFileReader.h"
diff --git a/Testing/itkGPUFactoriesTest.cxx b/Testing/itkGPUFactoriesTest.cxx
index 31656d300..231d35de9 100644
--- a/Testing/itkGPUFactoriesTest.cxx
+++ b/Testing/itkGPUFactoriesTest.cxx
@@ -27,7 +27,7 @@
 #include "itkGPUResampleImageFilterFactory.h"
 #include "itkGPUShrinkImageFilterFactory.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // Interpolate includes
 #include "itkGPULinearInterpolateImageFunctionFactory.h"
diff --git a/Testing/itkGPUGenericMultiResolutionPyramidImageFilterTest.cxx b/Testing/itkGPUGenericMultiResolutionPyramidImageFilterTest.cxx
index 07480e418..778f5e696 100644
--- a/Testing/itkGPUGenericMultiResolutionPyramidImageFilterTest.cxx
+++ b/Testing/itkGPUGenericMultiResolutionPyramidImageFilterTest.cxx
@@ -27,7 +27,7 @@
 #include "itkGPUIdentityTransformFactory.h"
 #include "itkGPULinearInterpolateImageFunctionFactory.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 #include "elxDefaultConstruct.h"
 
diff --git a/Testing/itkGPURecursiveGaussianImageFilterTest.cxx b/Testing/itkGPURecursiveGaussianImageFilterTest.cxx
index f8d4d15aa..99bef5c4c 100644
--- a/Testing/itkGPURecursiveGaussianImageFilterTest.cxx
+++ b/Testing/itkGPURecursiveGaussianImageFilterTest.cxx
@@ -20,7 +20,7 @@
 // GPU include files
 #include "itkGPURecursiveGaussianImageFilter.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // ITK include files
 #include "itkImageFileReader.h"
diff --git a/Testing/itkGPUResampleImageFilterTest.cxx b/Testing/itkGPUResampleImageFilterTest.cxx
index 5357f4565..79121a3d0 100644
--- a/Testing/itkGPUResampleImageFilterTest.cxx
+++ b/Testing/itkGPUResampleImageFilterTest.cxx
@@ -20,7 +20,7 @@
 // GPU include files
 #include "itkGPUResampleImageFilter.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // GPU copiers
 #include "itkGPUTransformCopier.h"
diff --git a/Testing/itkGPUShrinkImageFilterTest.cxx b/Testing/itkGPUShrinkImageFilterTest.cxx
index 60a96a9af..0e56bacbc 100644
--- a/Testing/itkGPUShrinkImageFilterTest.cxx
+++ b/Testing/itkGPUShrinkImageFilterTest.cxx
@@ -21,7 +21,7 @@
 #include "itkGPUImageFactory.h"
 #include "itkGPUShrinkImageFilterFactory.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // ITK include files
 #include "itkImageFileReader.h"
diff --git a/Testing/itkGPUSmoothingRecursiveGaussianImageFilterTest.cxx b/Testing/itkGPUSmoothingRecursiveGaussianImageFilterTest.cxx
index 8a517da2e..daa4b34ea 100644
--- a/Testing/itkGPUSmoothingRecursiveGaussianImageFilterTest.cxx
+++ b/Testing/itkGPUSmoothingRecursiveGaussianImageFilterTest.cxx
@@ -22,7 +22,7 @@
 #include "itkGPURecursiveGaussianImageFilterFactory.h"
 #include "itkGPUCastImageFilterFactory.h" // used internally in smoothing filter
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 // ITK include files
 #include "itkSmoothingRecursiveGaussianImageFilter.h"
diff --git a/Testing/itkOpenCLBufferTest.cxx b/Testing/itkOpenCLBufferTest.cxx
index 5867e41d8..04726f1db 100644
--- a/Testing/itkOpenCLBufferTest.cxx
+++ b/Testing/itkOpenCLBufferTest.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 #include "itkTestHelper.h"
 #include "itkOpenCLBufferTest.h"
-#include "itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
 #include <algorithm>
 
 //------------------------------------------------------------------------------
diff --git a/Testing/itkOpenCLContextTest.cxx b/Testing/itkOpenCLContextTest.cxx
index b3dd7e7d0..b95df62df 100644
--- a/Testing/itkOpenCLContextTest.cxx
+++ b/Testing/itkOpenCLContextTest.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include "itkTestHelper.h"
 
 int
diff --git a/Testing/itkOpenCLDeviceTest.cxx b/Testing/itkOpenCLDeviceTest.cxx
index bb89d8468..7775f4395 100644
--- a/Testing/itkOpenCLDeviceTest.cxx
+++ b/Testing/itkOpenCLDeviceTest.cxx
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLDevice.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLProgram.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLProgram.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLEventTest.cxx b/Testing/itkOpenCLEventTest.cxx
index 64379a92e..b8b12844f 100644
--- a/Testing/itkOpenCLEventTest.cxx
+++ b/Testing/itkOpenCLEventTest.cxx
@@ -18,7 +18,7 @@
 #include "itkTestHelper.h"
 #include "itkOpenCLEventTest.h"
 
-#include "itkOpenCLContextScopeGuard.h"
+#include "../ITKimprovements/itkOpenCLContextScopeGuard.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLImageTest.cxx b/Testing/itkOpenCLImageTest.cxx
index ef2f1cb00..7ca0c136d 100644
--- a/Testing/itkOpenCLImageTest.cxx
+++ b/Testing/itkOpenCLImageTest.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 #include "itkTestHelper.h"
 #include "itkOpenCLImageTest.h"
-#include "itkOpenCLImage.h"
+#include "../ITKimprovements/itkOpenCLImage.h"
 #include <algorithm>
 
 int
diff --git a/Testing/itkOpenCLKernelManagerTest.cxx b/Testing/itkOpenCLKernelManagerTest.cxx
index 5674fb468..b13c18ca7 100644
--- a/Testing/itkOpenCLKernelManagerTest.cxx
+++ b/Testing/itkOpenCLKernelManagerTest.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
 #include "itkTestHelper.h"
 
 int
diff --git a/Testing/itkOpenCLKernelTest.cxx b/Testing/itkOpenCLKernelTest.cxx
index 5094845ef..8c0a7e7cf 100644
--- a/Testing/itkOpenCLKernelTest.cxx
+++ b/Testing/itkOpenCLKernelTest.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLKernel.h"
+#include "../ITKimprovements/itkOpenCLKernel.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLKernelToImageBridgeTest.cxx b/Testing/itkOpenCLKernelToImageBridgeTest.cxx
index da62f8509..83d63c9de 100644
--- a/Testing/itkOpenCLKernelToImageBridgeTest.cxx
+++ b/Testing/itkOpenCLKernelToImageBridgeTest.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 #include "itkTestHelper.h"
 #include "itkOpenCLKernelToImageBridgeTest.h"
-#include "itkOpenCLKernelToImageBridge.h"
+#include "../ITKimprovements/itkOpenCLKernelToImageBridge.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLPlatformTest.cxx b/Testing/itkOpenCLPlatformTest.cxx
index a216aadb1..f2453fb0a 100644
--- a/Testing/itkOpenCLPlatformTest.cxx
+++ b/Testing/itkOpenCLPlatformTest.cxx
@@ -16,7 +16,7 @@
  *
  *=========================================================================*/
 #include "itkTestHelper.h"
-#include "itkOpenCLPlatform.h"
+#include "../ITKimprovements/itkOpenCLPlatform.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLProfilingTimeProbeTest.cxx b/Testing/itkOpenCLProfilingTimeProbeTest.cxx
index 60227e13a..99defe358 100644
--- a/Testing/itkOpenCLProfilingTimeProbeTest.cxx
+++ b/Testing/itkOpenCLProfilingTimeProbeTest.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLProfilingTimeProbe.h"
+#include "../ITKimprovements/itkOpenCLProfilingTimeProbe.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLSamplerTest.cxx b/Testing/itkOpenCLSamplerTest.cxx
index 4b58ae0a2..d161a6b4b 100644
--- a/Testing/itkOpenCLSamplerTest.cxx
+++ b/Testing/itkOpenCLSamplerTest.cxx
@@ -16,7 +16,7 @@
  *
  *=========================================================================*/
 #include "itkTestHelper.h"
-#include "itkOpenCLSampler.h"
+#include "../ITKimprovements/itkOpenCLSampler.h"
 
 int
 main()
diff --git a/Testing/itkOpenCLSimpleTest.cxx b/Testing/itkOpenCLSimpleTest.cxx
index 571d395bc..e4d8ffd1b 100644
--- a/Testing/itkOpenCLSimpleTest.cxx
+++ b/Testing/itkOpenCLSimpleTest.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 #include "itkTestHelper.h"
 #include "itkOpenCLSimpleTest.h"
-#include "itkOpenCLProgram.h"
+#include "../ITKimprovements/itkOpenCLProgram.h"
 
 //------------------------------------------------------------------------------
 // This test is mainly to test CMake generating process when two kernels are
diff --git a/Testing/itkOpenCLSizeTest.cxx b/Testing/itkOpenCLSizeTest.cxx
index 20052d14a..236f4b0f2 100644
--- a/Testing/itkOpenCLSizeTest.cxx
+++ b/Testing/itkOpenCLSizeTest.cxx
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLSize.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLSize.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include "itkTestHelper.h"
 
 int
diff --git a/Testing/itkOpenCLStringUtilsTest.cxx b/Testing/itkOpenCLStringUtilsTest.cxx
index d4f0eed7d..4637ad730 100644
--- a/Testing/itkOpenCLStringUtilsTest.cxx
+++ b/Testing/itkOpenCLStringUtilsTest.cxx
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLStringUtils.h"
+#include "../ITKimprovements/itkOpenCLStringUtils.h"
 
 int
 main(int argc, char * argv[])
diff --git a/Testing/itkOpenCLVectorTest.cxx b/Testing/itkOpenCLVectorTest.cxx
index 961487aca..306daa9ae 100644
--- a/Testing/itkOpenCLVectorTest.cxx
+++ b/Testing/itkOpenCLVectorTest.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 #include "itkTestHelper.h"
 #include "itkOpenCLVectorTest.h"
-#include "itkOpenCLVector.h"
+#include "../ITKimprovements/itkOpenCLVector.h"
 #include <algorithm>
 
 //------------------------------------------------------------------------------
diff --git a/Testing/itkTestHelper.h b/Testing/itkTestHelper.h
index 4ea61ccd7..1f43e3cae 100644
--- a/Testing/itkTestHelper.h
+++ b/Testing/itkTestHelper.h
@@ -43,9 +43,9 @@
 #include "itkImageToImageFilter.h"
 
 // OpenCL includes
-#include "itkOpenCLContext.h"
-#include "itkOpenCLDevice.h"
-#include "itkOpenCLLogger.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLLogger.h"
 #include "itkOpenCLKernels.h"
 
 #include "itkTestOutputWindow.h"