diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2012bd5e1..6bd8c8f795 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,16 +43,10 @@ IF(wxWidgets_FOUND)
     # We define the include paths here, our minimal source dir is one, 
     # and also the include dirs defined by wxWidgets
     INCLUDE_DIRECTORIES(
-                        #${KICAD_EDA_SOURCE_DIR}/include                        
-                        #${KICAD_EDA_SOURCE_DIR}/common
-                        #${KICAD_EDA_SOURCE_DIR}/share
-                        #${KICAD_EDA_SOURCE_DIR}/kicad/bitmaps 
-                        #${KICAD_EDA_SOURCE_DIR}/common/bitmaps 
                         ${CMAKE_BINARY_DIR}
                         ${CMAKE_SOURCE_DIR}
                         ${CMAKE_SOURCE_DIR}/include
                         ${CMAKE_SOURCE_DIR}/common
-                        #${CMAKE_SOURCE_DIR}/share
                         ${CMAKE_SOURCE_DIR}/kicad/bitmaps
                         ${CMAKE_SOURCE_DIR}/common/bitmaps
                         ${wxWidgets_INCLUDE_DIRS}
@@ -65,4 +59,4 @@ ENDIF(wxWidgets_FOUND)
 
 add_subdirectory (common)
 add_subdirectory (kicad)
-#SUBDIRS(common kicad)
+
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index d73b8d11c3..04c6e0bf7c 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -25,7 +25,4 @@ ADD_EXECUTABLE(kicad WIN32 ${SRCS})
 # We add to our target 'kicad' the wxWidgets libraries. These are
 # set for us by the find script. If you need other libraries, you
 # can add them here as well. 
-TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES})
-
-LINK_DIRECTORIES(${KICAD_EDA_BINARY_DIR}/common
-)
+TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES} common)