diff --git a/src/appleseed.shaders/CMakeLists.txt b/src/appleseed.shaders/CMakeLists.txt
index 531e0cb9b5..a75009ffd4 100644
--- a/src/appleseed.shaders/CMakeLists.txt
+++ b/src/appleseed.shaders/CMakeLists.txt
@@ -43,9 +43,12 @@ configure_file (
 #--------------------------------------------------------------------------------------------------
 
 set (standard_osl_headers
+    as_osl_extensions.h
     oslutil.h
     stdosl.h
-    as_osl_extensions.h
+)
+source_group ("include\\standard" FILES
+    ${standard_osl_headers}
 )
 
 set (gaffer_osl_headers
@@ -55,16 +58,21 @@ set (gaffer_osl_headers
     include/appleseed/gaffer/udim.h
 )
 list (APPEND appleseed_osl_headers ${gaffer_osl_headers})
+source_group ("include\\gaffer" FILES
+    ${gaffer_osl_headers}
+)
 
 set (appleseed_library_osl_headers
     include/appleseed/math/as_math_helpers.h
 )
 list (APPEND appleseed_osl_headers ${appleseed_library_osl_headers})
+source_group ("include\\appleseed" FILES
+    ${appleseed_library_osl_headers}
+)
 
 list (APPEND osl_headers
     ${standard_osl_headers}
     ${appleseed_osl_headers}
-    ${appleseed_library_osl_headers}
 )
 
 
@@ -130,6 +138,9 @@ set (gaffer_osl_sources
      src/gaffer/vector/as_vector_split.osl
 )
 list (APPEND osl_sources ${gaffer_osl_sources})
+source_group ("src\\gaffer" FILES
+    ${gaffer_osl_sources}
+)
 
 set (appleseed_maya2_osl_sources
      src/maya/as_maya_addDoubleLinear.osl
@@ -162,6 +173,9 @@ set (appleseed_maya2_osl_sources
      src/maya/as_maya_vectorProduct.osl
 )
 list (APPEND osl_sources ${appleseed_maya2_osl_sources})
+source_group ("src\\maya" FILES
+    ${appleseed_maya2_osl_sources}
+)
 
 
 #--------------------------------------------------------------------------------------------------