Index: cegui-mk2-0.7.6/Samples/common/src/CEGuiIrrlichtBaseApplication.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/Samples/common/src/CEGuiIrrlichtBaseApplication.cpp	2012-01-22 17:06:00.000000000 +0100
+++ cegui-mk2-0.7.6/Samples/common/src/CEGuiIrrlichtBaseApplication.cpp	2012-03-09 15:23:58.292187544 +0100
@@ -29,7 +29,7 @@
 #   include "config.h"
 #endif
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 # include <unistd.h>
 #endif
 
Index: cegui-mk2-0.7.6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/Samples/common/src/CEGuiOpenGLBaseApplication.cpp	2012-01-22 17:06:00.000000000 +0100
+++ cegui-mk2-0.7.6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp	2012-03-09 15:24:10.524188053 +0100
@@ -29,7 +29,7 @@
 #   include "config.h"
 #endif
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 # include <unistd.h>
 #endif
 
@@ -163,7 +163,7 @@
 
     initialiseResourceGroupDirectories();
     initialiseDefaultResourceGroups();
-    
+
     // setup required to do direct rendering of FPS value
     const CEGUI::Rect scrn(CEGUI::Vector2(0, 0), d_renderer->getDisplaySize());
     d_fps_geometry = &d_renderer->createGeometryBuffer();
Index: cegui-mk2-0.7.6/Samples/common/src/CEGuiSample.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/Samples/common/src/CEGuiSample.cpp	2012-01-22 17:06:00.000000000 +0100
+++ cegui-mk2-0.7.6/Samples/common/src/CEGuiSample.cpp	2012-03-09 15:23:49.004187159 +0100
@@ -35,7 +35,7 @@
 // includes for renderer selector classes
 #if defined( __WIN32__ ) || defined( _WIN32 )
 #   include "Win32CEGuiRendererSelector.h"
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 #   ifdef CEGUI_SAMPLES_USE_GTK2
 #       include "GTK2CEGuiRendererSelector.h"
 #   else
@@ -162,7 +162,7 @@
     d_rendererSelector->setRendererAvailability(Direct3D10GuiRendererType);
 #endif
 
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
     // decide which method to use for renderer selection
 #   ifdef CEGUI_SAMPLES_USE_GTK2
         d_rendererSelector = new GTK2CEGuiRendererSelector();
Index: cegui-mk2-0.7.6/cegui/include/CEGUIDynamicModule.h
===================================================================
--- cegui-mk2-0.7.6.orig/cegui/include/CEGUIDynamicModule.h	2012-01-22 17:06:00.000000000 +0100
+++ cegui-mk2-0.7.6/cegui/include/CEGUIDynamicModule.h	2012-03-09 15:25:39.916191759 +0100
@@ -43,7 +43,7 @@
     struct HINSTANCE__;
     typedef struct HINSTANCE__* hInstance;
 
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY )
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
Index: cegui-mk2-0.7.6/cegui/src/CEGUIDynamicModule.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/cegui/src/CEGUIDynamicModule.cpp	2012-01-22 17:06:01.000000000 +0100
+++ cegui-mk2-0.7.6/cegui/src/CEGUIDynamicModule.cpp	2012-03-09 15:25:31.780191422 +0100
@@ -46,7 +46,7 @@
 #   include "macPlugins.h"
 #endif
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 #   include "dlfcn.h"
 #endif
 
@@ -64,7 +64,7 @@
 		return;
 	} // if(name.empty())
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
     #if defined(CEGUI_HAS_VERSION_SUFFIX) || defined(CEGUI_HAS_BUILD_SUFFIX)
         // check if we are being asked to open a CEGUI .so, if so postfix the
         // name with our package version
@@ -109,7 +109,7 @@
 
     d_handle = DYNLIB_LOAD(d_moduleName.c_str());
 
-#if defined(__linux__) || defined(__MINGW32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__MINGW32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
     if (!d_handle)
     {
         // see if we need to add the leading 'lib'
@@ -150,13 +150,13 @@
 String DynamicModule::getFailureString() const
 {
     String retMsg;
-#if defined(__linux__) || defined (__APPLE_CC__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined (__APPLE_CC__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
     retMsg = DYNLIB_ERROR();
 #elif defined(__WIN32__) || defined(_WIN32)
     LPVOID msgBuffer;
 
-    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-                      FORMAT_MESSAGE_FROM_SYSTEM | 
+    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                      FORMAT_MESSAGE_FROM_SYSTEM |
                       FORMAT_MESSAGE_IGNORE_INSERTS,
                       0,
                       GetLastError(),
Index: cegui-mk2-0.7.6/cegui/src/CEGUISystem.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/cegui/src/CEGUISystem.cpp	2012-01-22 17:06:01.000000000 +0100
+++ cegui-mk2-0.7.6/cegui/src/CEGUISystem.cpp	2012-03-09 15:24:37.132189154 +0100
@@ -110,7 +110,7 @@
     return timeGetTime() / 1000.0;
 }
 
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 #include <sys/time.h>
 double SimpleTimer::currentTime()
 {
@@ -1684,7 +1684,7 @@
 {
     if (top == bottom)
         return;
-    
+
     Window* const parent = bottom->getParent();
 
     if (parent && parent != top)
@@ -1918,7 +1918,7 @@
     if (parser != d_customRenderedStringParser)
     {
         d_customRenderedStringParser = parser;
-        
+
         // fire event
         EventArgs args;
         fireEvent(EventRenderedStringParserChanged, args, EventNamespace);
Index: cegui-mk2-0.7.6/cegui/src/RendererModules/OpenGL/CEGUIOpenGLRenderer.cpp
===================================================================
--- cegui-mk2-0.7.6.orig/cegui/src/RendererModules/OpenGL/CEGUIOpenGLRenderer.cpp	2012-01-22 17:06:01.000000000 +0100
+++ cegui-mk2-0.7.6/cegui/src/RendererModules/OpenGL/CEGUIOpenGLRenderer.cpp	2012-03-09 15:25:02.920190225 +0100
@@ -46,7 +46,7 @@
 #include <sstream>
 #include <algorithm>
 
-#if defined(__linux__)  || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__)  || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
 #   include "CEGUIOpenGLGLXPBTextureTarget.h"
 #elif defined(_WIN32) || defined(__WIN32__)
 #   include "CEGUIOpenGLWGLPBTextureTarget.h"
@@ -526,7 +526,7 @@
             new OGLTemplateTargetFactory<OpenGLFBOTextureTarget>;
     }
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(__FreeBSD_kernel__)
     // on linux (etc), we can try for GLX pbuffer support
     else if (((tt_type == TTT_AUTO) || (tt_type == TTT_PBUFFER)) &&
              GLXEW_VERSION_1_3)