diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp
index 16e09bef2..11cbebec0 100644
--- a/src/guiengine/layout_manager.cpp
+++ b/src/guiengine/layout_manager.cpp
@@ -15,17 +15,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/irr_driver.hpp"
-#include "guiengine/abstract_top_level_container.hpp"
-#include "guiengine/engine.hpp"
 #include "guiengine/layout_manager.hpp"
-#include "guiengine/scalable_font.hpp"
-#include "guiengine/widget.hpp"
-#include "io/file_manager.hpp"
-#include "utils/ptr_vector.hpp"
-#include <sstream>
 
-using namespace GUIEngine;
+#include <sstream>
 
 #include "irrlicht.h"
 using namespace irr;
@@ -35,6 +27,19 @@ using namespace video;
 using namespace io;
 using namespace gui;
 
+#include "graphics/irr_driver.hpp"
+#include "guiengine/abstract_top_level_container.hpp"
+#include "guiengine/engine.hpp"
+#include "guiengine/scalable_font.hpp"
+#include "guiengine/widget.hpp"
+#include "io/file_manager.hpp"
+#include "utils/ptr_vector.hpp"
+
+using namespace GUIEngine;
+
+#ifndef round
+# define round(x)  (floor(x+0.5f))
+#endif
 
 // ----------------------------------------------------------------------------
 
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index 382553000..0ec6fa047 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -296,6 +296,10 @@
 					RelativePath="..\..\guiengine\abstract_state_manager.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\abstract_top_level_container.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\CGUISpriteBank.cpp"
 					>
@@ -326,6 +330,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\layout_manager.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\modaldialog.cpp"
 					>
@@ -1092,6 +1100,10 @@
 					RelativePath="..\..\guiengine\abstract_state_manager.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\abstract_top_level_container.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\engine.hpp"
 					>
@@ -1100,6 +1112,10 @@
 					RelativePath="..\..\guiengine\event_handler.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\layout_manager.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\modaldialog.hpp"
 					>