diff --git a/CMakeLists.txt b/CMakeLists.txt
index 991f730..c6c88dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,9 @@ cmake_policy(VERSION 2.6)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # Default C++-flags. Sub-builds might alter these.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wextra -g -O2 -Wl,--as-needed")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wextra -g -O3 -Wl,--as-needed")
 # Default C-flags. Sub-builds might alter these.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O2")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -Wextra -g -O3")
 
 set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
diff --git a/src/invoker/CMakeLists.txt b/src/invoker/CMakeLists.txt
index 5cdd229..d35f1a8 100644
--- a/src/invoker/CMakeLists.txt
+++ b/src/invoker/CMakeLists.txt
@@ -4,9 +4,6 @@ set(SRC invokelib.c invoker.c report.c search.c)
 # Set include dirs
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common)
 
-# Set C flags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O2")
-
 # Set precompiler flags
 add_definitions(-DPROG_NAME_INVOKER="invoker")
 
diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
index b08d8e6..14c9c6d 100644
--- a/src/launcher/CMakeLists.txt
+++ b/src/launcher/CMakeLists.txt
@@ -5,7 +5,7 @@ set(SRC launcher.c)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common)
 
 # Set C flags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O2 -std=c99")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
 # Set precompiler flags
 add_definitions(-DLIBRARIES_CONFIG_FILE="/etc/applauncherd.conf")
diff --git a/tests/Common/TestApps/fala_gettime/CMakeLists.txt b/tests/Common/TestApps/fala_gettime/CMakeLists.txt
index 4982bd8..627244c 100644
--- a/tests/Common/TestApps/fala_gettime/CMakeLists.txt
+++ b/tests/Common/TestApps/fala_gettime/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Set sources
 set(SRC fala_gettime.c)
 
-set(CMAKE_C_FLAGS "-W -Wall -O3")
-
 # Link statically not supported in meego.
 #set(CMAKE_EXE_LINKER_FLAGS "-static")
 
diff --git a/tests/Common/TestApps/fala_gettime_ms/CMakeLists.txt b/tests/Common/TestApps/fala_gettime_ms/CMakeLists.txt
index b7757e0..7afdc0f 100644
--- a/tests/Common/TestApps/fala_gettime_ms/CMakeLists.txt
+++ b/tests/Common/TestApps/fala_gettime_ms/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Set sources
 set(SRC fala_gettime_ms.c)
 
-set(CMAKE_C_FLAGS "-W -Wall -O3")
-
 # Link statically not supported in meego 
 #set(CMAKE_EXE_LINKER_FLAGS "-static")
 
diff --git a/tests/Common/TestApps/pixelchanged/CMakeLists.txt b/tests/Common/TestApps/pixelchanged/CMakeLists.txt
index 5ec55e6..e5a5ecc 100644
--- a/tests/Common/TestApps/pixelchanged/CMakeLists.txt
+++ b/tests/Common/TestApps/pixelchanged/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Set sources
 set(SRC main.c)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
-
 # This is needed for MeeGo only?
 pkg_check_modules(XI xi REQUIRED)
 include_directories(${XI_INCLUDE_DIRS})