Index: uppsrc/CtrlLib/Splitter.cpp
===================================================================
--- uppsrc/CtrlLib/Splitter.cpp	(revision 3153)
+++ uppsrc/CtrlLib/Splitter.cpp	(working copy)
@@ -254,15 +254,13 @@
 	return *this;
 }
 
-Splitter::Splitter() {
-	style = -1;
+Splitter::Splitter()
+	: chstyle(NULL), style(-1), width(4), vert(false), mouseindex(-1)
+{
 	pos.Add(5000);
-	width = 4;
 	SetFrame(NullFrame());
-	vert = false;
 	NoWantFocus();
 	VSizePos(0, 0).HSizePos(0, 0);
-	mouseindex = -1;
 	SetStyle(StyleDefault());
 }
 
Index: uppsrc/Core/Defs.h
===================================================================
--- uppsrc/Core/Defs.h	(revision 3153)
+++ uppsrc/Core/Defs.h	(working copy)
@@ -1,7 +1,7 @@
 #ifdef PLATFORM_WIN32
 #define __BREAK__        (*(int *)0 = 0)
 #else
-#define __BREAK__        (*(int *)0 = 0) // kill(getpid(), SIGTRAP)
+#define __BREAK__        (*(volatile int *)0 = 0) // kill(getpid(), SIGTRAP)
 #endif
 
 #ifdef COMPILER_MSC
Index: uppsrc/art/BlueBar/BlueBar.upp
===================================================================
--- uppsrc/art/BlueBar/BlueBar.upp	(revision 3153)
+++ uppsrc/art/BlueBar/BlueBar.upp	(working copy)
@@ -1,5 +1,7 @@
 description "Visual style for ToolBar and MenuBar";
 
+uses
+	CtrlLib;
 file
 	BlueBar.h,
 	BlueSkin.iml,
Index: uppsrc/plugin/png/init
===================================================================
--- uppsrc/plugin/png/init	(revision 3153)
+++ uppsrc/plugin/png/init	(working copy)
@@ -2,7 +2,7 @@
 #define _plugin_png_icpp_init_stub
 #include "Core/init"
 #include "Draw/init"
-#define BLITZ_INDEX__ F38D3ACD6D8DA64078EB0B2289CBE1F7F
+#define BLITZ_INDEX__ F04E7E663C4ADD821568D6B0C938EF064
 #include "pngreg.icpp"
 #undef BLITZ_INDEX__
 #endif
Index: uppsrc/plugin/png/pngupp.cpp
===================================================================
--- uppsrc/plugin/png/pngupp.cpp	(revision 3153)
+++ uppsrc/plugin/png/pngupp.cpp	(working copy)
@@ -5,7 +5,7 @@
 #endif
 
 #include <Draw/Draw.h>
-#include "png.h"
+#include "plugin/png/png.h"
 
 NAMESPACE_UPP
 
Index: uppsrc/plugin/png/pngreg.icpp
===================================================================
--- uppsrc/plugin/png/pngreg.icpp	(revision 3153)
+++ uppsrc/plugin/png/pngreg.icpp	(working copy)
@@ -1,4 +1,4 @@
-#include "png.h"
+#include "plugin/png/png.h"
 
 NAMESPACE_UPP
 
Index: uppsrc/Painter/Painter.upp
===================================================================
--- uppsrc/Painter/Painter.upp	(revision 3153)
+++ uppsrc/Painter/Painter.upp	(working copy)
@@ -3,6 +3,22 @@
 uses
 	Core;
 
+library(LINUX) X11;
+
+library(LINUX) dl;
+
+library(LINUX !XLFD) Xft;
+
+library(BSD) "X11  Xau Xdmcp";
+
+library(BSD !XLFD) "Xft fontconfig Xrender freetype expat";
+
+library(LINUX !XLFD) "fontconfig Xrender freetype";
+
+library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
+
+library(FREEBSD) xcb;
+
 file
 	Painter.h,
 	Painter.hpp,