diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d2038d..fcf3006 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if (BUILD_SHARED_LIBS)
 endif (BUILD_SHARED_LIBS)
 
 if (TARGET_ARCHITECTURE STREQUAL "")
-    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
+    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" TARGET_ARCHITECTURE)
 endif (TARGET_ARCHITECTURE STREQUAL "")
 
 if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
index c6bf5f4..3952e61 100644
--- a/src/tools/uchardet.cpp
+++ b/src/tools/uchardet.cpp
@@ -35,12 +35,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "../uchardet.h"
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
 #include <getopt.h>
-#include <iostream>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifndef VERSION