diff --git a/components/lcd/esp_lcd_ssd1681/CMakeLists.txt b/components/lcd/esp_lcd_ssd1681/CMakeLists.txt
index d34eca66..5c589901 100644
--- a/components/lcd/esp_lcd_ssd1681/CMakeLists.txt
+++ b/components/lcd/esp_lcd_ssd1681/CMakeLists.txt
@@ -1,4 +1,4 @@
-idf_component_register(SRCS "esp_lcd_panel_ssd1681"
+idf_component_register(SRCS "esp_lcd_panel_ssd1681.c"
                        INCLUDE_DIRS "include"
                        REQUIRES "esp_lcd"
                        PRIV_REQUIRES "driver")
diff --git a/components/lcd/esp_lcd_ssd1681/idf_component.yml b/components/lcd/esp_lcd_ssd1681/idf_component.yml
index a6c5f3d4..008a7df4 100644
--- a/components/lcd/esp_lcd_ssd1681/idf_component.yml
+++ b/components/lcd/esp_lcd_ssd1681/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.1.0"
+version: "0.1.0~1"
 description: ESP LCD SSD1681 e-paper driver
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_ssd1681
 dependencies:
diff --git a/components/lcd_touch/esp_lcd_touch_cst816s/esp_lcd_touch_cst816s.c b/components/lcd_touch/esp_lcd_touch_cst816s/esp_lcd_touch_cst816s.c
index 917e1028..56bfd77f 100644
--- a/components/lcd_touch/esp_lcd_touch_cst816s/esp_lcd_touch_cst816s.c
+++ b/components/lcd_touch/esp_lcd_touch_cst816s/esp_lcd_touch_cst816s.c
@@ -10,7 +10,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_system.h"
 #include "esp_err.h"
 #include "esp_log.h"
diff --git a/components/lcd_touch/esp_lcd_touch_cst816s/idf_component.yml b/components/lcd_touch/esp_lcd_touch_cst816s/idf_component.yml
index d16156fe..88308019 100644
--- a/components/lcd_touch/esp_lcd_touch_cst816s/idf_component.yml
+++ b/components/lcd_touch/esp_lcd_touch_cst816s/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.3"
+version: "1.0.3~1"
 description: ESP LCD Touch CST816S - touch controller CST816S
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_cst816s
 dependencies:
diff --git a/components/lcd_touch/esp_lcd_touch_ft5x06/esp_lcd_touch_ft5x06.c b/components/lcd_touch/esp_lcd_touch_ft5x06/esp_lcd_touch_ft5x06.c
index 9c2daa80..6c6bbb7c 100644
--- a/components/lcd_touch/esp_lcd_touch_ft5x06/esp_lcd_touch_ft5x06.c
+++ b/components/lcd_touch/esp_lcd_touch_ft5x06/esp_lcd_touch_ft5x06.c
@@ -13,7 +13,6 @@
 #include "esp_log.h"
 #include "esp_check.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_lcd_panel_io.h"
 #include "esp_lcd_touch.h"
 
diff --git a/components/lcd_touch/esp_lcd_touch_ft5x06/idf_component.yml b/components/lcd_touch/esp_lcd_touch_ft5x06/idf_component.yml
index bbd51fcb..f4ffc404 100644
--- a/components/lcd_touch/esp_lcd_touch_ft5x06/idf_component.yml
+++ b/components/lcd_touch/esp_lcd_touch_ft5x06/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.6"
+version: "1.0.6~1"
 description: ESP LCD Touch FT5x06 - touch controller FT5x06
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_ft5x06
 dependencies:
diff --git a/components/lcd_touch/esp_lcd_touch_gt1151/esp_lcd_touch_gt1151.c b/components/lcd_touch/esp_lcd_touch_gt1151/esp_lcd_touch_gt1151.c
index 583b75f7..24fecf8f 100644
--- a/components/lcd_touch/esp_lcd_touch_gt1151/esp_lcd_touch_gt1151.c
+++ b/components/lcd_touch/esp_lcd_touch_gt1151/esp_lcd_touch_gt1151.c
@@ -11,7 +11,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_system.h"
 #include "esp_err.h"
 #include "esp_log.h"
diff --git a/components/lcd_touch/esp_lcd_touch_gt1151/idf_component.yml b/components/lcd_touch/esp_lcd_touch_gt1151/idf_component.yml
index c9b51bab..cf6deeda 100644
--- a/components/lcd_touch/esp_lcd_touch_gt1151/idf_component.yml
+++ b/components/lcd_touch/esp_lcd_touch_gt1151/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.5~1"
+version: "1.0.5~2"
 description: ESP LCD Touch GT1151 - touch controller GT1151
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_gt1151
 dependencies:
diff --git a/components/lcd_touch/esp_lcd_touch_gt911/esp_lcd_touch_gt911.c b/components/lcd_touch/esp_lcd_touch_gt911/esp_lcd_touch_gt911.c
index 5e5e625e..75b968e2 100644
--- a/components/lcd_touch/esp_lcd_touch_gt911/esp_lcd_touch_gt911.c
+++ b/components/lcd_touch/esp_lcd_touch_gt911/esp_lcd_touch_gt911.c
@@ -13,7 +13,6 @@
 #include "esp_log.h"
 #include "esp_check.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_lcd_panel_io.h"
 #include "esp_lcd_touch.h"
 #include "esp_lcd_touch_gt911.h"
diff --git a/components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml b/components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml
index 37de956e..46ed44f2 100644
--- a/components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml
+++ b/components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.1.1"
+version: "1.1.1~1"
 description: ESP LCD Touch GT911 - touch controller GT911
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_gt911
 dependencies:
diff --git a/components/lcd_touch/esp_lcd_touch_tt21100/esp_lcd_touch_tt21100.c b/components/lcd_touch/esp_lcd_touch_tt21100/esp_lcd_touch_tt21100.c
index 6d3eaa26..e55028f5 100644
--- a/components/lcd_touch/esp_lcd_touch_tt21100/esp_lcd_touch_tt21100.c
+++ b/components/lcd_touch/esp_lcd_touch_tt21100/esp_lcd_touch_tt21100.c
@@ -13,7 +13,6 @@
 #include "esp_log.h"
 #include "esp_check.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_lcd_touch.h"
 
 static const char *TAG = "TT21100";
diff --git a/components/lcd_touch/esp_lcd_touch_tt21100/idf_component.yml b/components/lcd_touch/esp_lcd_touch_tt21100/idf_component.yml
index 03be4156..63c87a91 100644
--- a/components/lcd_touch/esp_lcd_touch_tt21100/idf_component.yml
+++ b/components/lcd_touch/esp_lcd_touch_tt21100/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.0~1"
 description: ESP LCD Touch TT21100 - touch controller TT21100
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_tt21100
 dependencies:
diff --git a/test_app/CMakeLists.txt b/test_app/CMakeLists.txt
index 03c1f46a..47d5a2a2 100644
--- a/test_app/CMakeLists.txt
+++ b/test_app/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(EXTRA_COMPONENT_DIRS "../components")
+set(EXTRA_COMPONENT_DIRS "../components" "../components/lcd" "../components/lcd_touch" "../components/io_expander")
 set(EXCLUDE_COMPONENTS "es8311 es7210") # Deprecated components
 
 include($ENV{IDF_PATH}/tools/cmake/version.cmake) # $ENV{IDF_VERSION} was added after v4.3...