diff --git a/library.json b/library.json
index e46fcbda..49b9d20b 100644
--- a/library.json
+++ b/library.json
@@ -22,30 +22,18 @@
         ],
         "exclude": [
             "ci",
-            "googlemock/build-aux",
             "googlemock/cmake",
-            "googlemock/make",
-            "googlemock/msvc",
             "googlemock/scripts",
             "googlemock/src/gmock-all.cc",
             "googlemock/src/gmock_main.cc",
             "googlemock/test",
             "googlemock/CMakeLists.txt",
-            "googlemock/Makefile.am",
-            "googlemock/configure.ac",
             "googletest/cmake",
-            "googletest/codegear",
-            "googletest/m4",
-            "googletest/make",
-            "googletest/msvc",
             "googletest/scripts",
             "googletest/src/gtest-all.cc",
             "googletest/src/gtest_main.cc",
             "googletest/test",
-            "googletest/xcode",
             "googletest/CMakeLists.txt",
-            "googletest/Makefile.am",
-            "googletest/configure.ac"
           ]
   },
   "build": {
diff --git a/platformio.ini b/platformio.ini
index 3910026b..94495e80 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,7 +19,7 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 build_flags = -I./googletest/include -I./googletest
-src_filter = +<*> -<.git/> -<googlemock> -<googletest/codegear/> -<googletest/samples> -<googletest/test/> -<googletest/xcode> -<googletest/src> +<googletest/src/gtest-all.cc> +<googletest/src/gtest_main.cc>
+src_filter = +<*> -<.git/> -<googlemock> -<googletest/samples> -<googletest/test/> -<googletest/src> +<googletest/src/gtest-all.cc> +<googletest/src/gtest_main.cc>
 upload_speed = 921600
 
 [env:googlemock_esp32]