diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 324a9f4770..a3f6e76376 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -74,9 +74,29 @@ endif()
 
 
 if(MSVC_IDE)
-	set(lyx_headers ${lyx_headers} ${TOP_SRC_DIR}/status.16x)
-	set_source_files_properties(${TOP_SRC_DIR}/status.16x PROPERTIES HEADER_FILE_ONLY TRUE)
-	source_group(Status ${TOP_SRC_DIR}/status.16x)
+	file(GLOB info_files ${TOP_SRC_DIR}/*)
+	set(lyx_info_files)
+	foreach(_it ${info_files})
+		if(NOT IS_DIRECTORY ${_it})
+			set_source_files_properties(${_it} PROPERTIES HEADER_FILE_ONLY TRUE)
+			set(lyx_info_files ${lyx_info_files} ${_it})
+		endif()
+	endforeach()
+	source_group(LyXInfoFiles FILES ${lyx_info_files})
+	
+	file(GLOB cmake_files1 ${TOP_SRC_DIR}/development/cmake/*)
+	file(GLOB cmake_files2 ${TOP_SRC_DIR}/development/cmake/modules/*)
+	set(lyx_cmake_files)
+	foreach(_it ${cmake_files1} ${cmake_files2})
+		if(NOT IS_DIRECTORY ${_it})
+			get_filename_component(name ${_it} NAME)
+			if(NOT name STREQUAL CMakeLists.txt AND NOT ${_it} MATCHES "^/\\\\..*$;~$")
+				set_source_files_properties(${_it} PROPERTIES HEADER_FILE_ONLY TRUE)
+				set(lyx_cmake_files ${lyx_cmake_files} ${_it})
+			endif()
+		endif()
+	endforeach()
+	source_group(LyXCMakeFiles FILES ${lyx_cmake_files})
 endif()
 
 
@@ -86,6 +106,8 @@ add_executable(${_lyx}
 	${lyx_headers}
 	${vld_files}
 	${FILE_RC}
+	${lyx_info_files}
+	${lyx_cmake_files}
 )
 
 lyx_add_gcc_pch(${_lyx})