diff --git a/headers/private/media/experimental/MediaClient.h b/headers/private/media/experimental/MediaClient.h
index 2f4d099a7e..019bbdd8c7 100755
--- a/headers/private/media/experimental/MediaClient.h
+++ b/headers/private/media/experimental/MediaClient.h
@@ -6,13 +6,11 @@
 #ifndef _MEDIA_CLIENT_H
 #define _MEDIA_CLIENT_H
 
-#include <ObjectList.h>
 #include <Buffer.h>
-
 #include <MediaAddOn.h>
 #include <MediaClientDefs.h>
 #include <MediaDefs.h>
-#include <MediaNode.h>
+#include <ObjectList.h>
 
 
 namespace BPrivate { namespace media {
@@ -56,7 +54,6 @@ public:
 			status_t				InitCheck() const;
 
 	// TODO: Should allow BControllable capabilities
-	// TODO: Offline mode is still missing
 
 	// When those functions return, the BMediaConnection is added to the
 	// list and is visible to other nodes as not connected. Any input/output