diff --git a/vlsisapd/cmake_modules/FindIO.cmake b/vlsisapd/cmake_modules/FindIO.cmake
index d01ecae2..602a57f3 100644
--- a/vlsisapd/cmake_modules/FindIO.cmake
+++ b/vlsisapd/cmake_modules/FindIO.cmake
@@ -34,22 +34,22 @@ SETUP_SEARCH_DIR(IO)
 
 IF(IO_DIR_SEARCH)
     # AGDS
-    FIND_PATH   (AGDS_INCLUDE_DIR NAMES agds/GdsLibrary.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include)
+    FIND_PATH   (AGDS_INCLUDE_DIR NAMES io/agds/GdsLibrary.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
     FIND_LIBRARY(AGDS_LIBRARY     NAMES agds                 PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
     SET_FOUND(AGDS)
     
     # CIF
-    FIND_PATH   (CIF_INCLUDE_DIR NAMES cif/CifCircuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include)
+    FIND_PATH   (CIF_INCLUDE_DIR NAMES io/cif/CifCircuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
     FIND_LIBRARY(CIF_LIBRARY     NAMES cif                 PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
     SET_FOUND(CIF)
     
     # OPENCHAMS
-    FIND_PATH   (OPENCHAMS_INCLUDE_DIR NAMES openChams/Circuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include)
+    FIND_PATH   (OPENCHAMS_INCLUDE_DIR NAMES io/openChams/Circuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
     FIND_LIBRARY(OPENCHAMS_LIBRARY     NAMES openChams              PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
     SET_FOUND(OPENCHAMS)
 
     # DTR
-    FIND_PATH   (DTR_INCLUDE_DIR NAMES dtr/Techno.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include)
+    FIND_PATH   (DTR_INCLUDE_DIR NAMES io/dtr/Techno.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
     FIND_LIBRARY(DTR_LIBRARY     NAMES dtr             PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
     SET_FOUND(DTR)