37 files changed, 1 insertions, 23 deletions
diff --git a/src/vppinfra/anneal.c b/extras/deprecated/vppinfra/anneal.c
index 35d10946482..35d10946482 100644
--- a/src/vppinfra/anneal.c
+++ b/extras/deprecated/vppinfra/anneal.c
diff --git a/src/vppinfra/anneal.h b/extras/deprecated/vppinfra/anneal.h
index 148d38ba551..148d38ba551 100644
--- a/src/vppinfra/anneal.h
+++ b/extras/deprecated/vppinfra/anneal.h
diff --git a/src/vppinfra/cuckoo_16_8.h b/extras/deprecated/vppinfra/cuckoo_16_8.h
index b667ff6cbb8..b667ff6cbb8 100644
--- a/src/vppinfra/cuckoo_16_8.h
+++ b/extras/deprecated/vppinfra/cuckoo_16_8.h
diff --git a/src/vppinfra/cuckoo_8_8.h b/extras/deprecated/vppinfra/cuckoo_8_8.h
index 67af79c0e50..67af79c0e50 100644
--- a/src/vppinfra/cuckoo_8_8.h
+++ b/extras/deprecated/vppinfra/cuckoo_8_8.h
diff --git a/src/vppinfra/cuckoo_common.h b/extras/deprecated/vppinfra/cuckoo_common.h
index ea0fc30084b..ea0fc30084b 100644
--- a/src/vppinfra/cuckoo_common.h
+++ b/extras/deprecated/vppinfra/cuckoo_common.h
diff --git a/src/vppinfra/cuckoo_debug.h b/extras/deprecated/vppinfra/cuckoo_debug.h
index eb236509935..eb236509935 100644
--- a/src/vppinfra/cuckoo_debug.h
+++ b/extras/deprecated/vppinfra/cuckoo_debug.h
diff --git a/src/vppinfra/cuckoo_template.c b/extras/deprecated/vppinfra/cuckoo_template.c
index 8cd2a2be2b5..8cd2a2be2b5 100644
--- a/src/vppinfra/cuckoo_template.c
+++ b/extras/deprecated/vppinfra/cuckoo_template.c
diff --git a/src/vppinfra/cuckoo_template.h b/extras/deprecated/vppinfra/cuckoo_template.h
index 364c2919d96..364c2919d96 100644
--- a/src/vppinfra/cuckoo_template.h
+++ b/extras/deprecated/vppinfra/cuckoo_template.h
diff --git a/src/vppinfra/fheap.c b/extras/deprecated/vppinfra/fheap.c
index 034168e85ab..034168e85ab 100644
--- a/src/vppinfra/fheap.c
+++ b/extras/deprecated/vppinfra/fheap.c
diff --git a/src/vppinfra/fheap.h b/extras/deprecated/vppinfra/fheap.h
index 1dbd52bad76..1dbd52bad76 100644
--- a/src/vppinfra/fheap.h
+++ b/extras/deprecated/vppinfra/fheap.h
diff --git a/src/vppinfra/flowhash_24_16.h b/extras/deprecated/vppinfra/flowhash_24_16.h
index 64ee0796c7a..64ee0796c7a 100644
--- a/src/vppinfra/flowhash_24_16.h
+++ b/extras/deprecated/vppinfra/flowhash_24_16.h
diff --git a/src/vppinfra/flowhash_8_8.h b/extras/deprecated/vppinfra/flowhash_8_8.h
index 4a5cfc0a0c6..4a5cfc0a0c6 100644
--- a/src/vppinfra/flowhash_8_8.h
+++ b/extras/deprecated/vppinfra/flowhash_8_8.h
diff --git a/src/vppinfra/flowhash_template.h b/extras/deprecated/vppinfra/flowhash_template.h
index d7a621c1754..d7a621c1754 100644
--- a/src/vppinfra/flowhash_template.h
+++ b/extras/deprecated/vppinfra/flowhash_template.h
diff --git a/src/vppinfra/pfhash.h b/extras/deprecated/vppinfra/pfhash.h
index 2884fa81cf9..2884fa81cf9 100644
--- a/src/vppinfra/pfhash.h
+++ b/extras/deprecated/vppinfra/pfhash.h
diff --git a/src/vppinfra/phash.c b/extras/deprecated/vppinfra/phash.c
index 52c29b33f78..52c29b33f78 100644
--- a/src/vppinfra/phash.c
+++ b/extras/deprecated/vppinfra/phash.c
diff --git a/src/vppinfra/phash.h b/extras/deprecated/vppinfra/phash.h
index 3dc59c724f7..3dc59c724f7 100644
--- a/src/vppinfra/phash.h
+++ b/extras/deprecated/vppinfra/phash.h
diff --git a/src/vppinfra/pipeline.h b/extras/deprecated/vppinfra/pipeline.h
index 5a9799b455e..5a9799b455e 100644
--- a/src/vppinfra/pipeline.h
+++ b/extras/deprecated/vppinfra/pipeline.h
diff --git a/src/vppinfra/qhash.c b/extras/deprecated/vppinfra/qhash.c
index 3b5a175065d..3b5a175065d 100644
--- a/src/vppinfra/qhash.c
+++ b/extras/deprecated/vppinfra/qhash.c
diff --git a/src/vppinfra/qhash.h b/extras/deprecated/vppinfra/qhash.h
index 9dbbd971ade..9dbbd971ade 100644
--- a/src/vppinfra/qhash.h
+++ b/extras/deprecated/vppinfra/qhash.h
diff --git a/src/vppinfra/slist.c b/extras/deprecated/vppinfra/slist.c
index 5598871c884..5598871c884 100644
--- a/src/vppinfra/slist.c
+++ b/extras/deprecated/vppinfra/slist.c
diff --git a/src/vppinfra/slist.h b/extras/deprecated/vppinfra/slist.h
index a7c77e27c96..a7c77e27c96 100644
--- a/src/vppinfra/slist.h
+++ b/extras/deprecated/vppinfra/slist.h
diff --git a/src/vppinfra/test_cuckoo_bihash.c b/extras/deprecated/vppinfra/test_cuckoo_bihash.c
index e992e26fa7d..e992e26fa7d 100644
--- a/src/vppinfra/test_cuckoo_bihash.c
+++ b/extras/deprecated/vppinfra/test_cuckoo_bihash.c
diff --git a/src/vppinfra/test_cuckoo_template.c b/extras/deprecated/vppinfra/test_cuckoo_template.c
index 9619dc2e802..9619dc2e802 100644
--- a/src/vppinfra/test_cuckoo_template.c
+++ b/extras/deprecated/vppinfra/test_cuckoo_template.c
diff --git a/src/vppinfra/test_flowhash_template.c b/extras/deprecated/vppinfra/test_flowhash_template.c
index 19ac4edf2e2..19ac4edf2e2 100644
--- a/src/vppinfra/test_flowhash_template.c
+++ b/extras/deprecated/vppinfra/test_flowhash_template.c
diff --git a/src/vppinfra/test_phash.c b/extras/deprecated/vppinfra/test_phash.c
index 47711c28dbc..47711c28dbc 100644
--- a/src/vppinfra/test_phash.c
+++ b/extras/deprecated/vppinfra/test_phash.c
diff --git a/src/vppinfra/test_qhash.c b/extras/deprecated/vppinfra/test_qhash.c
index a520fa4bd77..a520fa4bd77 100644
--- a/src/vppinfra/test_qhash.c
+++ b/extras/deprecated/vppinfra/test_qhash.c
diff --git a/src/vppinfra/test_slist.c b/extras/deprecated/vppinfra/test_slist.c
index 3c3cbf73ca9..3c3cbf73ca9 100644
--- a/src/vppinfra/test_slist.c
+++ b/extras/deprecated/vppinfra/test_slist.c
diff --git a/src/vppinfra/test_timing_wheel.c b/extras/deprecated/vppinfra/test_timing_wheel.c
index 48020d520a0..48020d520a0 100644
--- a/src/vppinfra/test_timing_wheel.c
+++ b/extras/deprecated/vppinfra/test_timing_wheel.c
diff --git a/src/vppinfra/test_vhash.c b/extras/deprecated/vppinfra/test_vhash.c
index 594d46c38df..594d46c38df 100644
--- a/src/vppinfra/test_vhash.c
+++ b/extras/deprecated/vppinfra/test_vhash.c
diff --git a/src/vppinfra/test_zvec.c b/extras/deprecated/vppinfra/test_zvec.c
index 7d777fabf83..7d777fabf83 100644
--- a/src/vppinfra/test_zvec.c
+++ b/extras/deprecated/vppinfra/test_zvec.c
diff --git a/src/vppinfra/unix-kelog.c b/extras/deprecated/vppinfra/unix-kelog.c
index 88428ee8f2e..88428ee8f2e 100644
--- a/src/vppinfra/unix-kelog.c
+++ b/extras/deprecated/vppinfra/unix-kelog.c
diff --git a/src/vppinfra/vhash.c b/extras/deprecated/vppinfra/vhash.c
index 9120f502c91..9120f502c91 100644
--- a/src/vppinfra/vhash.c
+++ b/extras/deprecated/vppinfra/vhash.c
diff --git a/src/vppinfra/vhash.h b/extras/deprecated/vppinfra/vhash.h
index 85dfb788308..85dfb788308 100644
--- a/src/vppinfra/vhash.h
+++ b/extras/deprecated/vppinfra/vhash.h
diff --git a/src/vppinfra/xy.h b/extras/deprecated/vppinfra/xy.h
index fb562161a62..fb562161a62 100644
--- a/src/vppinfra/xy.h
+++ b/extras/deprecated/vppinfra/xy.h
diff --git a/src/vppinfra/zvec.c b/extras/deprecated/vppinfra/zvec.c
index d062e5f7db1..d062e5f7db1 100644
--- a/src/vppinfra/zvec.c
+++ b/extras/deprecated/vppinfra/zvec.c
diff --git a/src/vppinfra/zvec.h b/extras/deprecated/vppinfra/zvec.h
index 7d35a3fe41f..7d35a3fe41f 100644
--- a/src/vppinfra/zvec.h
+++ b/extras/deprecated/vppinfra/zvec.h
diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index f2279d0857c..e667eb03e8c 100644
--- a/src/vppinfra/CMakeLists.txt
+++ b/src/vppinfra/CMakeLists.txt
@@ -47,7 +47,6 @@ set(VPPINFRA_SRCS
   elf.c
   elog.c
   error.c
-  fheap.c
   fifo.c
   format.c
   graph.c
@@ -68,7 +67,6 @@ set(VPPINFRA_SRCS
   random_isaac.c
   rbtree.c
   serialize.c
-  slist.c
   socket.c
   std-formats.c
   string.c
@@ -87,7 +85,6 @@ set(VPPINFRA_SRCS
   valloc.c
   vec.c
   vector.c
-  zvec.c
 )
 
 set(VPPINFRA_HEADERS
@@ -109,12 +106,6 @@ set(VPPINFRA_HEADERS
   clib.h
   cpu.h
   crc32.h
-  cuckoo_8_8.h
-  cuckoo_16_8.h
-  cuckoo_common.h
-  cuckoo_debug.h
-  cuckoo_template.h
-  cuckoo_template.c
   dlist.h
   dlmalloc.h
   elf_clib.h
@@ -122,12 +113,8 @@ set(VPPINFRA_HEADERS
   elog.h
   error_bootstrap.h
   error.h
-  fheap.h
   fifo.h
   file.h
-  flowhash_24_16.h
-  flowhash_8_8.h
-  flowhash_template.h
   format.h
   graph.h
   hash.h
@@ -149,7 +136,6 @@ set(VPPINFRA_HEADERS
   os.h
   pcap.h
   pcap_funcs.h
-  pipeline.h
   pmalloc.h
   pool.h
   pmc.h
@@ -160,7 +146,6 @@ set(VPPINFRA_HEADERS
   rbtree.h
   serialize.h
   sha2.h
-  slist.h
   smp.h
   socket.h
   sparse_vec.h
@@ -190,8 +175,6 @@ set(VPPINFRA_HEADERS
   vector_neon.h
   vector_sse42.h
   xxhash.h
-  xy.h
-  zvec.h
   linux/syscall.h
   linux/sysfs.h
 )
@@ -218,12 +201,10 @@ option(VPP_BUILD_VPPINFRA_TESTS "Build vppinfra tests." OFF)
 if(VPP_BUILD_VPPINFRA_TESTS)
   foreach(test
     bihash_vec88
-    cuckoo_template
     dlist
     elf
     elog
     fifo
-    flowhash_template
     format
     fpool
     hash
@@ -238,16 +219,13 @@ if(VPP_BUILD_VPPINFRA_TESTS)
     random_isaac
     rwlock
     serialize
-    slist
     socket
     spinlock
     time
     time_range
-    timing_wheel
     tw_timer
     valloc
     vec
-    zvec
   )
     add_vpp_executable(test_${test}
       SOURCES test_${test}.c
@@ -255,7 +233,7 @@ if(VPP_BUILD_VPPINFRA_TESTS)
       )
   endforeach()
 
-  foreach(test bihash_template cuckoo_bihash)
+  foreach(test bihash_template)
     add_vpp_executable(test_${test}
       SOURCES test_${test}.c
       LINK_LIBRARIES vppinfra Threads::Threads