further trim the includes

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 0a87584..3ec7abb 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/VirtualMachine.hpp"
-#include "simgrid/simix.h"
+#include "src/simix/ActorImpl.hpp"
 #include "src/surf/HostImpl.hpp"
 
 #ifndef VM_INTERFACE_HPP_
@@ -58,13 +58,13 @@ public:
   ~VirtualMachineImpl();
 
   /** @brief Suspend the VM */
-  virtual void suspend(smx_actor_t issuer);
+  virtual void suspend(simgrid::simix::ActorImpl* issuer);
 
   /** @brief Resume the VM */
   virtual void resume();
 
   /** @brief Shutdown the VM */
-  virtual void shutdown(smx_actor_t issuer);
+  virtual void shutdown(simgrid::simix::ActorImpl* issuer);
 
   /** @brief Change the physical host on which the given VM is running */
   virtual void setPm(s4u::Host* dest);

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index daae9a4..8d2daff 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -4,22 +4,12 @@
 /* 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 <list>
-
-#include <xbt/base.h>
-#include <xbt/signal.hpp>
-
-#include <simgrid/forward.h>
-#include <simgrid/s4u/host.hpp>
-
-#include "surf/datatypes.h"
-#include "surf_interface.hpp"
-#include "maxmin_private.hpp"
-#include "trace_mgr.hpp"
-
 #ifndef SURF_CPU_INTERFACE_HPP_
 #define SURF_CPU_INTERFACE_HPP_
 
+#include "simgrid/s4u/host.hpp"
+#include "src/surf/maxmin_private.hpp"
+
 /***********
  * Classes *
  ***********/

diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp
index 9b0a321..eabf183 100644 (file)
--- a/src/surf/maxmin_private.hpp
+++ b/src/surf/maxmin_private.hpp
@@ -7,8 +7,6 @@
 #ifndef _SURF_MAXMIN_PRIVATE_H
 #define _SURF_MAXMIN_PRIVATE_H
 
-#include <xbt/base.h>
-
 #include "surf/maxmin.h"
 #include "xbt/swag.h"
 #include "xbt/mallocator.h"

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index d13f010..8e4e20a 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,12 +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 "plugins/energy.hpp"
 #include "src/instr/instr_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "src/surf/network_interface.hpp"
-#include "surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index a013167..c4ccfb2 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -6,22 +6,14 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
-#include <cstddef>
-#include <string>
-
-#include <xbt.h>
-#include <memory>
-#include <utility>
-
 #include <boost/intrusive/list.hpp>
 
-#include <xbt/signal.hpp>
+#include "xbt/signal.hpp"
 
-#include "xbt/lib.h"
-#include "surf/surf_routing.h"
-#include "surf/surf.h"
 #include "src/surf/surf_private.h"
-#include "src/internal_config.h"
+#include "surf/surf.h"
+#include "surf/surf_routing.h"
+#include "xbt/str.h"
 
 #define NO_MAX_DURATION -1.0
 

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 729517c..afce32e 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,5 +1,4 @@
-/* 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. */
@@ -10,7 +9,6 @@
 #include "surf/surf.h"
 #include "surf/maxmin.h"
 #include "src/surf/trace_mgr.hpp"
-#include <stdio.h>
 
 #define NO_MAX_DURATION -1.0
 
@@ -42,10 +40,6 @@ XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
  */
 XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
 
-/**
- * Routing logic
- */
-
 extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;