diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/type/simple_config/eap/include/eap_type_simple_config.h
--- a/eapol/eapol_framework/eapol_common/type/simple_config/eap/include/eap_type_simple_config.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/simple_config/eap/include/eap_type_simple_config.h	Thu Sep 16 13:07:04 2010 +0300
@@ -26,6 +26,27 @@
 
 #include "eap_tools.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H)
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H 
+#elif defined(EAP_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H)
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_SIMPLE_CONFIG_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "abs_eap_am_type_simple_config.h"
 #include "eap_am_network_id.h"
 #include "abs_eap_base_type.h"
@@ -49,7 +70,7 @@
 
 
 /// This class is implementation of SIMPLE_CONFIG type. See more detailed design and architecture document <a href="../../type/simple_config/documentation/EAP_SIMPLE_CONFIG.doc">EAP_SIMPLE_CONFIG.doc</a>.
-class EAP_EXPORT eap_type_simple_config_c
+class EAP_CLASS_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_type_simple_config_c
 : public abs_eap_base_timer_c
 , public eap_base_type_c
 , public abs_eap_am_type_simple_config_c
@@ -157,12 +178,12 @@
 	/**
 	 * This function returns the domain name, realm part of NAI.
 	 */
-	EAP_FUNC_IMPORT eap_variable_data_c * get_nai_realm();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_variable_data_c * get_nai_realm();
 
 	/**
 	 * This function returns the full NAI.
 	 */
-	EAP_FUNC_IMPORT eap_variable_data_c * get_NAI();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_variable_data_c * get_NAI();
 
 	/**
 	 * This is the situation before the update_buffer_indexes() call.
@@ -197,7 +218,7 @@
 	 *
 	 * Note maximum_buffer_size could be larger than (m_simple_config_header_offset + m_MTU + m_trailer_length).
 	 */
-	EAP_FUNC_IMPORT void update_buffer_indexes(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void update_buffer_indexes(
 		const u32_t maximum_buffer_size,
 		const u32_t payload_size,
 		u32_t * const buffer_offset,
@@ -244,7 +265,7 @@
 	 *
 	 * Note maximum_buffer_size could be larger than (m_simple_config_header_offset + m_MTU + m_trailer_length).
 	 */
-	EAP_FUNC_IMPORT void update_payload_indexes(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void update_payload_indexes(
 		const u32_t maximum_buffer_size,
 		const u32_t eap_header_size,
 		const u32_t payload_size,
@@ -256,7 +277,7 @@
 	/**
 	 * This function reads the identity payload. Identity is stored to handler->get_identity().
 	 */
-	EAP_FUNC_IMPORT eap_status_e parse_identity(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e parse_identity(
 		const u8_t * const identity, ///< This is pointer to received EAP-Identity buffer.
 		const u32_t identity_length ///< This is length of received EAP-Identity buffer.
 		);
@@ -264,7 +285,7 @@
 	/**
 	 * This function chechs NAI.
 	 */
-	EAP_FUNC_IMPORT eap_status_e check_NAI(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e check_NAI(
 		const u8_t * const identity,
 		const u32_t identity_length,
 		const u8_t * const at_character);
@@ -272,7 +293,7 @@
 	/**
 	 * This function traces the EAP packet.
 	 */
-	EAP_FUNC_IMPORT void packet_trace(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void packet_trace(
 		eap_const_string prefix,
 		const eap_am_network_id_c * const receive_network_id,
 		eap_header_wr_c * const received_eap,
@@ -283,73 +304,73 @@
 	 * Generated keys are offered to lower layer.
 	 * Connection handle is initialised.
 	 */
-	EAP_FUNC_IMPORT eap_status_e finish_successful_authentication();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e finish_successful_authentication();
 
 	/**
 	 * This function sends a notification of possible failed authentication
 	 * to lower layer.
 	 */
-	EAP_FUNC_IMPORT eap_status_e send_final_notification();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e send_final_notification();
 
 
 	/**
 	 * This function returns the state of this authentication session.
 	 */
-	EAP_FUNC_IMPORT eap_type_simple_config_state_variable_e get_state() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_type_simple_config_state_variable_e get_state() const;
 
 	/**
 	 * This function sets the new state and notifies the lower layer of this change.
 	 */
-	EAP_FUNC_IMPORT void set_state(const eap_type_simple_config_state_variable_e state);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void set_state(const eap_type_simple_config_state_variable_e state);
 
 	/**
 	 * This function saves the current m_state to m_saved_previous_state.
 	 * The saved state is restored in error case.
 	 */
-	EAP_FUNC_IMPORT void save_current_state();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void save_current_state();
 
 	/**
 	 * This function restores the saved state.
 	 */
-	EAP_FUNC_IMPORT void restore_saved_previous_state();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void restore_saved_previous_state();
 
 
 	/**
 	 * This function returns the state of reassembly.
 	 */
-	EAP_FUNC_IMPORT eap_type_simple_config_reassembly_state_e get_reassembly_state() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_type_simple_config_reassembly_state_e get_reassembly_state() const;
 
 	/**
 	 * This function sets the new reassembly state.
 	 */
-	EAP_FUNC_IMPORT void set_reassembly_state(const eap_type_simple_config_reassembly_state_e state);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void set_reassembly_state(const eap_type_simple_config_reassembly_state_e state);
 
 	/**
 	 * This function saves the current m_reassembly_state to m_saved_previous_reassembly_state.
 	 * The saved state is restored in error case.
 	 */
-	EAP_FUNC_IMPORT void save_current_reassembly_state();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void save_current_reassembly_state();
 
 	/**
 	 * This function restores the saved reassembly state.
 	 */
-	EAP_FUNC_IMPORT void restore_saved_reassembly_state();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void restore_saved_reassembly_state();
 
 
 	/**
 	 * This function returns the send network identity of this session.
 	 */
-	EAP_FUNC_IMPORT eap_am_network_id_c * get_send_network_id();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_am_network_id_c * get_send_network_id();
 
 	/**
 	 * This function stores the last EAP-Identifier.
 	 */
-	EAP_FUNC_IMPORT void set_last_eap_identifier(const u8_t last_eap_identifier);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void set_last_eap_identifier(const u8_t last_eap_identifier);
 
 	/**
 	 * This function returns the last stored EAP-Identifier.
 	 */
-	EAP_FUNC_IMPORT u8_t get_last_eap_identifier() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H u8_t get_last_eap_identifier() const;
 
 	eap_status_e check_received_eap_identifier(
 		const eap_header_wr_c * const eap_header);
@@ -358,50 +379,50 @@
 	/**
 	 * This function returns string of the current state. This is for trace purposes.
 	 */
-	EAP_FUNC_IMPORT eap_const_string get_state_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_const_string get_state_string() const;
 
 	/**
 	 * This function returns string of the current state. This is for trace purposes.
 	 */
-	EAP_FUNC_IMPORT eap_const_string get_saved_previous_state_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_const_string get_saved_previous_state_string() const;
 
 	/**
 	 * This function returns string of the current reassembly state. This is for trace purposes.
 	 */
-	EAP_FUNC_IMPORT eap_const_string get_reassembly_state_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_const_string get_reassembly_state_string() const;
 
 
 	/**
 	 * This function sets the m_failure_message_received flag true.
 	 */
-	EAP_FUNC_IMPORT void set_failure_message_received();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void set_failure_message_received();
 
 	/**
 	 * This function sets the m_failure_message_received flag false.
 	 */
-	EAP_FUNC_IMPORT void unset_failure_message_received();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void unset_failure_message_received();
 
 	/**
 	 * This function returns the m_failure_message_received flag.
 	 */
-	EAP_FUNC_IMPORT bool get_failure_message_received() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H bool get_failure_message_received() const;
 
 	/**
 	 * This function sends an simple config fragment acknowledge.
 	 */
-	EAP_FUNC_IMPORT eap_status_e send_sc_frag_ack();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e send_sc_frag_ack();
 
 	/**
 	 * This function sends EAP-SIMPLE_CONFIG Start message.
 	 */
-	EAP_FUNC_IMPORT eap_status_e send_simple_config_start_message(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e send_simple_config_start_message(
 		const u8_t next_eap_identifier ///< This is EAP-Identifier of next EAP packet.
 		);
 
 	/**
 	 * This function sends starts EAP-SIMPLE_CONFIG after a start message is received.
 	 */
-	EAP_FUNC_IMPORT eap_status_e start_simple_config_authentication(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e start_simple_config_authentication(
 		const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
 		const eap_variable_data_c * const NAI ///< This is the full NAI of the client.
 		);
@@ -409,7 +430,7 @@
 	/**
 	 * This function extracts the SIMPLE_CONFIG-record message from m_simple_config_message_buffer and forwards it to simple_config_base_record_c object.
 	 */
-	EAP_FUNC_IMPORT eap_status_e simple_config_message_process(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e simple_config_message_process(
 		const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
 		eap_simple_config_header_c * const received_simple_config, ///< This is pointer to EAP header including EAP-SIMPLE_CONFIG fields.
 		const u32_t simple_config_packet_length ///< This is length of received EAP-SIMPLE_CONFIG packet.
@@ -418,9 +439,9 @@
 	/**
 	 * This function sends the EAP-SIMPLE_CONFIG message from rm_simple_config_reassembly_buffer.
 	 */
-	EAP_FUNC_IMPORT eap_status_e eap_simple_config_fragment_send();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e eap_simple_config_fragment_send();
 
-	EAP_FUNC_IMPORT eap_status_e handle_eap_identity_query(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e handle_eap_identity_query(
 		const eap_am_network_id_c * const receive_network_id,
 		const u8_t eap_identifier,
 		const bool use_manual_username,
@@ -440,12 +461,12 @@
 	/**
 	 * Destructor cancels all timers and deletes member attributes.
 	 */
-	EAP_FUNC_IMPORT virtual ~eap_type_simple_config_c();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H virtual ~eap_type_simple_config_c();
 
 	/**
 	 * Constructor initializes all member attributes.
 	 */
-	EAP_FUNC_IMPORT eap_type_simple_config_c(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_type_simple_config_c(
 		abs_eap_am_tools_c * const tools, ///< This is pointer to the tools AM of current platform.
 		abs_eap_base_type_c * const partner, ///< This is back pointer to object which created this object.
 		eap_am_type_simple_config_c * const am_type_simple_config, ///< This is pointer to adaptation module of EAP-SIMPLE_CONFIG type.
@@ -460,21 +481,21 @@
 	/**
 	 * This function creates reassembly state string.
 	 */
-	EAP_FUNC_IMPORT static eap_const_string get_reassembly_state_string(eap_type_simple_config_reassembly_state_e state);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H static eap_const_string get_reassembly_state_string(eap_type_simple_config_reassembly_state_e state);
 
 	/**
 	 * This function creates state string.
 	 */
-	EAP_FUNC_IMPORT static eap_const_string get_state_string(eap_type_simple_config_state_variable_e state);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H static eap_const_string get_state_string(eap_type_simple_config_state_variable_e state);
 
 
 	/**
 	 * This function tells if the object is a client or a server..
 	 */
-	EAP_FUNC_IMPORT bool get_is_client();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H bool get_is_client();
 
 	// This is commented in abs_eap_am_type_simple_config_c::complete_eap_identity_query().
-	EAP_FUNC_IMPORT eap_status_e complete_eap_identity_query(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e complete_eap_identity_query(
 		const eap_am_network_id_c * const receive_network_id,
 		const u8_t eap_identifier,
 		const eap_status_e completion_status,
@@ -488,7 +509,7 @@
 	 * The partner class calls this function when EAP-SIMPLE_CONFIG packet is received.
 	 * see also eap_base_type_c::packet_process().
 	 */
-	EAP_FUNC_IMPORT eap_status_e packet_process(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e packet_process(
 		const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
 		eap_header_wr_c * const eap, ///< This is pointer to EAP header and data.
 		const u32_t eap_packet_length ///< This is length of received EAP packet.
@@ -497,7 +518,7 @@
 	/**
 	 * This function processes the EAP-Response/Identity.
 	 */
-	EAP_FUNC_IMPORT eap_status_e eap_identity_response_packet_process(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e eap_identity_response_packet_process(
 		const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
 		eap_header_wr_c * const received_eap, ///< This is pointer to EAP header and data.
 		const u32_t eap_packet_length ///< This is length of received EAP packet.
@@ -506,48 +527,48 @@
 	/**
 	 * This function processes the EAP-SIMPLE_CONFIG packets.
 	 */
-	EAP_FUNC_IMPORT eap_status_e simple_config_packet_process(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e simple_config_packet_process(
 		const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
 		eap_simple_config_header_c * const received_simple_config, ///< This is pointer to EAP header including EAP-SIMPLE_CONFIG fields.
 		const u32_t simple_config_packet_length ///< This is length of received EAP-SIMPLE_CONFIG packet.
 		);
 
 	// This is commented in abs_eap_base_timer_c::timer_delete_data().
-	EAP_FUNC_IMPORT eap_status_e timer_expired(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e timer_expired(
 		const u32_t id, void *data
 		);
 
 	// This is commented in abs_eap_base_timer_c::timer_delete_data().
-	EAP_FUNC_IMPORT eap_status_e timer_delete_data(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e timer_delete_data(
 		const u32_t id, void *data
 		);
 
 	// This is commented in eap_base_type_c::set_is_valid().
-	EAP_FUNC_IMPORT void set_is_valid();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void set_is_valid();
 
 	// This is commented in eap_base_type_c::get_is_valid().
-	EAP_FUNC_IMPORT bool get_is_valid();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H bool get_is_valid();
 
 	// This is commented in eap_base_type_c::configure().
-	EAP_FUNC_IMPORT eap_status_e configure();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e configure();
 
 	// This is commented in eap_base_type_c::shutdown().
-	EAP_FUNC_IMPORT eap_status_e shutdown();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e shutdown();
 
 	// This is commented in eap_base_type_c::query_eap_identity().
-	EAP_FUNC_IMPORT eap_status_e query_eap_identity(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e query_eap_identity(
 		const bool must_be_synchronous,
 		eap_variable_data_c * const identity,
 		const eap_am_network_id_c * const receive_network_id,
 		const u8_t eap_identifier);
 
 	// This is commented in eap_base_type_c::query_eap_identity().
-	EAP_FUNC_IMPORT eap_status_e set_initial_eap_identifier(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e set_initial_eap_identifier(
 		const eap_am_network_id_c * const receive_network_id,
 		const u8_t initial_identifier);
 
 	// This is commented in eap_base_type_c::eap_acknowledge().
-	EAP_FUNC_IMPORT eap_status_e eap_acknowledge(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e eap_acknowledge(
 		const eap_am_network_id_c * const receive_network_id);
 
 	/**
@@ -557,20 +578,20 @@
 	 * If object reset fails this function must return corresponding error status.
 	 * @return This function returns the status of reset operation.
 	 */
-	EAP_FUNC_IMPORT eap_status_e reset();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e reset();
 
 	/// @see abs_simple_config_base_record_c::state_notification().
-	EAP_FUNC_IMPORT void state_notification(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H void state_notification(
 		const abs_eap_state_notification_c * const state
 		);
 
 	/// @see abs_simple_config_base_record_c::packet_send().
-	EAP_FUNC_IMPORT eap_status_e simple_config_packet_send(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e simple_config_packet_send(
 		eap_buf_chain_wr_c * const sent_packet,
 		const simple_config_Message_Type_e message_type);
 
 	/// @see abs_simple_config_base_record_c::packet_send().
-	EAP_FUNC_IMPORT eap_status_e packet_send(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e packet_send(
 		const eap_am_network_id_c * const network_id,
 		eap_buf_chain_wr_c * const sent_packet,
 		const u32_t header_offset,
@@ -578,44 +599,44 @@
 		const u32_t buffer_length);
 
 	/// @see abs_simple_config_base_record_c::get_header_offset().
-	EAP_FUNC_IMPORT u32_t get_header_offset(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H u32_t get_header_offset(
 		u32_t * const MTU,
 		u32_t * const trailer_length
 		);
 
 	/// @see abs_simple_config_base_record_c::restart_authentication().
-	EAP_FUNC_IMPORT eap_status_e restart_authentication(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e restart_authentication(
 		const eap_am_network_id_c * const receive_network_id,
 		const bool is_client_when_true,
 		const bool force_clean_restart,
 		const bool from_timer);
 
 	/// @see abs_simple_config_base_record_c::read_configure().
-	EAP_FUNC_IMPORT virtual eap_status_e read_configure(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H virtual eap_status_e read_configure(
 		const eap_configuration_field_c * const field,
 		eap_variable_data_c * const data
 		);
 
 	/// @see abs_simple_config_base_record_c::write_configure().
-	EAP_FUNC_IMPORT virtual eap_status_e write_configure(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H virtual eap_status_e write_configure(
 		const eap_configuration_field_c * const field,
 		eap_variable_data_c * const data
 		);
 
 	/// @see abs_simple_config_base_record_c::set_timer().
-	EAP_FUNC_IMPORT eap_status_e set_timer(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e set_timer(
 		abs_eap_base_timer_c * const p_initializer, 
 		const u32_t p_id, 
 		void * const p_data,
 		const u32_t p_time_ms);
 
 	/// @see abs_simple_config_base_record_c::cancel_timer().
-	EAP_FUNC_IMPORT eap_status_e cancel_timer(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e cancel_timer(
 		abs_eap_base_timer_c * const p_initializer, 
 		const u32_t p_id);
 
 	/// @see abs_simple_config_base_record_c::load_module().
-	EAP_FUNC_IMPORT eap_status_e load_module(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e load_module(
 		const eap_type_value_e type,
 		const eap_type_value_e /* tunneling_type */,
 		abs_eap_base_type_c * const partner,
@@ -624,25 +645,25 @@
 		const eap_am_network_id_c * const receive_network_id);
 
 	/// @see abs_simple_config_base_record_c::unload_module().
-	EAP_FUNC_IMPORT eap_status_e unload_module(const eap_type_value_e type);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e unload_module(const eap_type_value_e type);
 
 	/// @see abs_simple_config_base_record_c::packet_data_crypto_keys().
-	EAP_FUNC_IMPORT eap_status_e packet_data_crypto_keys(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e packet_data_crypto_keys(
 		const eap_am_network_id_c * const send_network_id,
 		const eap_master_session_key_c * const master_session_key);
 
 	/// @see abs_simple_config_base_record_c::check_is_valid_eap_type().
-	EAP_FUNC_IMPORT eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
 
 	/// @see abs_simple_config_base_record_c::get_eap_type_list().
-	EAP_FUNC_IMPORT eap_status_e get_eap_type_list(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e get_eap_type_list(
 		eap_array_c<eap_type_value_e> * const eap_type_list);
 
 	/// @see abs_simple_config_base_record_c::set_session_timeout().
-	EAP_FUNC_IMPORT eap_status_e set_session_timeout(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e set_session_timeout(
 		const u32_t session_timeout_ms);
 
-	EAP_FUNC_IMPORT eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_SIMPLE_CONFIG_H eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
 
 	//--------------------------------------------------
 }; // class eap_type_simple_config_c