diff --git a/rainbow/Framebuffer/Framebuffer.upp b/rainbow/Framebuffer/Framebuffer.upp
index 09c209544..6df6c1a8e 100644
--- a/rainbow/Framebuffer/Framebuffer.upp
+++ b/rainbow/Framebuffer/Framebuffer.upp
@@ -1,7 +1,8 @@
 description "Generic framebuffer GUI rainbow\377";
 
 uses
-	Painter;
+	Painter,
+	CtrlLib;
 
 file
 	Framebuffer.h,
diff --git a/rainbow/Framebuffer/Image.cpp b/rainbow/Framebuffer/Image.cpp
index 434744d07..3a1253eea 100644
--- a/rainbow/Framebuffer/Image.cpp
+++ b/rainbow/Framebuffer/Image.cpp
@@ -1,9 +1,7 @@
-#include <CtrlLib/CtrlLib.h>
+#include <CtrlCore/CtrlCore.h>
 
 #ifdef GUI_FB
 
-//#include <shellapi.h>
-
 NAMESPACE_UPP
 
 #define LTIMING(x) // RTIMING(x)
diff --git a/rainbow/Framebuffer/init b/rainbow/Framebuffer/init
index d51b053d2..1628fe8ac 100644
--- a/rainbow/Framebuffer/init
+++ b/rainbow/Framebuffer/init
@@ -1,4 +1,5 @@
 #ifndef _Framebuffer_icpp_init_stub
 #define _Framebuffer_icpp_init_stub
 #include "Painter/init"
+#include "CtrlLib/init"
 #endif
diff --git a/rainbow/LinuxFb/LinuxFb.upp b/rainbow/LinuxFb/LinuxFb.upp
index 0578d350d..db7d895e9 100644
--- a/rainbow/LinuxFb/LinuxFb.upp
+++ b/rainbow/LinuxFb/LinuxFb.upp
@@ -1,3 +1,6 @@
+uses
+	Framebuffer;
+
 file
 	LinuxFb.h,
 	LinuxFbLocal.h,
diff --git a/rainbow/LinuxFb/init b/rainbow/LinuxFb/init
index c7d0bbd89..d303230be 100644
--- a/rainbow/LinuxFb/init
+++ b/rainbow/LinuxFb/init
@@ -1,3 +1,4 @@
 #ifndef _LinuxFb_icpp_init_stub
 #define _LinuxFb_icpp_init_stub
+#include "Framebuffer/init"
 #endif
diff --git a/rainbow/Paint/Paint.upp b/rainbow/Paint/Paint.upp
index 1aa2106d6..443efcedc 100644
--- a/rainbow/Paint/Paint.upp
+++ b/rainbow/Paint/Paint.upp
@@ -2,7 +2,6 @@ description "Paint method and Draw example\377";
 
 uses
 	CtrlLib,
-	Framebuffer,
 	RichEdit;
 
 uses(WINFB) WinFb;
@@ -11,6 +10,8 @@ uses(LINUXFB) LinuxFb;
 
 uses(SDLFB) SDLFb;
 
+uses(WINGL) WinGl;
+
 file
 	Draw.cpp;
 
diff --git a/rainbow/Paint/init b/rainbow/Paint/init
index 8fbba8a89..ff2b97c8a 100644
--- a/rainbow/Paint/init
+++ b/rainbow/Paint/init
@@ -1,10 +1,9 @@
 #ifndef _Paint_icpp_init_stub
 #define _Paint_icpp_init_stub
 #include "CtrlLib/init"
-#include "Framebuffer/init"
 #include "RichEdit/init"
-#include "WinGl/init"
 #include "WinFb/init"
 #include "LinuxFb/init"
 #include "SDLFb/init"
+#include "WinGl/init"
 #endif
diff --git a/rainbow/PaintGl/PaintGl.upp b/rainbow/PaintGl/PaintGl.upp
index b42963ead..b05f18b44 100644
--- a/rainbow/PaintGl/PaintGl.upp
+++ b/rainbow/PaintGl/PaintGl.upp
@@ -1,7 +1,7 @@
 uses
-	CtrlLib,
-	Painter,
-	WinGl;
+	CtrlLib;
+
+uses(WINGL) WinGl;
 
 file
 	main.cpp;
diff --git a/rainbow/PaintGl/init b/rainbow/PaintGl/init
index 84aafd54a..3bef89a90 100644
--- a/rainbow/PaintGl/init
+++ b/rainbow/PaintGl/init
@@ -1,6 +1,5 @@
 #ifndef _PaintGl_icpp_init_stub
 #define _PaintGl_icpp_init_stub
 #include "CtrlLib/init"
-#include "Painter/init"
 #include "WinGl/init"
 #endif
diff --git a/rainbow/SDLFb/SDLFb.upp b/rainbow/SDLFb/SDLFb.upp
index 5a5bb878f..41cba9ed4 100644
--- a/rainbow/SDLFb/SDLFb.upp
+++ b/rainbow/SDLFb/SDLFb.upp
@@ -1,3 +1,6 @@
+uses
+	Framebuffer;
+
 library(MSC) "SDL SDLmain";
 
 library(GCC WIN32 !SHARED) "SDL.dll SDLmain mingw32";
diff --git a/rainbow/SDLFb/init b/rainbow/SDLFb/init
index a5444439f..2c27d20ed 100644
--- a/rainbow/SDLFb/init
+++ b/rainbow/SDLFb/init
@@ -1,3 +1,4 @@
 #ifndef _SDLFb_icpp_init_stub
 #define _SDLFb_icpp_init_stub
+#include "Framebuffer/init"
 #endif
diff --git a/rainbow/UWord/UWord.upp b/rainbow/UWord/UWord.upp
index 4226bdea5..efb53652e 100644
--- a/rainbow/UWord/UWord.upp
+++ b/rainbow/UWord/UWord.upp
@@ -6,8 +6,6 @@ uses
 	PdfDraw,
 	plugin\jpg;
 
-uses(WINFB | SDLFB) Framebuffer;
-
 uses(SKELETON) Skeleton;
 
 uses(WINFB) WinFb;
@@ -16,6 +14,8 @@ uses(WINALT) WinAlt;
 
 uses(SDLFB) SDLFb;
 
+uses(WINGL) WinGl;
+
 file
 	UWord.cpp,
 	UWord.iml;
@@ -24,5 +24,6 @@ mainconfig
 	"" = "GUI WINFB",
 	"" = "GUI WINALT",
 	"" = "GUI SKELETON",
-	"" = "GUI SDLFB";
+	"" = "GUI SDLFB",
+	"" = "GUI WINGL";
 
diff --git a/rainbow/UWord/init b/rainbow/UWord/init
index 053e11def..af2471007 100644
--- a/rainbow/UWord/init
+++ b/rainbow/UWord/init
@@ -4,9 +4,9 @@
 #include "RichEdit/init"
 #include "PdfDraw/init"
 #include "plugin\jpg/init"
-#include "Framebuffer/init"
 #include "Skeleton/init"
 #include "WinFb/init"
 #include "WinAlt/init"
 #include "SDLFb/init"
+#include "WinGl/init"
 #endif
diff --git a/rainbow/WinGl/Dnd.cpp b/rainbow/WinGl/Dnd.cpp
index 79efd9ff0..b6d7411d1 100644
--- a/rainbow/WinGl/Dnd.cpp
+++ b/rainbow/WinGl/Dnd.cpp
@@ -19,7 +19,7 @@ Image MakeDragImage(const Image& arrow, Image sample);
 
 Image MakeDragImage(const Image& arrow, const Image& arrow98, Image sample)
 {
-#if PLATFORM_WIN32
+#ifdef PLATFORM_WIN32
 	if(IsWin2K())
 		return MakeDragImage(arrow, sample);
 	else
diff --git a/rainbow/WinGl/WinGl.h b/rainbow/WinGl/WinGl.h
index e4da28257..572f2999a 100644
--- a/rainbow/WinGl/WinGl.h
+++ b/rainbow/WinGl/WinGl.h
@@ -62,7 +62,7 @@ struct OpenGLFont : Moveable<OpenGLFont>
 	};
 
 	Vector<CharInfo> chars;
-	VectorMap<int, VectorMap<int, float>> kerns;
+	VectorMap<int, VectorMap<int, float> > kerns;
 	Vector<String> files;
 	Array<const byte> compiledFiles;
 	Vector<int64> pages;
@@ -295,7 +295,9 @@ END_UPP_NAMESPACE
 #define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <WinGl/Top.h>
 
 //#include <CtrlCore/stdids.h>
+#ifndef PLATFORM_WIN32
 #include "vkcodes.h" //FIXME
+#endif
 
 #define GUIPLATFORM_INCLUDE_AFTER <WinGl/After.h>
 
diff --git a/rainbow/WinGl/WinGl.upp b/rainbow/WinGl/WinGl.upp
index 06a29dd6e..8800a946f 100644
--- a/rainbow/WinGl/WinGl.upp
+++ b/rainbow/WinGl/WinGl.upp
@@ -1,3 +1,6 @@
+uses
+	Painter;
+
 options
 	"-D_WIN32 -DGLEW_STATIC";
 
diff --git a/rainbow/WinGl/init b/rainbow/WinGl/init
index 3359257e3..c0c02a51a 100644
--- a/rainbow/WinGl/init
+++ b/rainbow/WinGl/init
@@ -1,3 +1,4 @@
 #ifndef _WinGl_icpp_init_stub
 #define _WinGl_icpp_init_stub
+#include "Painter/init"
 #endif