diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index f71aab118b..ec842fd306 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,44 +1,43 @@
 macro_optional_add_subdirectory(konsole)
 add_subdirectory(filemanager)
-#add_subdirectory(vcscommon)
 add_subdirectory(appwizard)
 add_subdirectory(projectmanagerview)
 add_subdirectory(genericprojectmanager)
 add_subdirectory(standardoutputview)
 add_subdirectory(documentview)
 add_subdirectory(quickopen)
 add_subdirectory(contextbrowser)
-macro_optional_add_subdirectory(snippet)
+add_subdirectory(snippet)
 macro_optional_add_subdirectory(cvs)
 add_subdirectory(problemreporter)
 add_subdirectory(execute)
 add_subdirectory(externalscript)
 add_subdirectory(documentswitcher)
 add_subdirectory(patchreview)
 add_subdirectory(openwith)
 add_subdirectory(grepview)
 add_subdirectory(pastebin)
 add_subdirectory(codeutils)
-add_subdirectory(git)
+macro_optional_add_subdirectory(git)
 
 set(Boost_ADDITIONAL_VERSIONS 1.39.0 1.39)
-macro_optional_find_package( Boost 1.35.0 )
+find_package(Boost 1.35.0)
 macro_log_feature( Boost_FOUND "Boost" "Boost libraries for enabling the classbrowser" "http://www.boost.org" FALSE "1.35.0" "The boost libraries are needed to build the Class Browser" )
 if(Boost_FOUND)
-  add_subdirectory(classbrowser)
+    macro_optional_add_subdirectory(classbrowser)
 endif(Boost_FOUND)
 
-macro_optional_find_package(SubversionLibrary)
+find_package(SubversionLibrary)
 macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion integration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion libraries are needed for the Subversion support" )
 
 if(SUBVERSION_FOUND)
     macro_optional_add_subdirectory(subversion)
 endif(SUBVERSION_FOUND)
 
-macro_optional_find_package(QJSON)
+find_package(QJSON)
 macro_log_feature( QJSON_FOUND "QJson" "QJson support for Uploading Patches to reviewboard" "http://qjson.sourceforge.net/" FALSE "0.7.0" "The qjson library is needed to enable uploading patches to reviewboard" )
 if(QJSON_FOUND)
     macro_optional_add_subdirectory(reviewboard)
 endif(QJSON_FOUND)
 
 macro_display_feature_log()