inline another VM function, and kill another one, unused

[simgrid.git] / include / xbt.h

diff --git a/include/xbt.h b/include/xbt.h
index 96c204a..66e97a7 100644 (file)
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -1,6 +1,6 @@
 /* xbt.h - Public interface to the xbt (SimGrid's toolbox)                  */
 
-/* Copyright (c) 2004-2012. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,6 +12,7 @@
 #include <xbt/misc.h>
 #include <xbt/sysdep.h>
 #include <xbt/str.h>
+#include <xbt/file.h>
 #include <xbt/function_types.h>
 
 #include <xbt/asserts.h>
@@ -22,16 +23,14 @@
 
 #include <xbt/dynar.h>
 #include <xbt/dict.h>
-#include <xbt/set.h>
 #include <xbt/swag.h>
 #include <xbt/heap.h>
-#include <xbt/queue.h>
 #include <xbt/parmap.h>
 
-#include <xbt/peer.h>
 #include <xbt/config.h>
 #include <xbt/cunit.h>
 
 #include <xbt/xbt_os_thread.h>
+#include <xbt/xbt_os_time.h>
 
 #endif                          /* xbt_H */