reduce the scope of some #include, and cut useless ones

[simgrid.git] / src / include / surf / surf.hpp

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index d26ba8e..06fab3f 100644 (file)
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -7,16 +7,7 @@
 #define SURF_SURF_H
 
 #include "simgrid/forward.h"
-#include "src/internal_config.h"
-#include "xbt/config.h"
-#include "xbt/dict.h"
-#include "xbt/dynar.h"
 #include "xbt/graph.h"
-#include "xbt/misc.h"
-
-#ifndef __cplusplus
-#error This is a C++ only file, now
-#endif
 
 namespace simgrid {
 namespace surf {
@@ -39,16 +30,8 @@ typedef simgrid::surf::HostModel* surf_host_model_t;
 typedef simgrid::surf::NetworkModel* surf_network_model_t;
 typedef simgrid::surf::StorageModel* surf_storage_model_t;
 
-SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
 
-/* user-visible parameters */
-extern XBT_PRIVATE double sg_tcp_gamma;
-extern XBT_PRIVATE double sg_latency_factor;
-extern XBT_PRIVATE double sg_bandwidth_factor;
-extern XBT_PRIVATE double sg_weight_S_parameter;
-extern XBT_PRIVATE int sg_network_crosstraffic;
-
 /** \brief Resource model description
  */
 struct surf_model_description {
@@ -384,6 +367,4 @@ void instr_routing_define_callbacks();
 xbt_graph_t instr_routing_platform_graph();
 void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename);
 
-SG_END_DECL()
-
 #endif