diff --git a/client/controller.cpp b/client/controller.cpp
index 13031bca..4f9e91ee 100644
--- a/client/controller.cpp
+++ b/client/controller.cpp
@@ -19,17 +19,17 @@
 #include <iostream>
 #include <string>
 #include <memory>
+#include "controller.h"
 #if defined(HAS_OGG) || defined(HAS_TREMOR)
 #include "decoder/oggDecoder.h"
 #endif
 #include "decoder/pcmDecoder.h"
 #include "decoder/flacDecoder.h"
 #include "timeProvider.h"
-#include "common/log.h"
-#include "common/snapException.h"
 #include "message/time.h"
 #include "message/hello.h"
-#include "controller.h"
+#include "common/snapException.h"
+#include "common/log.h"
 
 using namespace std;
 
diff --git a/client/stream.cpp b/client/stream.cpp
index e27ab8b5..9be367ee 100644
--- a/client/stream.cpp
+++ b/client/stream.cpp
@@ -17,6 +17,7 @@
 ***/
 
 #include "stream.h"
+#include <cmath>
 #include <iostream>
 #include <string.h>
 #include "common/log.h"
diff --git a/server/streamreader/streamUri.cpp b/server/streamreader/streamUri.cpp
index f7fb707f..19f2caa1 100644
--- a/server/streamreader/streamUri.cpp
+++ b/server/streamreader/streamUri.cpp
@@ -16,11 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-
-#include <common/utils.h>
-#include <common/strCompat.h>
-#include <common/log.h>
 #include "streamUri.h"
+#include "common/utils.h"
+#include "common/strCompat.h"
+#include "common/log.h"
 
 
 using namespace std;