diff --git a/l1tests.cmake b/l1tests.cmake
index ea6c4e9cd5..02ca49ebc7 100755
--- a/l1tests.cmake
+++ b/l1tests.cmake
@@ -6,107 +6,16 @@ file(GLOB BASEDIR Tests)
 set(BASEDIR ${BASEDIR}/headers)
 set(EMPTY_HEADERS_DIRS
         ${BASEDIR}
-        ${BASEDIR}/audiocapturemgr
-        ${BASEDIR}/rdk/ds
         ${BASEDIR}/rdk/iarmbus
-        ${BASEDIR}/rdk/iarmmgrs-hal
-        ${BASEDIR}/ccec/drivers
-        ${BASEDIR}/ccec/drivers/iarmbus
-        ${BASEDIR}/ccec/host
         ${BASEDIR}/network
-        ${BASEDIR}/Dobby
-        ${BASEDIR}/Dobby/Public/Dobby
-        ${BASEDIR}/Dobby/IpcService
-        ${BASEDIR}/websocket
-        ${BASEDIR}/rdk/iarmmgrs
-	${BASEDIR}/rdkshell
-        ${BASEDIR}/opkg
-        ${BASEDIR}/UsbAccess
         )
 
 set(EMPTY_HEADERS
-        ${BASEDIR}/audiocapturemgr/audiocapturemgr_iarm.h
-        ${BASEDIR}/ccec/drivers/CecIARMBusMgr.h
-        ${BASEDIR}/ccec/drivers/iarmbus/CecIARMBusMgr.h
-        ${BASEDIR}/ccec/FrameListener.hpp
-        ${BASEDIR}/ccec/Connection.hpp
-        ${BASEDIR}/ccec/Assert.hpp
-        ${BASEDIR}/ccec/Messages.hpp
-        ${BASEDIR}/ccec/MessageDecoder.hpp
-        ${BASEDIR}/ccec/MessageProcessor.hpp
-        ${BASEDIR}/ccec/CECFrame.hpp
-        ${BASEDIR}/ccec/host/RDK.hpp
-        ${BASEDIR}/ccec/MessageEncoder.hpp
-        ${BASEDIR}/rdk/ds/audioOutputPort.hpp
-        ${BASEDIR}/rdk/ds/compositeIn.hpp
-        ${BASEDIR}/rdk/ds/dsDisplay.h
-        ${BASEDIR}/rdk/ds/dsError.h
-        ${BASEDIR}/rdk/ds/dsMgr.h
-        ${BASEDIR}/rdk/ds/dsTypes.h
-        ${BASEDIR}/rdk/ds/dsUtl.h
-        ${BASEDIR}/rdk/ds/exception.hpp
-        ${BASEDIR}/rdk/ds/hdmiIn.hpp
-        ${BASEDIR}/rdk/ds/host.hpp
-        ${BASEDIR}/rdk/ds/list.hpp
-        ${BASEDIR}/rdk/ds/manager.hpp
-        ${BASEDIR}/rdk/ds/sleepMode.hpp
-        ${BASEDIR}/rdk/ds/videoDevice.hpp
-        ${BASEDIR}/rdk/ds/videoOutputPort.hpp
-        ${BASEDIR}/rdk/ds/videoOutputPortConfig.hpp
-        ${BASEDIR}/rdk/ds/videoOutputPortType.hpp
-        ${BASEDIR}/rdk/ds/videoResolution.hpp
-        ${BASEDIR}/rdk/ds/frontPanelIndicator.hpp
-        ${BASEDIR}/rdk/ds/frontPanelConfig.hpp
-        ${BASEDIR}/rdk/ds/frontPanelTextDisplay.hpp
         ${BASEDIR}/rdk/iarmbus/libIARM.h
         ${BASEDIR}/rdk/iarmbus/libIBus.h
         ${BASEDIR}/rdk/iarmbus/libIBusDaemon.h
-        ${BASEDIR}/rdk/iarmmgrs-hal/deepSleepMgr.h
-        ${BASEDIR}/rdk/iarmmgrs-hal/mfrMgr.h
-        ${BASEDIR}/rdk/iarmmgrs-hal/pwrMgr.h
-        ${BASEDIR}/rdk/iarmmgrs-hal/sysMgr.h
         ${BASEDIR}/network/wifiSrvMgrIarmIf.h
         ${BASEDIR}/network/netsrvmgrIarm.h
-        ${BASEDIR}/rdkshell/rdkshellevents.h
-        ${BASEDIR}/UsbAccess/secure_wrappermock.h
-        ${BASEDIR}/rdkshell/rdkshell.h
-        ${BASEDIR}/rdkshell/compositorcontroller.h
-        ${BASEDIR}/rdkshell/logger.h
-        ${BASEDIR}/rdkshell/eastereggs.h
-        ${BASEDIR}/rdkshell/application.h
-        ${BASEDIR}/rdkshell/linuxkeys.h
-        ${BASEDIR}/libudev.h
-        ${BASEDIR}/rfcapi.h
-        ${BASEDIR}/rbus.h
-        ${BASEDIR}/telemetry_busmessage_sender.h
-        ${BASEDIR}/motionDetector.h
-        ${BASEDIR}/Dobby/DobbyProtocol.h
-        ${BASEDIR}/Dobby/DobbyProxy.h
-        ${BASEDIR}/Dobby/Public/Dobby/IDobbyProxy.h
-        ${BASEDIR}/Dobby/IpcService/IpcFactory.h
-        ${BASEDIR}/ccec/FrameListener.hpp
-      	${BASEDIR}/ccec/Connection.hpp
-        ${BASEDIR}/ccec/Assert.hpp
-        ${BASEDIR}/ccec/Messages.hpp
-        ${BASEDIR}/ccec/MessageDecoder.hpp
-        ${BASEDIR}/ccec/MessageProcessor.hpp
-        ${BASEDIR}/ccec/CECFrame.hpp
-        ${BASEDIR}/ccec/MessageEncoder.hpp
-        ${BASEDIR}/ccec/host/RDK.hpp
-        ${BASEDIR}/ccec/drivers/iarmbus/CecIARMBusMgr.h
-        ${BASEDIR}/rtRemote.h
-        ${BASEDIR}/rtObject.h
-        ${BASEDIR}/rtError.h
-        ${BASEDIR}/rtNotifier.h
-	${BASEDIR}/dsRpc.h
-	${BASEDIR}/websocket/URL.h
-        ${BASEDIR}/rdk/iarmmgrs/irMgr.h
-        ${BASEDIR}/rdk/iarmmgrs/comcastIrKeyCodes.h
-        ${BASEDIR}/rdk_logger_milestone.h
-        ${BASEDIR}/opkg/opkg.h
-        ${BASEDIR}/opkg/opkg_message.h
-        ${BASEDIR}/opkg/opkg_cmd.h
-        ${BASEDIR}/opkg/opkg_download.h
         )
 
 file(MAKE_DIRECTORY ${EMPTY_HEADERS_DIRS})
@@ -126,18 +35,7 @@ message("Adding compiler and linker options for all targets")
 
 file(GLOB BASEDIR Tests/mocks)
 set(FAKE_HEADERS
-        ${BASEDIR}/devicesettings.h
         ${BASEDIR}/Iarm.h
-        ${BASEDIR}/Rfc.h
-        ${BASEDIR}/RBus.h
-        ${BASEDIR}/Telemetry.h
-        ${BASEDIR}/Udev.h
-        ${BASEDIR}/MotionDetection.h
-        ${BASEDIR}/Dobby.h
-        ${BASEDIR}/HdmiCec.h
-        ${BASEDIR}/rdkshell.h
-	${BASEDIR}/RdkLoggerMilestone.h
-        ${BASEDIR}/secure_wrappermock.h
         )
 
 foreach (file ${FAKE_HEADERS})