diff --git a/macosx/HBController.m b/macosx/HBController.m
index 90cba3c72f5a..b7d519bbedee 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -5,6 +5,7 @@
    It may be used under the terms of the GNU General Public License. */
 
 #import "HBController.h"
+#import "HBAppDelegate.h"
 #import "HBFocusRingView.h"
 #import "HBToolbarBadgedItem.h"
 #import "HBQueueController.h"
diff --git a/test/test.c b/test/test.c
index 9fac8d482898..49cb8af3c448 100644
--- a/test/test.c
+++ b/test/test.c
@@ -197,7 +197,7 @@ static volatile int work_done = 0;
 static void SigHandler( int );
 
 /* Utils */
-static void ShowHelp();
+static void ShowHelp(void);
 static void ShowCommands()
 {
     fprintf(stdout, "\nCommands:\n");
@@ -2832,6 +2832,7 @@ static int ParseOptions( int argc, char ** argv )
             case PAD:
             {
                 free(pad);
+                pad = NULL;
                 if (optarg != NULL)
                 {
                     pad = strdup(optarg);