X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/554255fe3f311a54df171d31a4a27f4004840f59..c972ddd5a74b83c183357f707e7dfba87d48e750:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 4e0437ba3f..32a23f4fa6 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -156,22 +156,23 @@ class System;
 }
 namespace resource {
 class Action;
-class Cpu;
+class CpuImpl;
 class Model;
 class Resource;
 class CpuModel;
 class NetworkModel;
+class NetworkModelIntf;
 class LinkImpl;
 class NetworkAction;
 class DiskImpl;
 class DiskModel;
 }
+namespace timer {
+class Timer;
+}
 namespace routing {
-class ClusterCreationArgs;
-class LinkCreationArgs;
 class NetPoint;
 class NetZoneImpl;
-class RouteCreationArgs;
 }
 namespace profile {
 class Event;
@@ -181,7 +182,6 @@ class Profile;
 } // namespace kernel
 namespace simix {
   class Host;
-  class Timer;
 }
 namespace surf {
   class HostImpl;
@@ -211,7 +211,7 @@ using s4u_Disk              = simgrid::s4u::Disk;
 using s4u_NetZone           = simgrid::s4u::NetZone;
 using s4u_VM                = simgrid::s4u::VirtualMachine;
 
-using smx_timer_t    = simgrid::simix::Timer*;
+using smx_timer_t    = simgrid::kernel::timer::Timer*;
 using smx_actor_t    = simgrid::kernel::actor::ActorImpl*;
 using smx_activity_t = simgrid::kernel::activity::ActivityImpl*;
 using smx_cond_t     = simgrid::kernel::activity::ConditionVariableImpl*;