diff --git a/src/lib/extensions/focus_inspector/CMakeLists.txt b/src/lib/extensions/focus_inspector/CMakeLists.txt
index 366f15d..49dda7f 100644
--- a/src/lib/extensions/focus_inspector/CMakeLists.txt
+++ b/src/lib/extensions/focus_inspector/CMakeLists.txt
@@ -1,14 +1,10 @@
 set(CMAKE_BUILD_TYPE Debug)
 
-STRING(REGEX REPLACE "\n" "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR})
-STRING(REGEX REPLACE " " "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR})
 add_definitions(${CLI_COMMON_DEFINITIONS} -DEFL_EO_API_SUPPORT
-   -DEOLIAN_EO_DIR="${EOLIAN_EO_DIR}" -DFOCUS_EDJ="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/clouseau_focus_inspector.edj")
+   -DFOCUS_EDJ="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/clouseau_focus_inspector.edj")
 
 add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}")
 
-set(EOLIAN_INCLUDE_FLAG -I \"${EOLIAN_EO_DIR}/eo-1\" -I${CMAKE_CURRENT_SOURCE_DIR})
-
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${ELEMENTARY_INCLUDE_DIRS}
diff --git a/src/lib/extensions/objects_introspection/CMakeLists.txt b/src/lib/extensions/objects_introspection/CMakeLists.txt
index b03c4fe..0fe4adb 100644
--- a/src/lib/extensions/objects_introspection/CMakeLists.txt
+++ b/src/lib/extensions/objects_introspection/CMakeLists.txt
@@ -1,14 +1,9 @@
 set(CMAKE_BUILD_TYPE Debug)
 
-STRING(REGEX REPLACE "\n" "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR})
-STRING(REGEX REPLACE " " "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR})
-add_definitions(${CLI_COMMON_DEFINITIONS} -DEFL_EO_API_SUPPORT
-   -DEOLIAN_EO_DIR="${EOLIAN_EO_DIR}")
+add_definitions(${CLI_COMMON_DEFINITIONS} -DEFL_EO_API_SUPPORT)
 
 add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}")
 
-set(EOLIAN_INCLUDE_FLAG -I \"${EOLIAN_EO_DIR}/eo-1\" -I${CMAKE_CURRENT_SOURCE_DIR})
-
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${ELEMENTARY_INCLUDE_DIRS}