diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index d2b5364398..9e1b41fb77 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -98,10 +98,7 @@ endif(UNIX)
 set(qt_postfix qt4)
 project(lyx-${qt_postfix})
 find_package(Qt4 REQUIRED)
-# maybe anyway
-if(MERGE_FILES)
-	add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
-endif(MERGE_FILES)
+add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 703c07c47f..9a0f3e0537 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -18,10 +18,7 @@ lyx_automoc(${frontends_qt4_sources})
 lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI})
 
 add_definitions(
-		-DQT_CLEAN_NAMESPACE
 		-DQT_GENUINE_STR
-		-DQT_NO_STL
-		-DQT_NO_KEYWORDS
 		-DLYX_BUILD_QT4_FRONTEND
 		)