diff --git a/HxCFloppyEmulator_software/sources/gui/about_gui.cxx b/HxCFloppyEmulator_software/sources/gui/about_gui.cxx
index 97cd392b..5985ccb0 100644
--- a/HxCFloppyEmulator_software/sources/gui/about_gui.cxx
+++ b/HxCFloppyEmulator_software/sources/gui/about_gui.cxx
@@ -146,12 +146,11 @@ void CALLBACK SoundHandlerProc(HWAVEOUT hwo,UINT uMsg,DWORD * dwInstance,DWORD *
 
 	void callback (void *ptr, AudioQueueRef queue, AudioQueueBufferRef buf_ref)
 	{
-		OSStatus status;
 		AudioQueueBuffer *buf = buf_ref;
 
 		uintro_getnext_soundsample(gb_ui_context,(short*)buf->mAudioData, buf->mAudioDataByteSize / 2);
 
-		status = AudioQueueEnqueueBuffer (queue, buf_ref, 0, NULL);
+		AudioQueueEnqueueBuffer (queue, buf_ref, 0, NULL);
 	}
 
 	#endif
diff --git a/HxCFloppyEmulator_software/sources/gui/cb_filesystem_generator_window.cxx b/HxCFloppyEmulator_software/sources/gui/cb_filesystem_generator_window.cxx
index 8031919b..188b6fb4 100644
--- a/HxCFloppyEmulator_software/sources/gui/cb_filesystem_generator_window.cxx
+++ b/HxCFloppyEmulator_software/sources/gui/cb_filesystem_generator_window.cxx
@@ -969,11 +969,11 @@ int write_back_fileimage()
 			{
 				if( strstr(guicontext->last_loaded_image_path, ".img") || strstr(guicontext->last_loaded_image_path, ".IMG" ) )
 				{
-					hxcfe_imgExport( imgldr_ctx, guicontext->loadedfloppy, guicontext->last_loaded_image_path, hxcfe_imgGetLoaderID(imgldr_ctx,"RAW_LOADER") );
+					hxcfe_imgExport( imgldr_ctx, guicontext->loadedfloppy, guicontext->last_loaded_image_path, hxcfe_imgGetLoaderID(imgldr_ctx,(char*)"RAW_LOADER") );
 				}
 				else
 				{
-					hxcfe_imgExport( imgldr_ctx, guicontext->loadedfloppy, guicontext->last_loaded_image_path, hxcfe_imgGetLoaderID(imgldr_ctx,"HXC_HFE") );
+					hxcfe_imgExport( imgldr_ctx, guicontext->loadedfloppy, guicontext->last_loaded_image_path, hxcfe_imgGetLoaderID(imgldr_ctx,(char*)"HXC_HFE") );
 				}
 
 				hxcfe_imgDeInitLoader(imgldr_ctx);
@@ -1079,14 +1079,14 @@ int load_indexed_fileimage(int index)
 
 		hxc_getcurrentdirectory(cur_directory,sizeof(cur_directory));
 
-		findfile_handle = hxc_find_first_file(cur_directory,"*.hfe",&fi);
+		findfile_handle = hxc_find_first_file(cur_directory,(char*)"*.hfe",&fi);
 		if(findfile_handle)
 		{
 			ret = 1;
 			i = 0;
 			while( i < cur_index && ret)
 			{
-				ret = hxc_find_next_file(findfile_handle,cur_directory,"*.hfe",&fi);
+				ret = hxc_find_next_file(findfile_handle,cur_directory,(char*)"*.hfe",&fi);
 				i++;
 			}
 
@@ -1095,7 +1095,7 @@ int load_indexed_fileimage(int index)
 				hxc_find_close(findfile_handle);
 				cur_index = 0;
 
-				findfile_handle = hxc_find_first_file(cur_directory,"*.hfe",&fi);
+				findfile_handle = hxc_find_first_file(cur_directory,(char*)"*.hfe",&fi);
 				if(findfile_handle)
 				{
 					strncpy(filename,fi.filename,sizeof(filename)-1);
diff --git a/HxCFloppyEmulator_software/sources/gui/cb_usbhxcfecfg_window.cxx b/HxCFloppyEmulator_software/sources/gui/cb_usbhxcfecfg_window.cxx
index c1dd8b6e..04e1bcf1 100644
--- a/HxCFloppyEmulator_software/sources/gui/cb_usbhxcfecfg_window.cxx
+++ b/HxCFloppyEmulator_software/sources/gui/cb_usbhxcfecfg_window.cxx
@@ -63,6 +63,7 @@ extern "C"
 extern s_gui_context * guicontext;
 
 void tick_usb(void *v) {
+#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
 	char tempstr[512];
 	unsigned long datathroughput;
 	unsigned long period;
@@ -73,7 +74,6 @@ void tick_usb(void *v) {
 
 	window=(usbhxcfecfg_window *)v;
 
-#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
 	status=libusbhxcfe_getStats(guicontext->hxcfe,guicontext->usbhxcfe,&stats,0);
 
 	snprintf(tempstr,sizeof(tempstr),"%d (%d p/s)",(int)stats.totalpacketsent,(int)stats.packetsent);
@@ -151,9 +151,10 @@ void tick_usb(void *v) {
 
 void usbifcfg_window_datachanged(Fl_Widget * w,void *)
 {
+#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
 	usbhxcfecfg_window *usbcfgw;
 	Fl_Widget* tw;
-#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
+
 	tw=w;
 	do
 	{
@@ -196,9 +197,10 @@ void usbifcfg_window_datachanged(Fl_Widget * w,void *)
 
 void ifcfg2_window_datachanged(Fl_Widget * w,void *)
 {
+#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
 	usbhxcfecfg_window *usbcfgw;
 	Fl_Widget* tw;
-#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
+
 	tw=w;
 	do
 	{
@@ -228,8 +230,8 @@ void ifcfg2_window_datachanged(Fl_Widget * w,void *)
 
 void resetusbstat_bt(Fl_Button *w,void *)
 {
-	USBStats stats;
 #if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
+	USBStats stats;
 	libusbhxcfe_getStats(guicontext->hxcfe,guicontext->usbhxcfe,&stats,1);
 #endif
 }
\ No newline at end of file
diff --git a/HxCFloppyEmulator_software/sources/gui/main_gui.cxx b/HxCFloppyEmulator_software/sources/gui/main_gui.cxx
index 33552238..92f9acbf 100644
--- a/HxCFloppyEmulator_software/sources/gui/main_gui.cxx
+++ b/HxCFloppyEmulator_software/sources/gui/main_gui.cxx
@@ -973,7 +973,9 @@ Main_Window::Main_Window(int argc, char **argv)
 	infothread * infoth;
 #endif
 	streamthread * streamth;
+#if !defined(STANDALONEFSBROWSER) && !defined(HXC_STREAMER_MODE)
 	USBStats stats;
+#endif
 	intptr_t tmp_intptr;
 
 	txtindex=0;