/* xbt.h - Public interface to the xbt (SimGrid's toolbox) */
-/* Copyright (c) 2004-2017. The SimGrid Team.
+/* Copyright (c) 2004-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <xbt/dynar.h>
#include <xbt/dict.h>
-#include <xbt/swag.h>
#include <xbt/parmap.h>
#include <xbt/config.h>
+#ifdef __cplusplus
+#include <xbt/config.hpp>
+#endif
#include <xbt/cunit.h>
#include <xbt/xbt_os_thread.h>
#include <xbt/xbt_os_time.h>
-#endif /* xbt_H */
+#endif /* XBT_H */