--- a/src/widget/widget.h	Mon Mar 26 21:00:16 2007 +0000
+++ b/src/widget/widget.h	Mon Mar 26 21:31:37 2007 +0000
@@ -123,10 +123,10 @@
 		, m_container(container)
 		, m_feature_flags(feature_flags)
 		, m_color(color)
+		, m_tooltips(tooltips)
+		, m_anchors(PIN_NONE)
 		, m_is_closing(false)
 		, m_dont_clip(false)
-		, m_tooltips(tooltips)
-		, m_anchors(PIN_NONE)
 		, m_size_step(1, 1)
 	{}
 

--- a/src/widget/widget_types.h	Mon Mar 26 21:00:16 2007 +0000
+++ b/src/widget/widget_types.h	Mon Mar 26 21:31:37 2007 +0000
@@ -5,6 +5,7 @@
 
 #include "widget.h"
 #include "table/strings.h"
+#include <string>
 
 namespace gui {
 
@@ -111,9 +112,9 @@
 	static const FeatureFlags DEFAULT_FEATURES = FF_NONE;
 
 protected:
-	StringID      m_text_id;
+	StringID        m_text_id;
 public:
-	std::string   m_text;
+	::std::string   m_text;
 
 public:
 	TextButton()