cut some useless includes

diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp
index 88a9c08..cef2ced 100644 (file)
--- a/src/kernel/activity/SynchroIo.cpp
+++ b/src/kernel/activity/SynchroIo.cpp
@@ -5,7 +5,6 @@
 
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/simix/popping_private.h"
 #include "src/simix/smx_private.h"
 
 void simgrid::kernel::activity::Io::suspend()

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 550172e..226236e 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -1,20 +1,16 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* \file UContext.cpp Context switching with ucontexts from System V         */
+/* \file UContext.cpp Context switching with ucontexts from System V        */
 
-#include <stdarg.h>
-
-#include <functional>
 #include <ucontext.h>           /* context relative declarations */
 
-#include "xbt/parmap.h"
-#include "src/simix/smx_private.h"
-#include "src/internal_config.h"
 #include "mc/mc.h"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.h"
+#include "xbt/parmap.h"
 
 /** Many integers are needed to store a pointer
  *

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index c1c7ea8..6243a29 100644 (file)
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -3,9 +3,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg_private.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
-#include <simgrid/s4u/host.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index c450a22..ae50dfb 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -4,11 +4,11 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/instr/instr_private.h"
-#include "msg_private.h"
 #include "mc/mc.h"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 
 void TRACE_msg_set_task_category(msg_task_t task, const char *category)
 {

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 85f009f..2ad8a58 100644 (file)
--- a/src/msg/msg_actions.cpp
+++ b/src/msg/msg_actions.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg_private.h"
-#include "xbt/dynar.h"
+#include "src/msg/msg_private.h"
 #include "xbt/replay.h"
 
 #include <errno.h>

diff --git a/src/msg/msg_deployment.cpp b/src/msg/msg_deployment.cpp
index 015d748..f21b33b 100644 (file)
--- a/src/msg/msg_deployment.cpp
+++ b/src/msg/msg_deployment.cpp
@@ -1,12 +1,9 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2014. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
+#include "src/msg/msg_private.h"
 
 /** \ingroup msg_simulation
  * \brief An application deployer.

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 9783390..15f3b15 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,15 +1,11 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/engine.hpp"
+#include "src/msg/msg_private.h"
 
 #if HAVE_LUA
 #include <lua.h>

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 77bd28c..f4dd8ab 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,18 +1,13 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/host.hpp"
 
-#include "simgrid/msg.h"
 #include "instr/instr_interface.h"
-#include "msg_private.h"
 #include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+#include "src/msg/msg_private.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index d7d6119..6ac5ddf 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -5,11 +5,8 @@
 
 #include <xbt/ex.hpp>
 
+#include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */
-#include "msg_private.h"
-#include "mc/mc.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)");
 

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index b676e16..2be2e10 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -4,11 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/s4u/host.hpp"
 #include "src/msg/msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/simix.h"
-#include <simgrid/s4u/host.hpp>
+
 #include <numeric>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index d7548f7..aff8c7e 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <simgrid/s4u/host.hpp>
-
-#include "msg_private.h"
-#include "xbt/log.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/msg/msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)");
 

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 2186710..b4d55aa 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -1,17 +1,12 @@
 /* Mailboxes in MSG */
 
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/ex.hpp>
-
-#include "simgrid/msg.h"
-#include "msg_private.h"
-#include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
+#include "src/msg/msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index fa1262c..0536796 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -7,19 +7,7 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
-#include <exception>
-#include <functional>
-
 #include "simgrid/msg.h"
-#include "simgrid/simix.h"
-#include "src/include/surf/surf.h"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/dynar.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/config.h"
-#include "src/instr/instr_private.h"
 
 #include "src/kernel/activity/SynchroExec.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
@@ -108,13 +96,6 @@ typedef struct msg_comm {
   msg_error_t status;           /* status of the communication once finished */
 } s_msg_comm_t;
 
-/******************************* VM *************************************/
-typedef struct dirty_page {
-  double prev_clock;
-  double prev_remaining;
-  msg_task_t task;
-} s_dirty_page, *dirty_page_t;
-
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   int debug_multiple_use;       /* whether we want an error message when reusing the same Task for 2 things */

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 6189fe7..14f9fc9 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -4,14 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <functional>
-
 #include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/functional.hpp"
+#include "simgrid/s4u/host.hpp"
 #include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
 

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index 4090fb3..a480186 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -4,12 +4,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/ex.hpp>
+#include "xbt/ex.hpp"
 
 #include "msg_private.h"
-#include "xbt/log.h"
 #include "xbt/synchro.h"
-#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
 

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index a8b0c6b..d0cbebb 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -5,8 +5,6 @@
 
 #include "msg_private.h"
 #include "src/simix/smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 
 /** @addtogroup m_task_management
  *

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index e2bd508..3cf519b 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -11,22 +11,22 @@
 
 #include <xbt/ex.hpp>
 
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include <simgrid/s4u/VirtualMachine.hpp>
-#include <simgrid/s4u/host.hpp>
 
-#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 #include "simgrid/host.h"
+#include "simgrid/simix.hpp"
 
-#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */
+typedef struct dirty_page {
+  double prev_clock;
+  double prev_remaining;
+  msg_task_t task;
+} s_dirty_page, *dirty_page_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API");
 
-
 /* **** ******** GENERAL ********* **** */
 
 /** \ingroup m_vm_management
@@ -117,8 +117,8 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_net
   params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize
   params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed
 
-  //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate,
-  //         params.mig_speed, dp_intensity, update_speed, host_speed);
+  XBT_DEBUG("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f", params.dp_rate,
+            params.mig_speed, dp_intensity, update_speed, host_speed);
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->setParameters(&params);
 
   return vm;

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 67cd7bf..0f5dcc5 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -5,14 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_host_private.h"
 
-#include <xbt/signal.hpp>
-
-#include "src/surf/cpu_cas01.hpp"
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
 simgrid::vm::VMModel* surf_vm_model = nullptr;

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 82b3d9e..be85c44 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,14 +1,8 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <boost/intrusive/list.hpp>
-#include <deque>
-
-#include <xbt/base.h>
-
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/surf/HostImpl.hpp"
 

diff --git a/src/plugins/vm/VmHostExt.hpp b/src/plugins/vm/VmHostExt.hpp
index 46a26c8..0a0bedb 100644 (file)
--- a/src/plugins/vm/VmHostExt.hpp
+++ b/src/plugins/vm/VmHostExt.hpp
@@ -3,8 +3,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/base.h>
-
 #include "src/surf/HostImpl.hpp"
 
 #ifndef VM_HOST_INFO_HPP_

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index 05d21f9..f0884c9 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -3,16 +3,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "simgrid/datatypes.h"
-#include "simgrid/s4u/VirtualMachine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/simix.hpp"
 #include "src/instr/instr_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/simix/smx_host_private.h"
-#include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_cas01.hpp"
-#include "xbt/asserts.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
 

diff --git a/src/s4u/s4u_activity.cpp b/src/s4u/s4u_activity.cpp
index 4568abb..4e8caaa 100644 (file)
--- a/src/s4u/s4u_activity.cpp
+++ b/src/s4u/s4u_activity.cpp
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "xbt/asserts.h"
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/Activity.hpp"
 

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index fbd34dc..6b6f990 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -13,7 +12,6 @@
 #include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index ffc3d90..492e147 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -7,12 +7,13 @@
 #include <string>
 #include <vector>
 
+#include "simgrid/s4u/host.hpp"
 #include "smx_private.h"
-#include <xbt/ex.hpp>
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
+#include "xbt/dict.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
+#include <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 0f31142..989eade 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,11 +7,8 @@
 #include "smx_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "xbt/sysdep.h"
 #include <xbt/ex.hpp>
 
-#include "src/kernel/activity/SynchroExec.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 0db9188..c4594df 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -16,7 +16,6 @@
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
-#include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/kernel/activity/SynchroExec.hpp"
 
 /** @brief Host datatype from SIMIX POV */

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 51b0176..157deca 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -7,9 +7,6 @@
 #ifndef _SIMIX_NETWORK_PRIVATE_H
 #define _SIMIX_NETWORK_PRIVATE_H
 
-#include <string>
-
-#include <boost/intrusive_ptr.hpp>
 #include <boost/circular_buffer.hpp>
 
 #include <xbt/base.h>

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index ab1a6da..e78326f 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -17,24 +17,13 @@
 #include "src/internal_config.h"
 #include "simgrid/simix.h"
 #include "surf/surf.h"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/mallocator.h"
 #include "xbt/config.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/function_types.h"
 #include "src/xbt/ex_interface.h"
 #include "src/instr/instr_private.h"
-#include "smx_host_private.h"
-#include "smx_io_private.h"
-#include "smx_network_private.h"
-#include "popping_private.h"
-#include "smx_synchro_private.h"
 
 #include <signal.h>
-#include "src/simix/ActorImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 
 /********************************** Simix Global ******************************/

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 3ffb283..59f55b0 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -3,14 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <simgrid/s4u/host.hpp>
-
-#include "src/simix/smx_private.h"
-#include "cpu_cas01.hpp"
 #include "src/surf/HostImpl.hpp"
-#include "simgrid/sg_config.h"
-
-#include "network_interface.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");