diff --git a/src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh
index 23b26cb3..1992dd00 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh
@@ -57,7 +57,7 @@
 // --------------------
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/GenProg.hh>
-#include <OpenMesh/Core/Mesh/Kernels/ArrayKernel/ArrayKernelT.hh>
+#include <OpenMesh/Core/Mesh/ArrayKernel.hh>
 // --------------------
 #include <OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh>
 
diff --git a/src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh
index 71e3a243..eb12ab48 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh
@@ -46,12 +46,12 @@
 //== INCLUDES =================================================================
 
 #include <OpenMesh/Core/Utils/GenProg.hh>
-#include <OpenMesh/Core/Attributes/Attributes.hh>
+#include <OpenMesh/Core/Mesh/Attributes.hh>
 // --------------------
 #include <OpenMesh/Tools/Kernel_OSG/PropertyT.hh>
 #include <OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh>
 // --------------------
-#include <OpenSG/OSGGeometry.h>
+#include <osg/Geometry>
 
 
 //== NAMESPACES ===============================================================
diff --git a/src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh b/src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh
index d3025c66..0a0694a2 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh
@@ -46,7 +46,7 @@
 //== INCLUDES =================================================================
 
 #include <OpenMesh/Core/Utils/Property.hh>
-#include <OpenMesh/Core/Mesh/Kernels/Common/BaseKernel.hh>
+#include <OpenMesh/Core/Mesh/BaseKernel.hh>
 // --------------------
 #include <OpenMesh/Tools/Kernel_OSG/PropertyT.hh>
 
diff --git a/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh b/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh
index 119987ec..7ff653fb 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh
@@ -45,12 +45,12 @@
 
 //== INCLUDES =================================================================
 
-#include <OpenMesh/Core/Attributes/Attributes.hh>
-#include <OpenMesh/Core/Mesh/Kernels/Common/BaseKernel.hh>
+#include <OpenMesh/Core/Mesh/Attributes.hh>
+#include <OpenMesh/Core/Mesh/BaseKernel.hh>
 #include <OpenMesh/Core/Utils/GenProg.hh>
 #include <OpenMesh/Core/Utils/Property.hh>
 //
-#include <OpenSG/OSGGeometry.h>
+#include <osg/Geometry>
 //
 #include <stdexcept>
 #include <vector>
diff --git a/src/OpenMesh/Tools/Kernel_OSG/Traits.hh b/src/OpenMesh/Tools/Kernel_OSG/Traits.hh
index c2e15903..6e8e9888 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/Traits.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/Traits.hh
@@ -61,7 +61,7 @@
 #include <OpenMesh/Core/Mesh/Traits.hh>
 #include <OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh>
 //
-#include <OpenSG/OSGGeometry.h>
+#include <osg/Geometry>
 
 //== NAMESPACES ===============================================================
 
diff --git a/src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
index 7b4bdebb..19d0cc38 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
@@ -58,16 +58,16 @@
 // --------------------
 #include <OpenMesh/Core/Mesh/TriMeshT.hh>
 #include <OpenMesh/Core/Mesh/Traits.hh>
-#include <OpenMesh/Core/Mesh/Kernels/ArrayKernel/ArrayKernelT.hh>
-#include <OpenMesh/Core/Mesh/Kernels/ArrayKernel/ArrayItems.hh>
-#include <OpenMesh/Core/Mesh/Kernels/Common/Handles.hh>
-#include <OpenMesh/Core/Mesh/Kernels/Common/FinalMeshItemsT.hh>
+#include <OpenMesh/Core/Mesh/ArrayKernel.hh>
+//#include <OpenMesh/Core/Mesh/ArrayItems.hh>
+#include <OpenMesh/Core/Mesh/Handles.hh>
+#include <OpenMesh/Core/Mesh/FinalMeshItemsT.hh>
 // --------------------
 #include <OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh>
 #include <OpenMesh/Tools/Kernel_OSG/Traits.hh>
 #include <OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh>
 // --------------------
-#include <OpenSG/OSGGeometry.h>
+#include <osg/Geometry>
 
 
 //== NAMESPACES ===============================================================
diff --git a/src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh b/src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh
index c862361d..9f4fa6ab 100644
--- a/src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh
+++ b/src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh
@@ -47,7 +47,7 @@
 
 //== INCLUDES =================================================================
 
-#include <OpenSG/OSGGeometry.h>
+#include <osg/Geometry>
 #include <OpenMesh/Core/Utils/vector_cast.hh>
 
 //== NAMESPACES ===============================================================