diff --git a/src/bin/screen_blanker/ScreenSaverWindow.cpp b/src/bin/screen_blanker/ScreenSaverWindow.cpp
index 73be5377e9..2761946fad 100644
--- a/src/bin/screen_blanker/ScreenSaverWindow.cpp
+++ b/src/bin/screen_blanker/ScreenSaverWindow.cpp
@@ -40,9 +40,9 @@ ScreenSaverFilter::Filter(BMessage* message, BHandler** target)
 			case B_MOUSE_MOVED:
 			{
 				// ignore the initial B_MOUSE_MOVED sent by the app_server
-				bool transit_only = false;
-				if (message->FindBool("be:transit_only", &transit_only) == B_OK
-					&& transit_only)
+				bool transitOnly = false;
+				if (message->FindBool("be:transit_only", &transitOnly) == B_OK
+					&& transitOnly)
 					return B_DISPATCH_MESSAGE;
 
 				// Fall through
diff --git a/src/servers/app/WorkspacesView.cpp b/src/servers/app/WorkspacesView.cpp
index 8593afa638..3292dd5269 100644
--- a/src/servers/app/WorkspacesView.cpp
+++ b/src/servers/app/WorkspacesView.cpp
@@ -18,7 +18,6 @@
 
 #include <WindowPrivate.h>
 
-using std::max;
 
 WorkspacesView::WorkspacesView(BRect frame, BPoint scrollingOffset,
 		const char* name, int32 token, uint32 resizeMode, uint32 flags)
@@ -558,7 +557,7 @@ WorkspacesView::MouseMoved(BMessage* message, BPoint where)
 
 	// Don't treat every little mouse move as a window move - this would
 	// make it too hard to activate a workspace.
-	float diff = max(fabs(fClickPoint.x - where.x),
+	float diff = max_c(fabs(fClickPoint.x - where.x),
 		fabs(fClickPoint.y - where.y));
 	if (!fHasMoved && diff > 2)
 		fHasMoved = true;