diff --git a/AudioOutput.cc b/AudioOutput.cc
index 782dde9..cb0df83 100644
--- a/AudioOutput.cc
+++ b/AudioOutput.cc
@@ -22,11 +22,11 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#include <string.h>
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstdio>
+#include <cstring>
+#include <cerrno>
 #include <algorithm>
 
 #include <alsa/asoundlib.h>
diff --git a/AudioOutput.h b/AudioOutput.h
index 0007164..f3f635e 100644
--- a/AudioOutput.h
+++ b/AudioOutput.h
@@ -5,6 +5,7 @@
 #include <cstdio>
 #include <string>
 #include <vector>
+
 #include "SoftFM.h"
 
 
diff --git a/main.cc b/main.cc
index d7bb90b..7b258a3 100644
--- a/main.cc
+++ b/main.cc
@@ -200,7 +200,7 @@ static void handle_sigterm(int sig)
 {
     stop_flag.store(true);
 
-    string msg = "Got signal ";
+    string msg = "\nGot signal ";
     msg += strsignal(sig);
     msg += ", stopping ...\n";