-XBT_PUBLIC_DATA(short int) surfxml_host_speed_isset;
-XBT_PUBLIC_DATA(AT_surfxml_host_state___file) AX_surfxml_host_state___file;
+XBT_PUBLIC_DATA short int surfxml_host_speed_isset;
+XBT_PUBLIC_DATA AT_surfxml_host_speed___file AX_surfxml_host_speed___file;
+#define A_surfxml_host_speed___file (surfxml_bufferstack + AX_surfxml_host_speed___file)
+XBT_PUBLIC_DATA short int surfxml_host_speed___file_isset;
+XBT_PUBLIC_DATA AT_surfxml_host_state___file AX_surfxml_host_state___file;