diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index 610a064f..81c397cc 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -143,7 +143,7 @@ int compressor_strings[] = {IDS_SCRIPT,
 extern const char* NSISW_VERSION;
 
 int WINAPI     WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow);
-static BOOL    CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL           CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 DWORD WINAPI   MakeNSISProc(LPVOID p);
 BOOL CALLBACK  DialogResize(HWND hWnd, LPARAM /* unused*/);
 BOOL CALLBACK  AboutNSISProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp
index 3f266c8b..eb0ad140 100644
--- a/Contrib/zip2exe/main.cpp
+++ b/Contrib/zip2exe/main.cpp
@@ -489,7 +489,6 @@ void makeEXE(HWND hwndDlg)
   if (g_compressor_solid == 1)
     fprintf(fp,"!define ZIP2EXE_COMPRESSOR_SOLID\n");
   GetDlgItemText(hwndDlg,IDC_INSTPATH,buf,sizeof(buf));
-  char *outpath = "$INSTDIR";
   int iswinamp=0;
   char *iswinampmode=NULL;
   if (!strcmp(buf,gp_poi)) lstrcpy(buf,"$EXEDIR");
@@ -732,8 +731,7 @@ BOOL CALLBACK DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
             ShowWindow(GetDlgItem(hwndDlg,IDC_TEST),SW_HIDE);
             ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_HIDE);
             {
-              int x;
-              for (x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
+              for (size_t x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
                 ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_SHOWNA);
               SetDlgItemText(hwndDlg,IDOK,"&Generate");
               EnableWindow(GetDlgItem(hwndDlg,IDOK),1);
@@ -764,8 +762,7 @@ BOOL CALLBACK DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 g_compressor_solid = 0;
               g_mui=!IsDlgButtonChecked(hwndDlg,IDC_CLASSICUI);
               SetDlgItemText(g_hwnd, IDC_OUTPUTTEXT, "");
-              int x;
-              for (x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
+              for (size_t x = 0; x < sizeof(ids)/sizeof(ids[0]); x ++)
                 ShowWindow(GetDlgItem(hwndDlg,ids[x]),SW_HIDE);
               ShowWindow(GetDlgItem(hwndDlg,IDC_OUTPUTTEXT),SW_SHOWNA);
               SetDlgItemText(hwndDlg,IDOK,"&Close");