diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index a59f75b7..40f2e461 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -1,33 +1,6 @@
 PROJECT(UNICORN)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
-
-IF(APPLE)
-  EXECUTE_PROCESS(
-    COMMAND sw_vers -productVersion
-    OUTPUT_VARIABLE OSX_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
-  IF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-    MESSAGE(STATUS "OSX < 10.6")
-  ELSE(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-    SET(CMAKE_OSX_ARCHITECTURES "i386;ppc") # for QT4.5 32bits on snow leopard
-  ENDIF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-ENDIF(APPLE)
-
-SET(CMAKE_C_FLAGS_DEBUG             "-g -Wall" CACHE STRING "Debug options." FORCE)
-SET(CMAKE_CXX_FLAGS_DEBUG           "-g -Wall" CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_LINKER_FLAGS_DEBUG        "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_EXE_LINKER_FLAGS_DEBUG    "-pg"          CACHE STRING "Debug options." FORCE)
-
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
 
 # This macro has to be included in all the tools CMakeLists.txt as it's
 # the sole means of localizing other tools/projects.
@@ -47,6 +20,7 @@ MACRO(SETUP_PROJECT_PATHS project)
   LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
 ENDMACRO(SETUP_PROJECT_PATHS project)
 
+SETUP_PROJECT_PATHS(GOODIES)
 SETUP_PROJECT_PATHS(VLSISAPD)
 SETUP_PROJECT_PATHS(CORIOLIS)
 
@@ -60,9 +34,14 @@ ELSE(IS_USR OR IS_OPT)
   SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
 ENDIF(IS_USR OR IS_OPT)
 
-SET(QT_USE_QTXML "true")
+FIND_PACKAGE(Goodies REQUIRED)
+SET_CMAKE_POLICIES()
+SET_LIB_LINK_MODE()
+SETUP_APPLE()
+SETUP_BOOST(program_options filesystem python regex)
 
 FIND_PACKAGE(LibXml2 REQUIRED)
+SET(QT_USE_QTXML "true")
 FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
 FIND_PACKAGE(PythonLibs REQUIRED)
 FIND_PACKAGE(LEFDEF REQUIRED)
@@ -78,14 +57,4 @@ FIND_PACKAGE(KITE REQUIRED)
 #FIND_PACKAGE(EQUINOX REQUIRED)
 #FIND_PACKAGE(SOLSTICE REQUIRED)
 
-SET_LIB_LINK_MODE()
-SET(Boost_USE_STATIC_LIBS ON)
-MESSAGE(STATUS "Always uses Boost static libraries.")
-FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python)
-IF(NOT Boost_FOUND)
-  FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED)
-ENDIF(NOT Boost_FOUND)
-MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
-MESSAGE(STATUS "  ${Boost_LIBRARIES}")
-
 ADD_SUBDIRECTORY(src)