diff --git a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp
index 01d787279c..2812702620 100644
--- a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp
+++ b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp
@@ -18,7 +18,7 @@
 #include <TextControl.h>
 #include <View.h>
 #include <List.h>
-#include <algobase.h>
+#include <algorithm>
 #include <assert.h>
 #include <stdio.h>
 
@@ -250,8 +250,8 @@ void ViewLayoutFactory::ResizeAroundChildren(BView& view, BPoint margin)
 		BView* childView = view.ChildAt(i);
 		if (childView) {
 			BRect r = childView->Frame();
-			fMax_x = max(fMax_x, r.right);
-			fMax_y = max(fMax_y, r.bottom);
+			fMax_x = std::max(fMax_x, r.right);
+			fMax_y = std::max(fMax_y, r.bottom);
 		}
 	}
 	
diff --git a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h
index 1e91266155..38ae46ec4a 100644
--- a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h
+++ b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h
@@ -14,6 +14,7 @@
 #ifndef _ViewLayoutFactory_h
 #define _ViewLayoutFactory_h
 
+#include <InterfaceKit.h>
 #include <SupportDefs.h>
 
 typedef enum { CORNER_TOPLEFT, CORNER_BOTTOMLEFT,
@@ -76,4 +77,4 @@ public:
 	void			ResizeAroundChildren(BView& view, BPoint margin);
 };
 
-#endif /* _ViewLayoutFactory_h */
\ No newline at end of file
+#endif /* _ViewLayoutFactory_h */