diff --git a/configure.ac b/configure.ac
index 7fc0fcbc..bb69cad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,6 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 
 AC_C_CONST
-AC_C_BIGENDIAN
 AC_INLINE
 
 # Check if system supports termios
@@ -179,6 +178,12 @@ if test $ccalign = "yes"; then
 	AC_DEFINE(CCALIGN, 1, [ Define if __attribute__((aligned(16))) works ])
 fi
 
+dnl ############## Types
+
+AC_TYPE_SIZE_T()
+AC_TYPE_SSIZE_T()
+AC_TYPE_OFF_T()
+
 dnl ############## Function Checks
 
 AC_FUNC_MMAP
diff --git a/src/Makefile.legacy b/src/Makefile.legacy
index 19a28c43..16f25017 100644
--- a/src/Makefile.legacy
+++ b/src/Makefile.legacy
@@ -455,7 +455,7 @@ solaris-gcc-nas:
 sunos:
 	$(MAKE) CC=gcc \
 		OBJECTS="decode.o dct64.o audio_sun.o" \
-		CFLAGS="$(CFLAGS) $(CPPFLAGS) -O2 -DOPT_GENERIC  -DSUNOS -DREAL_IS_FLOAT -DHAVE_MMAP \
+		CFLAGS="$(CFLAGS) $(CPPFLAGS) -O2 -DOPT_GENERIC -DSUNOS -DREAL_IS_FLOAT -DHAVE_MMAP -DHAVE_SYS_IOCTL_H -DHAVE_SUN_AUDIOIO_H \
 			-funroll-loops" \
 		mpg123-make
 
diff --git a/src/audio.c b/src/audio.c
index a0271174..0196c1f3 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -6,7 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
 #include "mpg123.h"
 
 void audio_info_struct_init(struct audio_info_struct *ai)
diff --git a/src/audio_aix.c b/src/audio_aix.c
index bb41cda8..a82070ce 100644
--- a/src/audio_aix.c
+++ b/src/audio_aix.c
@@ -6,15 +6,10 @@
 	initially written by Juergen Schoew and Tomas Oegren
 */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/audio.h>
 #include <stropts.h>
-#include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/src/audio_alib.c b/src/audio_alib.c
index e62104f3..f7f5da46 100644
--- a/src/audio_alib.c
+++ b/src/audio_alib.c
@@ -36,9 +36,8 @@
 
 /**************************************************************************/
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
+#include "mpg123.h"
+
 #include <fcntl.h>
 
 #include <sys/socket.h>
@@ -47,7 +46,6 @@
 #include <netinet/tcp.h>
 #include <errno.h>
 
-#include "mpg123.h"
 
 #include "Alib.h"		/* /opt/audio/include */
 #include "CUlib.h"		/* /opt/audio/include */
diff --git a/src/audio_alsa05.c b/src/audio_alsa05.c
index 32650a90..c3166028 100644
--- a/src/audio_alsa05.c
+++ b/src/audio_alsa05.c
@@ -15,7 +15,6 @@
 
 #include "mpg123.h"
 
-#include <stdlib.h>
 #include <ctype.h>
 #include <sys/asoundlib.h>
 
diff --git a/src/audio_coreaudio.c b/src/audio_coreaudio.c
index 95ca2808..c3fbc957 100644
--- a/src/audio_coreaudio.c
+++ b/src/audio_coreaudio.c
@@ -15,8 +15,6 @@
 #include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioToolbox.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #define FIFO_DURATION		(0.5f)
diff --git a/src/audio_hp.c b/src/audio_hp.c
index 43ed69cd..eb1f8171 100644
--- a/src/audio_hp.c
+++ b/src/audio_hp.c
@@ -6,18 +6,10 @@
 	initially written by Michael Hipp
 */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-
 #include "mpg123.h"
-
+#include <fcntl.h>
 #include <sys/audio.h>
 
-
-
 static int audio_set_rate(struct audio_info_struct *ai)
 {
   if(ai->rate >= 0)
diff --git a/src/audio_jack.c b/src/audio_jack.c
index 7863623f..44945b89 100644
--- a/src/audio_jack.c
+++ b/src/audio_jack.c
@@ -6,8 +6,6 @@
 	initially written by Nicholas J. Humfrey
 */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 
 #include <jack/jack.h>
diff --git a/src/audio_nas.c b/src/audio_nas.c
index ecd49700..addc5444 100644
--- a/src/audio_nas.c
+++ b/src/audio_nas.c
@@ -6,16 +6,11 @@
 	initially written by Martin Denn
 */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
+#include "mpg123.h"
 #include <fcntl.h>
-#include <stdlib.h>
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
 
-#include "mpg123.h"
-
 typedef struct
 {
     AuServer            *aud;
diff --git a/src/audio_oss.c b/src/audio_oss.c
index b438d77b..c3e9f445 100644
--- a/src/audio_oss.c
+++ b/src/audio_oss.c
@@ -6,12 +6,8 @@
 	initially written by Michael Hipp
 */
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <stdlib.h>
 
 #include "mpg123.h"
 
diff --git a/src/audio_portaudio.c b/src/audio_portaudio.c
index edda4600..d11b2d9c 100644
--- a/src/audio_portaudio.c
+++ b/src/audio_portaudio.c
@@ -6,8 +6,6 @@
 	initially written by Nicholas J. Humfrey
 */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 
 #include <portaudio.h>
diff --git a/src/audio_sdl.c b/src/audio_sdl.c
index bf8c27a7..336d47de 100644
--- a/src/audio_sdl.c
+++ b/src/audio_sdl.c
@@ -6,8 +6,6 @@
 	initially written by Nicholas J. Humfrey
 */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 
 #include <SDL.h>
diff --git a/src/audio_sgi.c b/src/audio_sgi.c
index b08081c7..f5789e32 100644
--- a/src/audio_sgi.c
+++ b/src/audio_sgi.c
@@ -6,13 +6,7 @@
 	initially written (as it seems) by Thomas Woerner
 */
 
-
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <stdlib.h>
 
 /* #include <audio.h> */
 #include <dmedia/audio.h>
diff --git a/src/audio_sun.c b/src/audio_sun.c
index 0c126b90..8385a08f 100644
--- a/src/audio_sun.c
+++ b/src/audio_sun.c
@@ -6,10 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <fcntl.h>
 
 #include "mpg123.h"
@@ -45,6 +41,9 @@ static void audio_set_format_helper(struct audio_info_struct *ai, audio_info_t *
     case -1:
     case AUDIO_FORMAT_SIGNED_16:
     default:
+#ifndef AUDIO_ENCODING_LINEAR	/* not supported */
+#define AUDIO_ENCODING_LINEAR 3
+#endif
       ainfo->play.encoding = AUDIO_ENCODING_LINEAR;
       ainfo->play.precision = 16;
       break;
@@ -159,7 +158,7 @@ int audio_open(struct audio_info_struct *ai)
   if(ai->fn < 0)
      return ai->fn;
 
-#ifdef SUNOS
+#if defined(SUNOS)  &&  defined(AUDIO_GETDEV)
   {
     int type;
     if(ioctl(ai->fn, AUDIO_GETDEV, &type) == -1)
@@ -193,8 +192,10 @@ int audio_open(struct audio_info_struct *ai)
     ainfo.play.port |= AUDIO_SPEAKER;
   if(ai->output & AUDIO_OUT_HEADPHONES)
     ainfo.play.port |= AUDIO_HEADPHONE;
+#ifdef AUDIO_LINE_OUT
   if(ai->output & AUDIO_OUT_LINE_OUT)
     ainfo.play.port |= AUDIO_LINE_OUT;
+#endif
 
   if(ai->gain != -1)
     ainfo.play.gain = ai->gain;
@@ -222,7 +223,7 @@ int audio_get_formats(struct audio_info_struct *ai)
   audio_info_t ainfo;
   int i,fmts=0;
 
-  for(i=0;i<4;i++) {
+  for(i=0;i<sizeof(tab)/sizeof(tab[0]);i++) {
     AUDIO_INITINFO(&ainfo);
     ainfo.play.encoding = tab[i][0];
     ainfo.play.precision = tab[i][1];
diff --git a/src/audio_win32.c b/src/audio_win32.c
index 859deecb..fa638719 100644
--- a/src/audio_win32.c
+++ b/src/audio_win32.c
@@ -6,10 +6,7 @@
 	initially written (as it seems) by Tony Million
 */
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <stdlib.h>
 
 #include "mpg123.h"
 
diff --git a/src/buffer.c b/src/buffer.c
index 2711c832..f61589af 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -14,7 +14,6 @@
 
 #ifndef NOXFERMEM
 
-#include <stdlib.h>
 #include <errno.h>
 
 int outburst = MAXOUTBURST;
diff --git a/src/common.c b/src/common.c
index e0d76810..77e4ee2e 100644
--- a/src/common.c
+++ b/src/common.c
@@ -7,16 +7,9 @@
 */
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <signal.h>
-
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <math.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 
 #include <fcntl.h>
 
@@ -995,11 +988,10 @@ debug2("bitrate index: %i (%i)", fr->bitrate_index, tabsel_123[fr->lsf][1][fr->b
 
 /* concurring to print_rheader... here for control_generic */
 const char* remote_header_help = "S <mpeg-version> <layer> <sampling freq> <mode(stereo/mono/...)> <mode_ext> <framesize> <stereo> <copyright> <error_protected> <emphasis> <bitrate> <extension> <vbr(0/1=yes/no)>";
-void make_remote_header(struct frame* fr, char *target)
+void print_remote_header(struct frame* fr)
 {
-	/* redundancy */
 	static char *modes[4] = {"Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel"};
-	snprintf(target, 1000, "S %s %d %ld %s %d %d %d %d %d %d %d %d %d",
+	generic_sendmsg("S %s %d %ld %s %d %d %d %d %d %d %d %d %d",
 		fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"),
 		fr->lay,
 		freqs[fr->sampling_frequency],
@@ -1015,24 +1007,6 @@ void make_remote_header(struct frame* fr, char *target)
 		vbr);
 }
 
-
-#ifdef MPG123_REMOTE
-void print_rheader(struct frame *fr)
-{
-	static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
-	static char *layers[4] = { "Unknown" , "I", "II", "III" };
-	static char *mpeg_type[2] = { "1.0" , "2.0" };
-
-	/* version, layer, freq, mode, channels, bitrate, BPF, VBR*/
-	fprintf(stderr,"@I %s %s %ld %s %d %d %d %i\n",
-			mpeg_type[fr->lsf],layers[fr->lay],freqs[fr->sampling_frequency],
-			modes[fr->mode],fr->stereo,
-			vbr == ABR ? abr_rate : tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index],
-			fr->framesize+4,
-			vbr);
-}
-#endif
-
 void print_header(struct frame *fr)
 {
 	static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
diff --git a/src/common.h b/src/common.h
index 45033e11..b319bd92 100644
--- a/src/common.h
+++ b/src/common.h
@@ -86,7 +86,8 @@ MPEG 2.5
 
 /* for control_generic */
 extern const char* remote_header_help;
-void make_remote_header(struct frame* fr, char *target);
+void print_remote_header(struct frame* fr);
+void generic_sendmsg (const char *fmt, ...);
 
 int position_info(struct frame* fr, unsigned long no, long buffsize, struct audio_info_struct* ai,
                    unsigned long* frames_left, double* current_seconds, double* seconds_left);
diff --git a/src/config.h.legacy b/src/config.h.legacy
index 84bb145f..3fe85fae 100644
--- a/src/config.h.legacy
+++ b/src/config.h.legacy
@@ -27,3 +27,12 @@
 #endif
 
 #define INDEX_SIZE 1000
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
diff --git a/src/control_generic.c b/src/control_generic.c
index 69d70596..4066692b 100644
--- a/src/control_generic.c
+++ b/src/control_generic.c
@@ -7,18 +7,14 @@
 	reworked by Thomas Orgis - it was the entry point for eventually becoming maintainer...
 */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #ifndef WIN32
 #include <sys/wait.h>
 #include <sys/socket.h>
 #else
 #include <winsock.h>
 #endif
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
@@ -164,9 +160,7 @@ int control_generic (struct frame *fr)
 					generic_sendmsg("P 0");
 				}
 				if (init) {
-					static char tmp[1000];
-					make_remote_header(fr, tmp);
-					generic_sendmsg(tmp);
+					print_remote_header(fr);
 					init = 0;
 				}
 				if(!frame_before && (silent == 0))
diff --git a/src/decode.c b/src/decode.c
index 1fe45c46..bb09057e 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -6,7 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/decode_2to1.c b/src/decode_2to1.c
index 99af55f5..be0ae4fe 100644
--- a/src/decode_2to1.c
+++ b/src/decode_2to1.c
@@ -6,7 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/decode_4to1.c b/src/decode_4to1.c
index 57199609..bb0b7dee 100644
--- a/src/decode_4to1.c
+++ b/src/decode_4to1.c
@@ -9,7 +9,6 @@
 	absolutely not optimized for this operation
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/decode_altivec.c b/src/decode_altivec.c
index 124a7ce5..bb2e017b 100644
--- a/src/decode_altivec.c
+++ b/src/decode_altivec.c
@@ -7,7 +7,6 @@
 	altivec optimization by tmkk
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/decode_i386.c b/src/decode_i386.c
index 77370571..af6c453c 100644
--- a/src/decode_i386.c
+++ b/src/decode_i386.c
@@ -11,7 +11,6 @@
 	even for Intel processors.
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/decode_i486.c b/src/decode_i486.c
index 03aa22f7..9a325e1a 100644
--- a/src/decode_i486.c
+++ b/src/decode_i486.c
@@ -20,8 +20,6 @@
  * (c) 1998 Fabrice Bellard 
  */
 
-#include <stdlib.h>
-
 #include "mpg123.h"
 
 #define FIR_SIZE 16
diff --git a/src/decode_ntom.c b/src/decode_ntom.c
index 7e0a507b..c333611a 100644
--- a/src/decode_ntom.c
+++ b/src/decode_ntom.c
@@ -6,7 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/httpget.c b/src/httpget.c
index 550d0014..e9e57f01 100644
--- a/src/httpget.c
+++ b/src/httpget.c
@@ -26,37 +26,26 @@
 	Funny aspect there is that shoutcast servers do not do HTTP/1.1 chunked transfer but implement some different chunking themselves...
 */
 
-#include <stdlib.h>
+#include "mpg123.h"
+
 /* That _is_ real now */
 #define ACCEPT_HEAD "Accept: audio/mpeg, audio/x-mpeg, audio/x-mpegurl, audio/x-scpls, application/pls, */*\r\n"
 char *proxyurl = NULL;
 
 #if !defined(WIN32) && !defined(GENERIC)
 
-#include <stdio.h>
 #include <string.h>
 
-/* for SIZE_MAX */
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifndef SIZE_MAX
-/* hm, is this portable across preprocessors? */
-#define SIZE_MAX ((size_t)-1)
-#endif
-
 #define HTTP_MAX_RELOCATIONS 20
 
 #include <netdb.h>
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <ctype.h>
 
-#include "mpg123.h"
 #include "stringbuf.h"
 #include "icy.h"
 
@@ -634,7 +623,7 @@ int http_open (char* url, char** content_type)
 				if(purl_size < needed_length)
 				{
 					purl_size = needed_length;
-					purl = realloc(purl, purl_size);
+					purl = safe_realloc(purl, purl_size);
 					if(purl == NULL)
 					{
 						http_failure;
diff --git a/src/id3.c b/src/id3.c
index 809348b0..e45bd917 100644
--- a/src/id3.c
+++ b/src/id3.c
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include "mpg123.h"
 #include "common.h"
 #include "stringbuf.h"
diff --git a/src/layer3.c b/src/layer3.c
index 8fd07a3e..745ef984 100644
--- a/src/layer3.c
+++ b/src/layer3.c
@@ -11,7 +11,6 @@
 	The int-vs-pointer situation has to be cleaned up.
 */
 
-#include <stdlib.h>
 #include "mpg123.h"
 #include "huffman.h"
 
diff --git a/src/mpg123.c b/src/mpg123.c
index 43e96720..285a3a97 100644
--- a/src/mpg123.c
+++ b/src/mpg123.c
@@ -9,7 +9,6 @@
 #define ME "main"
 #include "mpg123.h"
 
-#include <stdlib.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
@@ -125,6 +124,13 @@ static int intflag = FALSE;
 
 int OutputDescriptor;
 
+/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
+void *safe_realloc(void *ptr, size_t size)
+{
+	if(ptr == NULL) return malloc(size);
+	else return realloc(ptr, size);
+}
+
 #if !defined(WIN32) && !defined(GENERIC)
 #ifndef NOXFERMEM
 static void catch_child(void)
diff --git a/src/mpg123.h b/src/mpg123.h
index 52c756ed..417264a9 100644
--- a/src/mpg123.h
+++ b/src/mpg123.h
@@ -9,13 +9,18 @@
 	used source: musicout.h from mpegaudio package
 */
 
+#ifndef _MPG123_H_
+#define _MPG123_H_
+
 /* everyone needs it */
 #include "config.h"
 #include "debug.h"
 
+#include        <stdlib.h>
 #include        <stdio.h>
 #include        <string.h>
 #include        <signal.h>
+#include        <math.h>
 
 #ifndef WIN32
 #include        <sys/signal.h>
@@ -23,17 +28,21 @@
 #endif
 /* want to suport large files in future */
 #ifdef HAVE_SYS_TYPES_H
-	#include <sys/types.h>
+#include <sys/types.h>
 #endif
-#ifndef off_t
-	#define off_t long
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+/* for SIZE_MAX */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 #endif
-#include        <math.h>
 
-
-
-#ifndef _AUDIO_H_
-#define _AUDIO_H_
+#ifndef SIZE_MAX
+/* hm, is this portable across preprocessors? */
+#define SIZE_MAX ((size_t)-1)
+#endif
 
 typedef unsigned char byte;
 
@@ -436,4 +445,6 @@ extern scale_t outscale;
 
 #include "optimize.h"
 
+void *safe_realloc(void *ptr, size_t size);
+
 #endif
diff --git a/src/playlist.c b/src/playlist.c
index 6f20ef43..1b26ed81 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -493,7 +493,7 @@ int add_to_playlist(char* new_entry, char freeit)
 	{
 		struct listitem* tmp = NULL;
 		/* enlarge the list */
-		tmp = (struct listitem*) realloc(pl.list, (pl.size + pl.alloc_step) * sizeof(struct listitem));
+		tmp = (struct listitem*) safe_realloc(pl.list, (pl.size + pl.alloc_step) * sizeof(struct listitem));
 		if(!tmp)
 		{
 			error("unable to allocate more memory for playlist");
diff --git a/src/readers.c b/src/readers.c
index ab94016e..1a14837d 100644
--- a/src/readers.c
+++ b/src/readers.c
@@ -6,13 +6,10 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
-
-#include <sys/types.h>
+#include "mpg123.h"
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "mpg123.h"
 #include "buffer.h"
 #include "common.h"
 #include "icy.h"
diff --git a/src/stringbuf.c b/src/stringbuf.c
index 4e50a9b2..fc371558 100644
--- a/src/stringbuf.c
+++ b/src/stringbuf.c
@@ -1,7 +1,7 @@
 /*
 	stringbuf: mimicking a bit of C++ to more safely handle strings
 
-	copyright 2006 by the mpg123 project - free software under the terms of the LGPL 2.1
+	copyright 2006-7 by the mpg123 project - free software under the terms of the LGPL 2.1
 	see COPYING and AUTHORS files in distribution or http://mpg123.org
 	initially written by Thomas Orgis
 */
@@ -9,7 +9,7 @@
 #include "config.h"
 #include "debug.h"
 #include "stringbuf.h"
-#include <stdlib.h>
+#include "mpg123.h" /* actually just for safe_realloc */
 
 void init_stringbuf(struct stringbuf* sb)
 {
@@ -34,7 +34,7 @@ int resize_stringbuf(struct stringbuf* sb, size_t new)
 	{
 		char* t;
 		debug("really!");
-		t = (char*) realloc(sb->p, new*sizeof(char));
+		t = (char*) safe_realloc(sb->p, new*sizeof(char));
 		debug1("realloc returned %p", (void*) t); 
 		if(t != NULL)
 		{
diff --git a/src/system.c b/src/system.c
index d69b55da..a83ba97f 100644
--- a/src/system.c
+++ b/src/system.c
@@ -14,7 +14,6 @@
 	./system < my_system_stream.mpg | mpg123 -
 */
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/src/tabinit.c b/src/tabinit.c
index e7bd1540..fddf4c0f 100644
--- a/src/tabinit.c
+++ b/src/tabinit.c
@@ -6,8 +6,6 @@
 	initially written by Michael Hipp
 */
 
-#include <stdlib.h>
-
 #include "mpg123.h"
 
 static unsigned char *conv16to8_buf = NULL;
diff --git a/src/term.c b/src/term.c
index 91918a96..67985589 100644
--- a/src/term.c
+++ b/src/term.c
@@ -11,10 +11,8 @@
 #ifdef HAVE_TERMIOS
 
 #include <termios.h>
-#include <unistd.h>
 #include <ctype.h>
 #include <sys/time.h>
-#include <sys/types.h>
 
 #include "buffer.h"
 #include "term.h"
diff --git a/src/wav.c b/src/wav.c
index b04dcd75..42d1829f 100644
--- a/src/wav.c
+++ b/src/wav.c
@@ -14,8 +14,6 @@
 	It's not a very clean code ... Fix this!
 */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include "mpg123.h"
 
 #ifdef FLOATOUT
diff --git a/src/xfermem.c b/src/xfermem.c
index 9c4242d0..f97ef583 100644
--- a/src/xfermem.c
+++ b/src/xfermem.c
@@ -12,12 +12,9 @@
 
 #ifndef NOXFERMEM
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "mpg123.h"
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/mman.h>
@@ -28,7 +25,6 @@
 #include <sys/select.h>
 #endif
 
-#include "mpg123.h"
 
 #ifndef HAVE_MMAP
 #include <sys/ipc.h>