diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index c9dacbc71..bf4480942 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -38,9 +38,6 @@ foreach(FREERDP_CHANNELS_CLIENT_SRC ${FREERDP_CHANNELS_CLIENT_SRCS})
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} "${FREERDP_CHANNELS_CLIENT_SRC}")
 endforeach()
 
-if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
-endif()
 
 # On windows create dll version information.
 # Vendor, product and year are already set in top level CMakeLists.txt
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 91db017ca..7e8fcc5e1 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -84,6 +84,7 @@ set(WINPR_CORE synch locale library file comm pipe interlocked security
 
 foreach(DIR ${WINPR_CORE})
 	add_subdirectory(${DIR})
+	source_group("${DIR}" REGULAR_EXPRESSION "${DIR}/.*\\.[ch]")
 endforeach()
 
 set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui
@@ -91,6 +92,7 @@ set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui
 
 foreach(DIR ${WINPR_LEVEL2})
 	add_subdirectory(${DIR})
+	source_group("${DIR}" REGULAR_EXPRESSION "${DIR}/.*\\.[ch]")
 endforeach()
 
 set(MODULE_NAME winpr)
diff --git a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
index d67d2b356..73d8b7e0c 100644
--- a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
+++ b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
@@ -20,10 +20,6 @@ set(MODULE_PREFIX "TEST_LIBRARY_A")
 
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryA.c)
 
-if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
-endif()
-
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
diff --git a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
index 749190163..860df8c7d 100644
--- a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
+++ b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
@@ -20,10 +20,6 @@ set(MODULE_PREFIX "TEST_LIBRARY_B")
 
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryB.c)
 
-if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
-endif()
-
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")