diff --git a/src/kits/midi2/MidiLocalProducer.cpp b/src/kits/midi2/MidiLocalProducer.cpp
index 3612d8d4b7..d670cb6171 100644
--- a/src/kits/midi2/MidiLocalProducer.cpp
+++ b/src/kits/midi2/MidiLocalProducer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2003 Matthijs Hollemans
+ * Copyright (c) 2002-2004 Matthijs Hollemans
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"), 
@@ -349,7 +349,7 @@ void BMidiLocalProducer::SprayEvent(
 
 					#ifdef DEBUG
 					printf("*** spraying: ");
-					for (int32 t = 0; t < buf_size; ++t)
+					for (uint32 t = 0; t < buf_size; ++t)
 					{
 						printf("%02X, ", buffer[t]);
 					}
diff --git a/src/kits/midi2/MidiRoster.cpp b/src/kits/midi2/MidiRoster.cpp
index 6f4e2ffa2c..42601b0683 100644
--- a/src/kits/midi2/MidiRoster.cpp
+++ b/src/kits/midi2/MidiRoster.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2003 Matthijs Hollemans
+ * Copyright (c) 2002-2004 Matthijs Hollemans
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"), 
@@ -26,6 +26,8 @@
 #include "MidiRosterLooper.h"
 #include "protocol.h"
 
+using namespace BPrivate;
+
 // The midi_debug_level and midi_dispatcher_priority symbols 
 // were exported by Be's libmidi2, and even though they do not 
 // appear in the headers, some apps may still be using them. 
@@ -46,15 +48,17 @@ int32 midi_dispatcher_priority = B_REAL_TIME_PRIORITY;
 static BMidiRoster* roster = NULL;
 
 // Destroys the BMidiRoster instance when the app quits.
-static class BMidiRosterKiller
+namespace BPrivate
 {
-public:
-	~BMidiRosterKiller()
+	static struct BMidiRosterKiller
 	{
-		delete roster;
-	}
-} 
-killer;
+		~BMidiRosterKiller()
+		{
+			delete roster;
+		}
+	} 
+	midi_roster_killer;
+}
 
 //------------------------------------------------------------------------------
 
diff --git a/src/kits/midi2/MidiRosterLooper.cpp b/src/kits/midi2/MidiRosterLooper.cpp
index 77bae69128..270fc51f10 100644
--- a/src/kits/midi2/MidiRosterLooper.cpp
+++ b/src/kits/midi2/MidiRosterLooper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2003 Matthijs Hollemans
+ * Copyright (c) 2002-2004 Matthijs Hollemans
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"), 
@@ -27,6 +27,8 @@
 #include "MidiRosterLooper.h"
 #include "protocol.h"
 
+using namespace BPrivate;
+
 //------------------------------------------------------------------------------
 
 BMidiRosterLooper::BMidiRosterLooper()
diff --git a/src/kits/midi2/MidiRosterLooper.h b/src/kits/midi2/MidiRosterLooper.h
index 9d8d73aab5..ed79591f81 100644
--- a/src/kits/midi2/MidiRosterLooper.h
+++ b/src/kits/midi2/MidiRosterLooper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2003 Matthijs Hollemans
+ * Copyright (c) 2002-2004 Matthijs Hollemans
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"), 
@@ -28,6 +28,8 @@
 
 class BMidiRoster;
 
+namespace BPrivate {
+
 // Receives messages from the midi_server on behalf of the 
 // BMidiRoster. Also keeps track of the list of endpoints.
 class BMidiRosterLooper : public BLooper
@@ -136,4 +138,6 @@ private:
 	#endif
 };
 
+} // namespace BPrivate
+
 #endif // MIDI_ROSTER_LOOPER_H