diff --git a/openair3/NAS/TOOLS/conf2uedata.c b/openair3/NAS/TOOLS/conf2uedata.c
index 32b0f7bf95dbaf0a2a09e347490497239750ca9e..3d4c416eccd837f7f15414fdd7a92417a67bf2e9 100644
--- a/openair3/NAS/TOOLS/conf2uedata.c
+++ b/openair3/NAS/TOOLS/conf2uedata.c
@@ -6,13 +6,35 @@
 #include "user_api.h"
 #include "utils.h"
 
-char * make_filename(const char *output_dir, const char *filename, int ueid);
-int get_config_from_file(const char *filename, config_t *config);
-int parse_config_file(const char *filename);
+const char *output_dir = NULL;
+
+const char *msin = NULL;
+const char *usim_api_k = NULL;
+const char *msisdn = NULL;
+const char *opc = NULL;
+const char *hplmn = NULL;
+
+int *ucplmn = NULL;
+int *oplmn = NULL;
+int *ocplmn = NULL;
+int *fplmn = NULL;
+int *ehplmn = NULL;
+
+int hplmn_index = 0;
+int plmn_nb = 0;
+int ucplmn_nb = 0;
+int oplmn_nb = 0;
+int ocplmn_nb = 0;
+int fplmn_nb = 0;
+int ehplmn_nb = 0;
+
+plmn_conf_param_t* user_plmn_list=NULL;
+network_record_t* user_network_record_list = NULL;
 
 int main(int argc, char**argv) {
 	int option;
     const char* conf_file = NULL;
+    const char options[]="c:o:h";
 
     while ((option = getopt(argc, argv, options)) != -1) {
 		switch (option) {
@@ -48,7 +70,6 @@ int main(int argc, char**argv) {
     }
 
 	exit(EXIT_SUCCESS);
-
 }
 
 int parse_config_file(const char *filename) {
diff --git a/openair3/NAS/TOOLS/conf2uedata.h b/openair3/NAS/TOOLS/conf2uedata.h
index 44cb65c9b93bbd3e7fc560d455198449392a63b8..c2571860c0fc6991979d2d69d126663e7f7c36f1 100644
--- a/openair3/NAS/TOOLS/conf2uedata.h
+++ b/openair3/NAS/TOOLS/conf2uedata.h
@@ -88,41 +88,40 @@ typedef struct {
 } network_record_t;
 
 typedef struct {
-	const char* fullname;
-	const char* shortname;
-	const char* mnc;
-	const char* mcc;
+	const char *fullname;
+	const char *shortname;
+	const char *mnc;
+	const char *mcc;
 } plmn_conf_param_t;
 
-const char options[]="c:o:h";
-unsigned char parse_data=FALSE;
-unsigned char print_data=FALSE;
-unsigned char output=FALSE;
-const char* output_dir = NULL;
-
-const char* imsi=NULL;
-const char* msin=NULL;
-const char* usim_api_k = NULL;
-const char* msisdn = NULL;
-const char* opc=NULL;
-const char* hplmn=NULL;
-
-int* ucplmn=NULL;
-int* oplmn=NULL;
-int* ocplmn=NULL;
-int* fplmn=NULL;
-int* ehplmn=NULL;
-
-int hplmn_index =0;
-int plmn_nb = 0;
-int ucplmn_nb=0;
-int oplmn_nb=0;
-int ocplmn_nb=0;
-int fplmn_nb=0;
-int ehplmn_nb=0;
-
-plmn_conf_param_t* user_plmn_list=NULL;
-network_record_t* user_network_record_list = NULL;
+extern const char* output_dir;
+
+extern const char *msin;
+extern const char *usim_api_k;
+extern const char *msisdn;
+extern const char *opc;
+extern const char *hplmn;
+
+extern int *ucplmn;
+extern int *oplmn;
+extern int *ocplmn;
+extern int *fplmn;
+extern int *ehplmn;
+
+extern int hplmn_index;
+extern int plmn_nb;
+extern int ucplmn_nb;
+extern int oplmn_nb;
+extern int ocplmn_nb;
+extern int fplmn_nb;
+extern int ehplmn_nb;
+
+extern plmn_conf_param_t* user_plmn_list;
+extern network_record_t* user_network_record_list;
+
+char *make_filename(const char *output_dir, const char *filename, int ueid);
+int get_config_from_file(const char *filename, config_t *config);
+int parse_config_file(const char *filename);
 
 void _display_usim_data(int user_id);