diff --git a/lib/inc/ClientSai.h b/lib/inc/ClientSai.h
index 6689d26ded4f..80dbe6ae5b93 100644
--- a/lib/inc/ClientSai.h
+++ b/lib/inc/ClientSai.h
@@ -3,7 +3,8 @@
 #include "meta/SaiInterface.h"
 #include "Channel.h"
 #include "SwitchContainer.h"
-#include "Notification.h"
+
+#include "meta/Notification.h"
 
 #include "swss/table.h"
 
diff --git a/lib/inc/Context.h b/lib/inc/Context.h
index 8db8ad4cad77..0523ce450b19 100644
--- a/lib/inc/Context.h
+++ b/lib/inc/Context.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "RedisRemoteSaiInterface.h"
-#include "Notification.h"
 #include "ContextConfig.h"
 
+#include "meta/Notification.h"
 #include "meta/Meta.h"
 
 namespace sairedis
diff --git a/lib/inc/RedisChannel.h b/lib/inc/RedisChannel.h
index 05d628cc889a..b67add419454 100644
--- a/lib/inc/RedisChannel.h
+++ b/lib/inc/RedisChannel.h
@@ -4,10 +4,11 @@
 #include "RemoteSaiInterface.h"
 #include "SwitchContainer.h"
 #include "VirtualObjectIdManager.h"
-#include "Notification.h"
 #include "Recorder.h"
 #include "SkipRecordAttrContainer.h"
 
+#include "meta/Notification.h"
+
 #include "swss/producertable.h"
 #include "swss/consumertable.h"
 #include "swss/notificationconsumer.h"
diff --git a/lib/inc/RedisRemoteSaiInterface.h b/lib/inc/RedisRemoteSaiInterface.h
index 1362152be28f..6b963bf6c318 100644
--- a/lib/inc/RedisRemoteSaiInterface.h
+++ b/lib/inc/RedisRemoteSaiInterface.h
@@ -3,7 +3,6 @@
 #include "RemoteSaiInterface.h"
 #include "SwitchContainer.h"
 #include "VirtualObjectIdManager.h"
-#include "Notification.h"
 #include "Recorder.h"
 #include "RedisVidIndexGenerator.h"
 #include "SkipRecordAttrContainer.h"
@@ -11,6 +10,8 @@
 #include "SwitchConfigContainer.h"
 #include "ContextConfig.h"
 
+#include "meta/Notification.h"
+
 #include "swss/producertable.h"
 #include "swss/consumertable.h"
 #include "swss/notificationconsumer.h"
diff --git a/lib/inc/Sai.h b/lib/inc/Sai.h
index d71e5e7b70d8..8a57c748cda4 100644
--- a/lib/inc/Sai.h
+++ b/lib/inc/Sai.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Notification.h"
 #include "Recorder.h"
 #include "Context.h"
 
 #include "meta/Meta.h"
+#include "meta/Notification.h"
 
 #include "swss/logger.h"
 
diff --git a/lib/src/ClientSai.cpp b/lib/src/ClientSai.cpp
index 22841fc02d22..4390dd4efcfb 100644
--- a/lib/src/ClientSai.cpp
+++ b/lib/src/ClientSai.cpp
@@ -4,12 +4,12 @@
 #include "ZeroMQChannel.h"
 #include "Utils.h"
 #include "sairediscommon.h"
-#include "NotificationFactory.h"
 #include "ClientConfig.h"
 
 #include "swss/logger.h"
 
 #include "meta/sai_serialize.h"
+#include "meta/NotificationFactory.h"
 #include "meta/SaiAttributeList.h"
 #include "meta/PerformanceIntervalTimer.h"
 #include "meta/Globals.h"
diff --git a/lib/src/RedisRemoteSaiInterface.cpp b/lib/src/RedisRemoteSaiInterface.cpp
index d5d67ca1458c..a4356b384525 100644
--- a/lib/src/RedisRemoteSaiInterface.cpp
+++ b/lib/src/RedisRemoteSaiInterface.cpp
@@ -1,6 +1,5 @@
 #include "RedisRemoteSaiInterface.h"
 #include "Utils.h"
-#include "NotificationFactory.h"
 #include "Recorder.h"
 #include "VirtualObjectIdManager.h"
 #include "SkipRecordAttrContainer.h"
@@ -9,6 +8,7 @@
 
 #include "sairediscommon.h"
 
+#include "meta/NotificationFactory.h"
 #include "meta/sai_serialize.h"
 #include "meta/SaiAttributeList.h"
 #include "meta/PerformanceIntervalTimer.h"
diff --git a/vslib/inc/EventPayloadNotification.h b/vslib/inc/EventPayloadNotification.h
index 347a2f75f80c..203db4029b18 100644
--- a/vslib/inc/EventPayloadNotification.h
+++ b/vslib/inc/EventPayloadNotification.h
@@ -6,7 +6,7 @@ extern "C"{
 
 #include "EventPayload.h"
 
-#include "lib/inc/Notification.h"
+#include "meta/Notification.h"
 
 namespace saivs
 {