diff --git a/Kbuild b/Kbuild
index c9ab832..fadee94 100644
--- a/Kbuild
+++ b/Kbuild
@@ -997,6 +997,7 @@
 			-I$(WLAN_ROOT)/$(PMO_DIR)/dispatcher/src \
 
 PMO_OBJS :=     $(PMO_DIR)/core/src/wlan_pmo_main.o \
+		$(PMO_DIR)/core/src/wlan_pmo_apf.o \
 		$(PMO_DIR)/core/src/wlan_pmo_arp.o \
 		$(PMO_DIR)/core/src/wlan_pmo_ns.o \
 		$(PMO_DIR)/core/src/wlan_pmo_gtk.o \
diff --git a/components/pmo/core/inc/wlan_pmo_apf.h b/components/pmo/core/inc/wlan_pmo_apf.h
new file mode 100644
index 0000000..366e86e
--- /dev/null
+++ b/components/pmo/core/inc/wlan_pmo_apf.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: Android Packet Filter (APF) headers for PMO
+ */
+
+#ifndef __WLAN_PMO_APF_H
+#define __WLAN_PMO_APF_H
+
+#endif /* __WLAN_PMO_APF_H */
diff --git a/components/pmo/core/src/wlan_pmo_apf.c b/components/pmo/core/src/wlan_pmo_apf.c
new file mode 100644
index 0000000..22b312e
--- /dev/null
+++ b/components/pmo/core/src/wlan_pmo_apf.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: PMO implementations for Android Packet Filter (APF) functions
+ */
+
+#include "wlan_pmo_apf.h"
+