From 67388cd4fae0cfd1674aada937f4f4d2faeeee1f Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 18 May 2025 22:05:45 +0200
Subject: [PATCH] Include regex.h from para.h.

Every .c file includes it anyway.
---
 aac_afh.c          | 1 -
 aacdec_filter.c    | 1 -
 acl.c              | 1 -
 afh.c              | 1 -
 afh_common.c       | 1 -
 afh_recv.c         | 1 -
 afs.c              | 1 -
 aft.c              | 1 -
 alsa_mix.c         | 1 -
 alsa_write.c       | 1 -
 amp_filter.c       | 1 -
 ao_write.c         | 1 -
 attribute.c        | 1 -
 audioc.c           | 1 -
 audiod.c           | 1 -
 audiod_command.c   | 1 -
 base64.c           | 2 --
 bitstream.c        | 2 --
 blob.c             | 1 -
 buffer_tree.c      | 1 -
 check_wav.c        | 2 --
 chunk_queue.c      | 2 --
 client.c           | 1 -
 client_common.c    | 1 -
 close_on_fork.c    | 2 --
 command.c          | 1 -
 compress_filter.c  | 1 -
 crypt_common.c     | 2 --
 daemon.c           | 1 -
 dccp_recv.c        | 1 -
 dccp_send.c        | 1 -
 exec.c             | 2 --
 fd.c               | 1 -
 fec.c              | 2 --
 fecdec_filter.c    | 2 --
 file_write.c       | 1 -
 filter.c           | 1 -
 filter_common.c    | 1 -
 flac_afh.c         | 1 -
 flacdec_filter.c   | 1 -
 gcrypt.c           | 1 -
 grab_client.c      | 1 -
 gui.c              | 1 -
 http_recv.c        | 1 -
 http_send.c        | 1 -
 imdct.c            | 1 -
 interactive.c      | 1 -
 lsu.c              | 1 -
 mixer.c            | 1 -
 mood.c             | 1 -
 mp.c               | 1 -
 mp3_afh.c          | 2 --
 mp3dec_filter.c    | 1 -
 mp4.c              | 2 --
 net.c              | 1 -
 ogg_afh.c          | 1 -
 ogg_afh_common.c   | 1 -
 oggdec_filter.c    | 1 -
 openssl.c          | 1 -
 opus_afh.c         | 1 -
 opusdec_filter.c   | 1 -
 oss_mix.c          | 1 -
 oss_write.c        | 1 -
 para.h             | 1 +
 play.c             | 1 -
 playlist.c         | 1 -
 prebuffer_filter.c | 1 -
 recv.c             | 1 -
 recv_common.c      | 1 -
 resample_filter.c  | 1 -
 ringbuffer.c       | 2 --
 sched.c            | 1 -
 score.c            | 1 -
 send_common.c      | 1 -
 server.c           | 1 -
 sideband.c         | 2 --
 signal.c           | 1 -
 spx_afh.c          | 1 -
 spx_common.c       | 1 -
 spxdec_filter.c    | 1 -
 stat.c             | 3 ---
 stdin.c            | 2 --
 string.c           | 1 -
 sync_filter.c      | 1 -
 udp_recv.c         | 1 -
 udp_send.c         | 1 -
 upgrade_db.c       | 1 -
 user_list.c        | 1 -
 vss.c              | 1 -
 wav_filter.c       | 2 --
 wma_afh.c          | 1 -
 wmadec_filter.c    | 1 -
 write.c            | 1 -
 write_common.c     | 1 -
 94 files changed, 1 insertion(+), 110 deletions(-)

diff --git a/aac_afh.c b/aac_afh.c
index d50898fc..57e79d3e 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -6,7 +6,6 @@
 
 /** \file aac_afh.c para_server's aac audio format handler. */
 
-#include <regex.h>
 #include <neaacdec.h>
 
 #include "para.h"
diff --git a/aacdec_filter.c b/aacdec_filter.c
index ab07be8f..eab068f4 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -6,7 +6,6 @@
 
 /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */
 
-#include <regex.h>
 #include <neaacdec.h>
 
 #include "para.h"
diff --git a/acl.c b/acl.c
index ddf93ecc..811abaab 100644
--- a/acl.c
+++ b/acl.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
diff --git a/afh.c b/afh.c
index e419d270..2d959537 100644
--- a/afh.c
+++ b/afh.c
@@ -2,7 +2,6 @@
 
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "afh.lsg.h"
diff --git a/afh_common.c b/afh_common.c
index 7e8f63d2..0f17a67b 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -4,7 +4,6 @@
 
 #include <sys/mman.h> /* mmap */
 #include <sys/types.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/afh_recv.c b/afh_recv.c
index 687b77d9..e548d709 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -2,7 +2,6 @@
 
 /** \file afh_recv.c Receiver for streaming local files. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/afs.c b/afs.c
index f96d9c91..61b72942 100644
--- a/afs.c
+++ b/afs.c
@@ -12,7 +12,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
 #include <osl.h>
diff --git a/aft.c b/aft.c
index 132f5119..4a4c46fc 100644
--- a/aft.c
+++ b/aft.c
@@ -2,7 +2,6 @@
 
 /** \file aft.c Audio file table functions. */
 
-#include <regex.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>
diff --git a/alsa_mix.c b/alsa_mix.c
index af4adc46..9a937ee7 100644
--- a/alsa_mix.c
+++ b/alsa_mix.c
@@ -2,7 +2,6 @@
 
 /** \file alsa_mix.c The ALSA mixer plugin. */
 
-#include <regex.h>
 #include <alsa/asoundlib.h>
 
 #include "para.h"
diff --git a/alsa_write.c b/alsa_write.c
index 7e71d4ae..529ae639 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -8,7 +8,6 @@
  * based on the vplay program by Michael Beck.
  */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
 #include <lopsub.h>
diff --git a/amp_filter.c b/amp_filter.c
index be69ad67..a5b22218 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -2,7 +2,6 @@
 
 /** \file amp_filter.c Paraslash's amplify filter. */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "filter_cmd.lsg.h"
diff --git a/ao_write.c b/ao_write.c
index cc1a4f0f..46efd1e3 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -4,7 +4,6 @@
 
 #include <pthread.h>
 #include <ao/ao.h>
-#include <regex.h>
 #include <lopsub.h>
 
 #include "write_cmd.lsg.h"
diff --git a/attribute.c b/attribute.c
index 51630b25..0496641c 100644
--- a/attribute.c
+++ b/attribute.c
@@ -2,7 +2,6 @@
 
 /** \file attribute.c Attribute handling functions. */
 
-#include <regex.h>
 #include <osl.h>
 #include <lopsub.h>
 
diff --git a/audioc.c b/audioc.c
index f2e4cb91..2614077f 100644
--- a/audioc.c
+++ b/audioc.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/audiod.c b/audiod.c
index 3e86af53..4ac23ded 100644
--- a/audiod.c
+++ b/audiod.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/audiod_command.c b/audiod_command.c
index a7b65b1a..f34a25f2 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/base64.c b/base64.c
index 7deac58c..04b74ead 100644
--- a/base64.c
+++ b/base64.c
@@ -6,8 +6,6 @@
 
 /** \file base64.c Uudecode and base64decode implementation. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "base64.h"
diff --git a/bitstream.c b/bitstream.c
index a1c7c943..7766394e 100644
--- a/bitstream.c
+++ b/bitstream.c
@@ -13,8 +13,6 @@
 
 /** \file bitstream.c Bitstream API for the wma decoder. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "string.h"
diff --git a/blob.c b/blob.c
index 1b969484..d7859301 100644
--- a/blob.c
+++ b/blob.c
@@ -2,7 +2,6 @@
 
 /** \file blob.c Macros and functions for blob handling. */
 
-#include <regex.h>
 #include <fnmatch.h>
 #include <osl.h>
 #include <lopsub.h>
diff --git a/buffer_tree.c b/buffer_tree.c
index 255dc475..049eed36 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -1,7 +1,6 @@
 /* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file buffer_tree.c Buffer tree and buffer pool implementations. */
-#include <regex.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/check_wav.c b/check_wav.c
index 48a204bb..5b680deb 100644
--- a/check_wav.c
+++ b/check_wav.c
@@ -2,8 +2,6 @@
 
 /** \file check_wav.c Detect and delete a wav header. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "string.h"
 #include "list.h"
diff --git a/chunk_queue.c b/chunk_queue.c
index 1f11359f..f9b6d83a 100644
--- a/chunk_queue.c
+++ b/chunk_queue.c
@@ -2,8 +2,6 @@
 
 /** \file chunk_queue.c Queuing functions for paraslash senders. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "list.h"
 #include "afh.h"
diff --git a/client.c b/client.c
index 14b98b76..1d5eabab 100644
--- a/client.c
+++ b/client.c
@@ -2,7 +2,6 @@
 
 /** \file client.c The client program used to connect to para_server. */
 
-#include <regex.h>
 #include <signal.h>
 #include <lopsub.h>
 
diff --git a/client_common.c b/client_common.c
index 396fd88c..4f0ea303 100644
--- a/client_common.c
+++ b/client_common.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/close_on_fork.c b/close_on_fork.c
index 809f027e..3732cf30 100644
--- a/close_on_fork.c
+++ b/close_on_fork.c
@@ -2,8 +2,6 @@
 
 /** \file close_on_fork.c Manage a list of fds that should be closed on fork. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "list.h"
 #include "string.h"
diff --git a/command.c b/command.c
index 5cdeb7b4..5120fa33 100644
--- a/command.c
+++ b/command.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <signal.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/compress_filter.c b/compress_filter.c
index 1bce35f5..0f17905e 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -6,7 +6,6 @@
  * Uses ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
  */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "filter_cmd.lsg.h"
diff --git a/crypt_common.c b/crypt_common.c
index 286ebe38..59c32ca8 100644
--- a/crypt_common.c
+++ b/crypt_common.c
@@ -2,8 +2,6 @@
 
 /** \file crypt_common.c Crypto functions independent of openssl/libgcrypt. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "string.h"
diff --git a/daemon.c b/daemon.c
index d8f598be..594dc1b0 100644
--- a/daemon.c
+++ b/daemon.c
@@ -2,7 +2,6 @@
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
 
-#include <regex.h>
 #include <pwd.h>
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
diff --git a/dccp_recv.c b/dccp_recv.c
index 0b20bcc8..1c0628fc 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -9,7 +9,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/dccp_send.c b/dccp_send.c
index 6182c964..ed495c6a 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -9,7 +9,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/exec.c b/exec.c
index 60496d53..01ad30b1 100644
--- a/exec.c
+++ b/exec.c
@@ -2,8 +2,6 @@
 
 /** \file exec.c Helper functions for spawning new processes. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "fd.h"
diff --git a/fd.c b/fd.c
index 1af902f9..1a71f45a 100644
--- a/fd.c
+++ b/fd.c
@@ -2,7 +2,6 @@
 
 /** \file fd.c Helper functions for file descriptor handling. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/mman.h>
diff --git a/fec.c b/fec.c
index 932e0693..b5df0c16 100644
--- a/fec.c
+++ b/fec.c
@@ -33,8 +33,6 @@
  * OF SUCH DAMAGE.
  */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
diff --git a/fecdec_filter.c b/fecdec_filter.c
index 375f4c0a..6bdd4e80 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -2,8 +2,6 @@
 
 /** \file fecdec_filter.c A filter that fec-decodes an audio stream. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "list.h"
diff --git a/file_write.c b/file_write.c
index ba902070..7fc0cd2e 100644
--- a/file_write.c
+++ b/file_write.c
@@ -2,7 +2,6 @@
 
 /** \file file_write.c simple output plugin for testing purposes */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/filter.c b/filter.c
index 50447ec0..34f83eb8 100644
--- a/filter.c
+++ b/filter.c
@@ -2,7 +2,6 @@
 
 /** \file filter.c The stand-alone filter program. */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "filter.lsg.h"
diff --git a/filter_common.c b/filter_common.c
index bcc79f55..2d2ef1eb 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -2,7 +2,6 @@
 
 /** \file filter_common.c Common helper functions for filter input/output. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/flac_afh.c b/flac_afh.c
index 2b5b6c1d..1d0b3bf4 100644
--- a/flac_afh.c
+++ b/flac_afh.c
@@ -2,7 +2,6 @@
 
 /** \file flac_afh.c Audio format handler for flac files. */
 
-#include <regex.h>
 #include <FLAC/stream_decoder.h>
 #include <FLAC/metadata.h>
 
diff --git a/flacdec_filter.c b/flacdec_filter.c
index bc3a678b..61f3aa73 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -2,7 +2,6 @@
 
 /** \file flacdec_filter.c The flac decoder. */
 
-#include <regex.h>
 #include <FLAC/stream_decoder.h>
 
 #include "para.h"
diff --git a/gcrypt.c b/gcrypt.c
index e5f64688..ce63c828 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -2,7 +2,6 @@
 
 /** \file gcrypt.c Libgrcypt-based encryption/decryption routines. */
 
-#include <regex.h>
 #include <gcrypt.h>
 
 #include "para.h"
diff --git a/grab_client.c b/grab_client.c
index 1019e579..daea22ff 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -2,7 +2,6 @@
 
 /** \file grab_client.c Functions for grabbing the audio stream. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/gui.c b/gui.c
index 56042ad2..704f50cb 100644
--- a/gui.c
+++ b/gui.c
@@ -2,7 +2,6 @@
 
 /** \file gui.c Curses-based interface for paraslash. */
 
-#include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <curses.h>
diff --git a/http_recv.c b/http_recv.c
index 8d2add19..9494b3ab 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -2,7 +2,6 @@
 
 /** \file http_recv.c paraslash's http receiver */
 
-#include <regex.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/http_send.c b/http_send.c
index 429b4662..faf2cfad 100644
--- a/http_send.c
+++ b/http_send.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/imdct.c b/imdct.c
index 2e1089f1..74b38402 100644
--- a/imdct.c
+++ b/imdct.c
@@ -15,7 +15,6 @@
  */
 
 #include <math.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/interactive.c b/interactive.c
index 3115d539..3f8b265d 100644
--- a/interactive.c
+++ b/interactive.c
@@ -4,7 +4,6 @@
 
 #include "para.h"
 
-#include <regex.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <sys/ioctl.h>
diff --git a/lsu.c b/lsu.c
index d1c4a4cb..4ce4fea8 100644
--- a/lsu.c
+++ b/lsu.c
@@ -3,7 +3,6 @@
 /** \file lsu.c Utilities related to the lopsub library. */
 
 #include <lopsub.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/mixer.c b/mixer.c
index 787a7257..92a0be07 100644
--- a/mixer.c
+++ b/mixer.c
@@ -2,7 +2,6 @@
 
 /** \file mixer.c A volume fader and alarm clock. */
 
-#include <regex.h>
 #include <lopsub.h>
 #include <math.h>
 
diff --git a/mood.c b/mood.c
index 2d0ed64f..0187bc4c 100644
--- a/mood.c
+++ b/mood.c
@@ -2,7 +2,6 @@
 
 /** \file mood.c Paraslash's mood handling functions. */
 
-#include <regex.h>
 #include <osl.h>
 #include <lopsub.h>
 
diff --git a/mp.c b/mp.c
index 09b9f720..94719e56 100644
--- a/mp.c
+++ b/mp.c
@@ -27,7 +27,6 @@
 
 #include "para.h"
 
-#include <regex.h>
 #include <fnmatch.h>
 #include <osl.h>
 #include <lopsub.h>
diff --git a/mp3_afh.c b/mp3_afh.c
index 0f2bb760..8a65c2ab 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -12,8 +12,6 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "afh.h"
diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index d4d4712f..63a199e9 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -3,7 +3,6 @@
 /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
 
 #include <mad.h>
-#include <regex.h>
 #include <lopsub.h>
 
 #include "filter_cmd.lsg.h"
diff --git a/mp4.c b/mp4.c
index fe9d4b37..665ebd2d 100644
--- a/mp4.c
+++ b/mp4.c
@@ -14,8 +14,6 @@
  * has been documented. See the git commit log for details.
  */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
diff --git a/net.c b/net.c
index 9b362442..a0650a23 100644
--- a/net.c
+++ b/net.c
@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <regex.h>
 
 #include "error.h"
 #include "net.h"
diff --git a/ogg_afh.c b/ogg_afh.c
index 5da339fe..c24d0f59 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -3,7 +3,6 @@
 /** \file ogg_afh.c Audio format handler for ogg/vorbis files. */
 
 #include <vorbis/codec.h>
-#include <regex.h>
 
 #include "para.h"
 #include "afh.h"
diff --git a/ogg_afh_common.c b/ogg_afh_common.c
index 0a27a4ac..8e863aa3 100644
--- a/ogg_afh_common.c
+++ b/ogg_afh_common.c
@@ -3,7 +3,6 @@
 /** \file ogg_afh_common.c Functions common to all ogg/ codecs. */
 
 #include <ogg/ogg.h>
-#include <regex.h>
 
 #include "para.h"
 #include "afh.h"
diff --git a/oggdec_filter.c b/oggdec_filter.c
index 91c18c48..e7f0f370 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -2,7 +2,6 @@
 
 /** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
 
-#include <regex.h>
 #include <vorbis/vorbisfile.h>
 
 #include "para.h"
diff --git a/openssl.c b/openssl.c
index a5a6a175..ba07f043 100644
--- a/openssl.c
+++ b/openssl.c
@@ -2,7 +2,6 @@
 
 /** \file openssl.c Openssl-based encryption/decryption routines. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <openssl/rand.h>
diff --git a/opus_afh.c b/opus_afh.c
index 0a291bb1..d47f3eaa 100644
--- a/opus_afh.c
+++ b/opus_afh.c
@@ -3,7 +3,6 @@
 /** \file opus_afh.c Audio format handler for ogg/opus files. */
 
 #include <ogg/ogg.h>
-#include <regex.h>
 
 #include "para.h"
 #include "afh.h"
diff --git a/opusdec_filter.c b/opusdec_filter.c
index 504ba0e8..12129435 100644
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -41,7 +41,6 @@
 #define __STDC_VERSION__ 0
 #endif
 
-#include <regex.h>
 #include <opus/opus.h>
 #include <opus/opus_multistream.h>
 #include <ogg/ogg.h>
diff --git a/oss_mix.c b/oss_mix.c
index 0814336f..f790d6f3 100644
--- a/oss_mix.c
+++ b/oss_mix.c
@@ -4,7 +4,6 @@
 
 #include <sys/soundcard.h>
 #include <sys/ioctl.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/oss_write.c b/oss_write.c
index 4ea85afa..47fa781c 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -2,7 +2,6 @@
 
 /** \file oss_write.c Paraslash's oss output plugin. */
 
-#include <regex.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include <lopsub.h>
diff --git a/para.h b/para.h
index 6f1565aa..d97ffd2b 100644
--- a/para.h
+++ b/para.h
@@ -21,6 +21,7 @@
 #include <inttypes.h>
 #include <sys/uio.h>
 #include <poll.h>
+#include <regex.h>
 
 #include "gcc-compat.h"
 
diff --git a/play.c b/play.c
index 359eb371..c38aded7 100644
--- a/play.c
+++ b/play.c
@@ -2,7 +2,6 @@
 
 /** \file play.c Paraslash's standalone player. */
 
-#include <regex.h>
 #include <signal.h>
 #include <lopsub.h>
 
diff --git a/playlist.c b/playlist.c
index 3df9bae2..3a7df149 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,6 +1,5 @@
 /* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
-#include <regex.h>
 #include <osl.h>
 #include <lopsub.h>
 
diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 28b71010..fc79facf 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -2,7 +2,6 @@
 
 /** \file prebuffer_filter.c Paraslash's prebuffering filter. */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "para.h"
diff --git a/recv.c b/recv.c
index 68417187..a2f73e4e 100644
--- a/recv.c
+++ b/recv.c
@@ -2,7 +2,6 @@
 
 /** \file recv.c the stand-alone audio stream receiver */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/recv_common.c b/recv_common.c
index 1939300a..1f741e12 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -2,7 +2,6 @@
 
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
-#include <regex.h>
 #include <inttypes.h>
 #include <lopsub.h>
 
diff --git a/resample_filter.c b/resample_filter.c
index 6d4599a8..cd7e6f3d 100644
--- a/resample_filter.c
+++ b/resample_filter.c
@@ -2,7 +2,6 @@
 
 /** \file resample_filter.c A sample rate converter based on libsamplerate. */
 
-#include <regex.h>
 #include <samplerate.h>
 #include <lopsub.h>
 
diff --git a/ringbuffer.c b/ringbuffer.c
index 0e706f0f..6733b6be 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -2,8 +2,6 @@
 
 /** \file ringbuffer.c Simple ringbuffer implementation */
 
-#include <regex.h>
-
 #include "para.h"
 #include "ringbuffer.h"
 #include "string.h"
diff --git a/sched.c b/sched.c
index 20822038..475dead5 100644
--- a/sched.c
+++ b/sched.c
@@ -2,7 +2,6 @@
 
 /** \file sched.c Paraslash's scheduling functions. */
 
-#include <regex.h>
 
 #include "para.h"
 #include "ipc.h"
diff --git a/score.c b/score.c
index c03e3472..26157f07 100644
--- a/score.c
+++ b/score.c
@@ -1,7 +1,6 @@
 /* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file score.c Scoring functions to determine the audio file streaming order. */
-#include <regex.h>
 #include <osl.h>
 #include <lopsub.h>
 
diff --git a/send_common.c b/send_common.c
index 8dc82e9c..324e4001 100644
--- a/send_common.c
+++ b/send_common.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <osl.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/server.c b/server.c
index ea9cc9c0..1c89fbfe 100644
--- a/server.c
+++ b/server.c
@@ -5,7 +5,6 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <signal.h>
-#include <regex.h>
 #include <osl.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
diff --git a/sideband.c b/sideband.c
index d4876234..ad9533fe 100644
--- a/sideband.c
+++ b/sideband.c
@@ -2,8 +2,6 @@
 
 /** \file sideband.c Implementation of the sideband API. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
diff --git a/signal.c b/signal.c
index d9a6aa37..7cf4bb9f 100644
--- a/signal.c
+++ b/signal.c
@@ -3,7 +3,6 @@
 
 #include <signal.h>
 #include <sys/types.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/spx_afh.c b/spx_afh.c
index cd3b7cde..2f404209 100644
--- a/spx_afh.c
+++ b/spx_afh.c
@@ -35,7 +35,6 @@
 /** \file spx_afh.c Audio format handler for ogg/speex files. */
 
 #include <ogg/ogg.h>
-#include <regex.h>
 #include <speex/speex.h>
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
diff --git a/spx_common.c b/spx_common.c
index b8eb9912..e7ef1e79 100644
--- a/spx_common.c
+++ b/spx_common.c
@@ -42,7 +42,6 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <regex.h>
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
diff --git a/spxdec_filter.c b/spxdec_filter.c
index ce72125e..d6009b6a 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -40,7 +40,6 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <regex.h>
 #include <ogg/ogg.h>
 #include <speex/speex.h>
 #include <speex/speex_header.h>
diff --git a/stat.c b/stat.c
index 43e7998a..1864ff1b 100644
--- a/stat.c
+++ b/stat.c
@@ -5,13 +5,10 @@
  *  and para_audiod.
  */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "string.h"
 
-
 /** The minimal length of a status item buffer. */
 #define MIN_STAT_ITEM_LEN 9 /* 5 + 2 + 2, e.g. '0005 00:\n' */
 
diff --git a/stdin.c b/stdin.c
index d025b949..04b2f201 100644
--- a/stdin.c
+++ b/stdin.c
@@ -2,8 +2,6 @@
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "list.h"
 #include "sched.h"
diff --git a/string.c b/string.c
index eee01aa2..83ad87e1 100644
--- a/string.c
+++ b/string.c
@@ -6,7 +6,6 @@
 
 #include <pwd.h>
 #include <sys/utsname.h> /* uname() */
-#include <regex.h>
 #include <langinfo.h>
 #include <wchar.h>
 #include <wctype.h>
diff --git a/sync_filter.c b/sync_filter.c
index 20db1b1d..b1c283db 100644
--- a/sync_filter.c
+++ b/sync_filter.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
diff --git a/udp_recv.c b/udp_recv.c
index f98a9664..5189abfe 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -2,7 +2,6 @@
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <netinet/in.h>
-#include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <sys/types.h>
diff --git a/udp_send.c b/udp_send.c
index fe001025..58d56bec 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -4,7 +4,6 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <regex.h>
 #include <sys/types.h>
 #include <netinet/udp.h>
 #include <net/if.h>
diff --git a/upgrade_db.c b/upgrade_db.c
index 487d46c0..1114592f 100644
--- a/upgrade_db.c
+++ b/upgrade_db.c
@@ -4,7 +4,6 @@
 
 #include <osl.h>
 #include <lopsub.h>
-#include <regex.h>
 
 #include "upgrade_db.lsg.h"
 #include "para.h"
diff --git a/user_list.c b/user_list.c
index 46770edf..6fb2a177 100644
--- a/user_list.c
+++ b/user_list.c
@@ -2,7 +2,6 @@
 
 /** \file user_list.c User handling for para_server. */
 
-#include <regex.h>
 #include <sys/types.h>
 
 #include "para.h"
diff --git a/vss.c b/vss.c
index f42e4282..036fb9fe 100644
--- a/vss.c
+++ b/vss.c
@@ -9,7 +9,6 @@
 
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <regex.h>
 #include <osl.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
diff --git a/wav_filter.c b/wav_filter.c
index de4a3e6a..1606cd47 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -2,8 +2,6 @@
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 
-#include <regex.h>
-
 #include "para.h"
 #include "error.h"
 #include "list.h"
diff --git a/wma_afh.c b/wma_afh.c
index 8bff7cfc..97f0df47 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -3,7 +3,6 @@
 /** \file wma_afh.c The audio format handler for WMA files. */
 
 #include <sys/types.h>
-#include <regex.h>
 #include <iconv.h>
 
 #include "para.h"
diff --git a/wmadec_filter.c b/wmadec_filter.c
index 5b3d9874..fdc7c894 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -15,7 +15,6 @@
  */
 
 #include <math.h>
-#include <regex.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/write.c b/write.c
index cb32d391..99f9acc9 100644
--- a/write.c
+++ b/write.c
@@ -2,7 +2,6 @@
 
 /** \file write.c Paraslash's standalone wav/raw player. */
 
-#include <regex.h>
 #include <sys/types.h>
 #include <lopsub.h>
 
diff --git a/write_common.c b/write_common.c
index 9a130905..fa03e358 100644
--- a/write_common.c
+++ b/write_common.c
@@ -2,7 +2,6 @@
 
 /** \file write_common.c common functions of para_audiod and para_write */
 
-#include <regex.h>
 #include <lopsub.h>
 
 #include "write_cmd.lsg.h"
-- 
2.39.5