diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 06f42da20..e311cf05c 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -1,62 +1,64 @@
 set(LAUNCHER
-  datafilespage.cpp
-  lineedit.cpp
-  main.cpp
-  maindialog.cpp
-  playpage.cpp
-  graphicspage.cpp
-  naturalsort.cpp
-
-  pluginsmodel.cpp
-  pluginsview.cpp
-
-  datafilespage.hpp
-  lineedit.hpp
-  maindialog.hpp
-  playpage.hpp
-  combobox.hpp
-  graphicspage.hpp
-  naturalsort.hpp
-
-  pluginsmodel.hpp
-  pluginsview.hpp
+    datafilespage.cpp
+    graphicspage.cpp
+    lineedit.cpp
+    main.cpp
+    maindialog.cpp
+    naturalsort.cpp
+    playpage.cpp
+    pluginsmodel.cpp
+    pluginsview.cpp
 )
 
-set(MOC_HDRS
-  datafilespage.hpp
-  lineedit.hpp
-  maindialog.hpp
-  playpage.hpp
-  combobox.hpp
-  graphicspage.hpp
+set(LAUNCHER_HEADER
+    combobox.hpp
+    datafilespage.hpp
+    graphicspage.hpp
+    lineedit.hpp
+    maindialog.hpp
+    naturalsort.hpp
+    playpage.hpp
+    pluginsmodel.hpp
+    pluginsview.hpp
+)
 
-  pluginsmodel.hpp
-  pluginsview.hpp
+# Headers that must be pre-processed
+set(LAUNCHER_HEADER_MOC
+    combobox.hpp
+    datafilespage.hpp
+    graphicspage.hpp
+    lineedit.hpp
+    maindialog.hpp
+    playpage.hpp
+    pluginsmodel.hpp
+    pluginsview.hpp
 )
 
+source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER} ${LAUNCHER_HEADER_MOC})
+
 find_package(Qt4 REQUIRED)
 set(QT_USE_QTGUI 1)
 
 QT4_ADD_RESOURCES(RCC_SRCS resources.qrc)
-QT4_WRAP_CPP(MOC_SRCS ${MOC_HDRS})
+QT4_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
 
 include(${QT_USE_FILE})
 
 # Main executable
 add_executable(launcher
-  ${LAUNCHER}
-  ${MISC} ${MISC_HEADER}
-  ${FILES} ${FILES_HEADER}
-  ${TO_UTF8}
-  ${ESM}
-  ${RCC_SRCS}
-  ${MOC_SRCS}
+    ${LAUNCHER}
+    ${MISC} ${MISC_HEADER}
+    ${FILES} ${FILES_HEADER}
+    ${TO_UTF8}
+    ${ESM}
+    ${RCC_SRCS}
+    ${MOC_SRCS}
 )
 
 target_link_libraries(launcher
-  ${Boost_LIBRARIES}
-  ${OGRE_LIBRARIES}
-  ${QT_LIBRARIES}
+    ${Boost_LIBRARIES}
+    ${OGRE_LIBRARIES}
+    ${QT_LIBRARIES}
 )
 
 configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss