diff --git a/include/libpldm/meson.build b/include/libpldm/meson.build
index 76af7d3..92a5e9b 100644
--- a/include/libpldm/meson.build
+++ b/include/libpldm/meson.build
@@ -7,14 +7,22 @@
   'entity.h',
   'firmware_update.h',
   'fru.h',
+  'instance-id.h',
   'pdr.h',
   'platform.h',
   'pldm_types.h',
+  'requester/pldm.h',
   'state_set.h',
   'states.h',
+  'transport.h',
   'utils.h',
   )
 
+libpldm_transport_headers += files(
+  'transport/af-mctp.h',
+  'transport/mctp-demux.h'
+)
+
 if get_option('oem-ibm').enabled()
   libpldm_include_dir += include_directories('oem/ibm')
   libpldm_headers += files(
@@ -26,16 +34,3 @@
     'oem/ibm/libpldm/state_set_oem_ibm.h'
   )
 endif
-
-if get_option('requester-api').enabled()
-   libpldm_headers += files(
-    'instance-id.h',
-    'requester/pldm.h',
-    'transport.h'
-    )
-   libpldm_transport_headers += files(
-    'transport/af-mctp.h',
-    'transport/mctp-demux.h'
-   )
-endif
-
diff --git a/meson_options.txt b/meson_options.txt
index 367dc2c..10cd864 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
 option('tests', type: 'feature', description: 'Build tests', value: 'enabled')
 option('oem-ibm', type: 'feature', description: 'Enable IBM OEM PLDM', yield: true)
-option('requester-api', type: 'feature', description: 'Enable libpldm requester API', value: 'enabled')
 option('abi-compliance-check', type: 'feature', description: 'Detect public ABI/API changes')
diff --git a/src/meson.build b/src/meson.build
index c1359c4..42193c9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,3 @@
-
 libpldm_sources += files(
   'base.c',
   'bios.c',
@@ -10,11 +9,9 @@
   'utils.c'
   )
 
+subdir('requester')
+subdir('transport')
+
 if get_option('oem-ibm').enabled()
    subdir('oem/ibm')
 endif
-
-if get_option('requester-api').enabled()
-   subdir('requester')
-   subdir('transport')
-endif