commit - 51396f8f1c10506b558ce98aafb80aff4b2a95bd
commit + 259c314d142abd6f9295047c116235cfdd119563
blob - 12bd8128b4f803b414c5e5a5ed594d8a53be7953
blob + e879dcdd7368f694c2a7aa44bcf1bb9e78a7e087
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -18,7 +18,6 @@
  * Channel management
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,10 +28,8 @@
 #include "defines.h"
 #include "conn-func.h"
 
-#include "exp.h"
 #include "channel.h"
 
-#include "imp.h"
 #include "irc-write.h"
 #include "conf.h"
 #include "hash.h"
@@ -41,9 +38,6 @@
 #include "messages.h"
 #include "match.h"
 
-#include "exp.h"
-
-
 #define REMOVE_PART 0
 #define REMOVE_QUIT 1
 #define REMOVE_KICK 2
blob - d08f4c565001062d6f5e18b515644f9634c56769
blob + df444fec115c9e3052982df102d18d8cfdc027c4
--- src/ngircd/class.c
+++ src/ngircd/class.c
@@ -16,7 +16,6 @@
  * User class management.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
@@ -28,7 +27,6 @@
 #include "match.h"
 #include "stdio.h"
 
-#include "exp.h"
 #include "class.h"
 
 struct list_head My_Classes[CLASS_COUNT];
blob - b0da8073b112ad3f3f354a592296b0b75b7943da
blob + 42463b792aa54b1a6ca9520a6490003d92daa39f
--- src/ngircd/client-cap.c
+++ src/ngircd/client-cap.c
@@ -18,7 +18,6 @@
  * Functions to deal with IRC Capabilities
  */
 
-#include "imp.h"
 #include <assert.h>
 
 #include "defines.h"
@@ -26,7 +25,6 @@
 #include "client.h"
 #include "log.h"
 
-#include "exp.h"
 #include "client-cap.h"
 
 GLOBAL int
blob - bfb52e8f95ce091a2ac96faa63048fdddea67857
blob + befb779c663840bdb52df730d88e1a1fbca9b9c7
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -18,7 +18,6 @@
  * Client management.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -29,11 +28,8 @@
 
 #include "defines.h"
 #include "conn.h"
-
-#include "exp.h"
 #include "client.h"
 
-#include <imp.h>
 #include "ngircd.h"
 #include "channel.h"
 #include "conf.h"
@@ -44,8 +40,6 @@
 #include "match.h"
 #include "messages.h"
 
-#include <exp.h>
-
 #define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1
 
 static CLIENT *This_Server, *My_Clients;
blob - c4b219f807497d249c83ebe6dcd7af3c4571d2a3
blob + 90ba72d3cf6398b2ce6693cafbdfed54e54c5841
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -16,7 +16,6 @@
  * Configuration management (reading, parsing & validation)
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -45,7 +44,6 @@
 #include "match.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "conf.h"
 
 
blob - b827d02ae4d4abe78f67007be5411bd2f218e1f4
blob + c0710d8b07237e29202880b78c254a7128db636c
--- src/ngircd/conn-encoding.c
+++ src/ngircd/conn-encoding.c
@@ -20,7 +20,6 @@
  * Functions to deal with character encodings and conversions
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +28,6 @@
 #include "conn.h"
 #include "log.h"
 
-#include "exp.h"
 #include "conn-encoding.h"
 
 #ifdef ICONV
blob - 0ba0ff6c1915932c1cd09448b53b42bd6bc89cd7
blob + 758315894604f8cafecf1da2dbc6a88857fba437
--- src/ngircd/conn-func.c
+++ src/ngircd/conn-func.c
@@ -18,7 +18,6 @@
  * Connection management: Global functions
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include "log.h"
@@ -26,7 +25,6 @@
 #include "conn.h"
 #include "client.h"
 
-#include "exp.h"
 #include "conn-func.h"
 
 /**
blob - 493bcc75c66847e0ed50f118e805d3a81a58da4e
blob + cdb3e24db5ba4bd3f7b01d0b5ef97290578bb201
--- src/ngircd/conn-ssl.c
+++ src/ngircd/conn-ssl.c
@@ -10,7 +10,6 @@
  * SSL wrapper functions
  */
 
-#include "imp.h"
 #include "conf-ssl.h"
 
 #ifdef SSL_SUPPORT
@@ -29,7 +28,6 @@
 #include "conn-ssl.h"
 #include "log.h"
 
-#include "exp.h"
 #include "defines.h"
 
 extern struct SSLOptions Conf_SSLOptions;
blob - 0a3c17c89b5e07f90945ef245bb072edccb312b0
blob + f9dcb68a58dbc4abe8af898b8f5833e3b031e1a3
--- src/ngircd/conn-zip.c
+++ src/ngircd/conn-zip.c
@@ -23,7 +23,6 @@
 /* enable more zlib related debug messages: */
 /* #define DEBUG_ZLIB */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <zlib.h>
@@ -31,9 +30,8 @@
 #include "conn.h"
 #include "conn-func.h"
 #include "log.h"
-
 #include "array.h"
-#include "exp.h"
+
 #include "conn-zip.h"
 
 
blob - fad3435734a932f2018b430d71ce32e6dc5bc9b6
blob + 5ef28dc064f8bbcb09646d95237643fd3264429d
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -22,7 +22,6 @@
  * Connection management
  */
 
-#include "imp.h"
 #include <assert.h>
 #ifdef PROTOTYPES
 # include <stdarg.h>
@@ -54,10 +53,8 @@
 #include "array.h"
 #include "defines.h"
 
-#include "exp.h"
 #include "conn.h"
 
-#include "imp.h"
 #include "ngircd.h"
 #include "array.h"
 #include "client.h"
@@ -73,9 +70,6 @@
 #include "resolve.h"
 #include "tool.h"
 
-#include "exp.h"
-
-
 #define SERVER_WAIT (NONE - 1)
 
 #define MAX_COMMANDS 3
blob - 3c600384b6b2f034a2d3f3455ad07a20e21d639e
blob + 46d1a7b40f931bf16376bec15cef19e288a08d40
--- src/ngircd/hash.c
+++ src/ngircd/hash.c
@@ -16,14 +16,12 @@
  * Hash calculation
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
 #include "defines.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "hash.h"
 
 static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval));
blob - 42b0e4da9aa112b464d9754bb2f2632a5f41fedf
blob + c780921ea8e64742507fe221c05281452b9a62d3
--- src/ngircd/irc-cap.c
+++ src/ngircd/irc-cap.c
@@ -16,7 +16,6 @@
  * Handler for IRC capability ("CAP") commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
@@ -31,7 +30,6 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
 #include "irc-cap.h"
 
 /* Local functions */
blob - cab20c493bcb493f95bf3398528118a06f322874
blob + 4eee5046763d95ad96e354224e87cb6af07885a4
--- src/ngircd/irc-channel.c
+++ src/ngircd/irc-channel.c
@@ -16,7 +16,6 @@
  * IRC channel commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -37,7 +36,6 @@
 #include "irc-write.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "irc-channel.h"
 
 /**
blob - 97b518a063b7adbf124d3760faabaa6fc840c712
blob + dfc412bc9a107a1a9a682f8dcc4d1db980f8921f
--- src/ngircd/irc-encoding.c
+++ src/ngircd/irc-encoding.c
@@ -16,7 +16,6 @@
  * IRC encoding commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
@@ -28,7 +27,6 @@
 #include "parse.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "irc-encoding.h"
 
 #ifdef ICONV
blob - d367647f4ea7bfd67132d45323049f1a62c5ab66
blob + 6a4057292f42820547afb9d3a8ff5b01171eb676
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -16,7 +16,6 @@
  * IRC info commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -43,7 +42,6 @@
 #include "client-cap.h"
 #include "op.h"
 
-#include "exp.h"
 #include "irc-info.h"
 
 /* Local functions */
blob - b7fe5feda3339b9659012f7352563a8c2af3b8cf
blob + c8cff24d845debc3f4bdb415cfd74c36cb1231dc
--- src/ngircd/irc-login.c
+++ src/ngircd/irc-login.c
@@ -16,7 +16,6 @@
  * Login and logout
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -36,7 +35,6 @@
 #include "irc-macros.h"
 #include "irc-write.h"
 
-#include "exp.h"
 #include "irc-login.h"
 
 static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick,
blob - f7948e6a0d42cbabcdcd1f2a5e0db6731720884e
blob + 9a3a94b363fd59e76544c849c86af884b2773626
--- src/ngircd/irc-metadata.c
+++ src/ngircd/irc-metadata.c
@@ -18,7 +18,6 @@
  * IRC metadata commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -32,7 +31,6 @@
 #include "parse.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "irc-metadata.h"
 
 /**
blob - a59f085d7f6d4fb9434a07dc7266368bee0240b7
blob + b83c1eb49bc179119b278f75064737bc6f099b24
--- src/ngircd/irc-mode.c
+++ src/ngircd/irc-mode.c
@@ -16,7 +16,6 @@
  * IRC commands for mode changes (like MODE, AWAY, etc.)
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,7 +32,6 @@
 #include "messages.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "irc-mode.h"
 
 static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
blob - b08d739b84a0195dce311dc162c50221a5ba95f8
blob + 0934285ccf3d67751d6a3a5f17518d010ab29748
--- src/ngircd/irc-op.c
+++ src/ngircd/irc-op.c
@@ -16,7 +16,6 @@
  * Channel operator commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
 #include "irc-op.h"
 
 /* Local functions */
blob - 88a9e43ed4b1d3b17312bca597802663e7c06783
blob + 1a2150f175bfd6e009c641e61176f5b7f758a0db
--- src/ngircd/irc-oper.c
+++ src/ngircd/irc-oper.c
@@ -16,7 +16,6 @@
  * IRC operator commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +37,6 @@
 #include "messages.h"
 #include "op.h"
 
-#include <exp.h>
 #include "irc-oper.h"
 
 /**
blob - 7dbaba86a6bc20bc70d0d59b6db9969653b234b0
blob + fa1ca966aff877ae5d4fd3f46cd1ff9b84a61286
--- src/ngircd/irc-server.c
+++ src/ngircd/irc-server.c
@@ -16,7 +16,6 @@
  * IRC commands for server links
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +39,6 @@
 #include "irc-write.h"
 #include "op.h"
 
-#include "exp.h"
 #include "irc-server.h"
 
 /**
blob - 5503344d1aa58702e89b4197d29729d64d357743
blob + c6a3dce23c00b42a7363a0857c162502e4247dd3
--- src/ngircd/irc-write.c
+++ src/ngircd/irc-write.c
@@ -16,7 +16,6 @@
  * Sending IRC commands over the network
  */
 
-#include "imp.h"
 #include <assert.h>
 #ifdef PROTOTYPES
 #	include <stdarg.h>
@@ -30,7 +29,6 @@
 #include "conn-func.h"
 #include "channel.h"
 
-#include "exp.h"
 #include "irc-write.h"
 
 #define SEND_TO_USER 1
blob - d6a751a0d427edb091603ad62f54f3083de57ca7
blob + e99f42ff23633d06deaf5b10f4c4ffa46f824688
--- src/ngircd/irc.c
+++ src/ngircd/irc.c
@@ -16,7 +16,6 @@
  * IRC commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
@@ -36,7 +35,6 @@
 #include "op.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "irc.h"
 
 static char *Option_String PARAMS((CONN_ID Idx));
blob - b0accd41edb6476a6d85e27567618b65402906dd
blob + d3efb1f7386e746ecbad05979b9b84cf6a92b8ed
--- src/ngircd/lists.c
+++ src/ngircd/lists.c
@@ -16,7 +16,6 @@
  * Management of IRC lists: ban, invite, etc.
  */
 
-#include "imp.h"
 #include <assert.h>
 
 #include "defines.h"
@@ -31,7 +30,6 @@
 #include <string.h>
 #include <strings.h>
 
-#include "exp.h"
 #include "lists.h"
 
 struct list_elem {
blob - 32cf6cfd60b3da5783d481328c83c61d081d9de3
blob + cc819ad7533f26b88da5e1254502f506f3c3d9c9
--- src/ngircd/log.c
+++ src/ngircd/log.c
@@ -16,7 +16,6 @@
  * Logging functions
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #ifdef PROTOTYPES
@@ -40,7 +39,6 @@
 #include "irc-write.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "log.h"
 
 static bool Is_Daemon;
blob - 23c3b6848d94e540bc71f7a38ab504ff6bbb9ca8
blob + b3ab2ed3cf70138efb7326d7e9158bcf0b29e713
--- src/ngircd/login.c
+++ src/ngircd/login.c
@@ -16,7 +16,6 @@
  * Functions to deal with client logins
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,7 +40,6 @@
 #include "irc-mode.h"
 #include "irc-write.h"
 
-#include "exp.h"
 #include "login.h"
 
 #ifdef PAM
blob - 88872f0d9102353b83e79cc6274be451acc58f45
blob + f1a0875ebb3582b46b47fc2c75f388389878c19b
--- src/ngircd/match.c
+++ src/ngircd/match.c
@@ -16,11 +16,9 @@
  * Wildcard pattern matching
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
-#include "exp.h"
 #include "match.h"
 #include "defines.h"
 #include "tool.h"
blob - d87623309a134044bfee254429190b39a4f53f2f
blob + b266c534fc51567b7fd94faf3269d47d078f0687
--- src/ngircd/ngircd.c
+++ src/ngircd/ngircd.c
@@ -17,7 +17,6 @@
  * by the loader of the operating system.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -49,7 +48,6 @@
 #include "io.h"
 #include "irc.h"
 
-#include "exp.h"
 #include "ngircd.h"
 
 static void Show_Version PARAMS(( void ));
blob - c5bf4bd3c22f5a4a8367b1f9600f803221431642
blob + e1b160b374554b91c80d967f92b89d0f198bc88b
--- src/ngircd/numeric.c
+++ src/ngircd/numeric.c
@@ -16,7 +16,6 @@
  * Handlers for IRC numerics sent to the server
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,10 +34,8 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
 #include "numeric.h"
 
-
 /**
  * Announce a channel and its users in the network.
  */
blob - 6738d535111c8bc6e30e1968956cbc2ae068c099
blob + 66e9d5a2bfc31fa9eaceb6cbd4f00b088c753f57
--- src/ngircd/op.c
+++ src/ngircd/op.c
@@ -16,7 +16,6 @@
  * IRC operator functions
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
@@ -28,10 +27,8 @@
 #include "messages.h"
 #include "irc-write.h"
 
-#include <exp.h>
 #include "op.h"
 
-
 /**
  * Return and log a "no privileges" message.
  */
blob - 81d635c8685791186d7a58575335befe6c3aa113
blob + dd15052f008539ca4780d7d2a21dfb35b6e4cee1
--- src/ngircd/pam.c
+++ src/ngircd/pam.c
@@ -18,7 +18,6 @@
  * PAM User Authentication
  */
 
-#include "imp.h"
 #include <assert.h>
 
 #include "defines.h"
@@ -37,7 +36,6 @@
 #include <pam/pam_appl.h>
 #endif
 
-#include "exp.h"
 #include "pam.h"
 
 static char *password;
blob - fdb957c3efe0c52d881ff3cdffd6bf345e98de02
blob + fa91a9b1eb538ab289be6767d65223b1251aa3cf
--- src/ngircd/parse.c
+++ src/ngircd/parse.c
@@ -16,7 +16,6 @@
  * IRC command parser and validator.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -31,10 +30,8 @@
 #include "messages.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "parse.h"
 
-#include "imp.h"
 #include "irc.h"
 #include "irc-cap.h"
 #include "irc-channel.h"
@@ -49,7 +46,6 @@
 #include "irc-write.h"
 #include "numeric.h"
 
-#include "exp.h"
 #include "conf.h"
 
 struct _NUMERIC {
blob - a5afb5011cb1c468732561d5944fa9f685c1c4e4
blob + 4220f1ab16f9101550e40df8e351caa777545b21
--- src/ngircd/proc.c
+++ src/ngircd/proc.c
@@ -16,7 +16,6 @@
  * Process management
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
@@ -27,8 +26,6 @@
 #include "log.h"
 #include "io.h"
 #include "conn.h"
-
-#include "exp.h"
 #include "sighandlers.h"
 #include "proc.h"
 
blob - 01f730cc868a67458e7120cfc6d1e1485b9c4aa8
blob + d3c89f89ef1ce6810c9150c08c13a004978129ef
--- src/ngircd/resolve.c
+++ src/ngircd/resolve.c
@@ -18,7 +18,6 @@
  * Asynchronous resolver
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -42,11 +41,9 @@
 #include "log.h"
 #include "ng_ipaddr.h"
 
-#include "exp.h"
 #include "resolve.h"
 #include "io.h"
 
-
 static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd ));
 static void Do_ResolveName PARAMS(( const char *Host, int w_fd ));
 
blob - effef44d8fb8b391e1b222eb2eaabee296632e48
blob + a953d02b9d92013e99181c2303ca470ccf1869ea
--- src/ngircd/sighandlers.c
+++ src/ngircd/sighandlers.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "imp.h"
 #include "conn.h"
 #include "conf-ssl.h"
 #include "channel.h"
blob - 17edbdf21b09f087e1606fc73794522f811c9ef8
blob + c96380343e34fa33bed10f41041b678dc11c9153
--- src/portab/Makefile.ng
+++ src/portab/Makefile.ng
@@ -25,7 +25,7 @@ portabtest_LDFLAGS = -L.
 
 portabtest_LDADD = -lngportab
 
-noinst_HEADERS = imp.h exp.h portab.h splint.h
+noinst_HEADERS = portab.h splint.h
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in Makefile.am
blob - d678b99a3a6c96f93a1b54324594d22bc56d8c22 (mode 644)
blob + /dev/null
--- src/portab/exp.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- */
-
-/**
- * @file
- * "Export Header" which makes sure, that global functions are not "extern".
- */
-
-#undef GLOBAL
-#define GLOBAL
-
-/* -eof- */
blob - 68b5aeee91d3689451a577628877182600e7f89a (mode 644)
blob + /dev/null
--- src/portab/imp.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- */
-
-/**
- * @file
- * "Import Header" which makes sure that global functions are defined "extern".
- */
-
-#undef GLOBAL
-#define GLOBAL extern
-
-/* -eof- */
blob - 3602feecf25819a882b7655a6cfba88bf2600322
blob + d7f33f99701feaec7de9da8f5aad0ea2098a4e06
--- src/portab/portabtest.c
+++ src/portab/portabtest.c
@@ -16,14 +16,11 @@
  * Test program for portab.h and friends ;-)
  */
 
-#include "imp.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "exp.h"
-
 int allow_severity = 0, deny_severity = 0;
 
 static void
blob - 795af7262ab61bbedbb09f797a5d72947427537a
blob + adb19e7aa222b1ed9c38912f037fb6fab02d7fcf
--- src/portab/strdup.c
+++ src/portab/strdup.c
@@ -11,13 +11,10 @@
 
 #ifndef HAVE_STRDUP
 
-#include "imp.h"
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "exp.h"
-
 GLOBAL char *
 strdup(const char *s)
 {
blob - ce90a423ad19b7af2158ccad1463db6aa67a1c09
blob + a7f5e2f13486db785a28b4ec33f346c956fc5f6c
--- src/portab/strlcpy.c
+++ src/portab/strlcpy.c
@@ -22,13 +22,9 @@
  * <http://cvs.samba.org/cgi-bin/cvsweb/rsync/lib/compat.c>
  */
 
-#include "imp.h"
 #include <string.h>
 #include <sys/types.h>
 
-#include "exp.h"
-
-
 #ifndef HAVE_STRLCAT
 
 GLOBAL size_t
blob - 578f324cea9ec8830e19ff80863ca2d4752299d3
blob + d63b972867184da3e4137ab2cdead0fd31f7b909
--- src/portab/strndup.c
+++ src/portab/strndup.c
@@ -11,13 +11,10 @@
 
 #ifndef HAVE_STRNDUP
 
-#include "imp.h"
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "exp.h"
-
 GLOBAL char *
 strndup(const char *s, size_t maxlen)
 {
blob - 5846bd8fcac853db99958f4aee9a4406b3b09f46
blob + 921dd3d6c3980d72c897a69c1a70a0c64469967f
--- src/portab/waitpid.c
+++ src/portab/waitpid.c
@@ -12,13 +12,10 @@
 
 #ifndef HAVE_WAITPID
 
-#include "imp.h"
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "exp.h"
-
 GLOBAL int
 waitpid(pid, stat_loc, options)
 int pid, *stat_loc, options;
blob - 3b9cc255aed18141c38d6548804798bf396ff125
blob + 8fe6e05e9fa74d84b7675a29b7d9b3d0a3cba058
--- src/tool/tool.c
+++ src/tool/tool.c
@@ -16,7 +16,6 @@
  * Tool functions
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@
 #include <syslog.h>
 #endif
 
-#include "exp.h"
 #include "tool.h"