3 files changed, 5 insertions, 14 deletions
diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp
index c15c6e03a2..a2d2cd58b3 100644
--- a/engines/sci/sfx/device/devices.cpp
+++ b/engines/sci/sfx/device/devices.cpp
@@ -23,11 +23,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-#include "../device.h"
-#include <stdio.h>
+#include "common/scummsys.h"
+#include "sci/sfx/device.h"
 
 #include "sci/tools.h"
 
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index 7e04883ffc..baa6572658 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -48,9 +48,7 @@ void print_tabs_id(int nr, songit_id_t id) {
 	fprintf(stderr, "[%08lx] ", id);
 }
 
-#ifndef HAVE_MEMCHR
-static void *
-memchr(void *_data, int c, int n) {
+static unsigned char *sci_memchr(void *_data, int c, int n) {
 	unsigned char *data = (unsigned char *) _data;
 
 	while (n && !(*data == c)) {
@@ -63,7 +61,6 @@ memchr(void *_data, int c, int n) {
 	else
 		return NULL;
 }
-#endif
 
 static void _common_init(base_song_iterator_t *self) {
 	self->fade.action = FADE_ACTION_NONE;
@@ -491,7 +488,7 @@ static int _sci0_get_pcm_data(sci0_song_iterator_t *self,
 
 	while ((tries--) && (offset < self->size) && (!found_it)) {
 		/* Search through the garbage manually */
-		unsigned char *fc = (unsigned char*)memchr(self->data + offset,
+		unsigned char *fc = sci_memchr(self->data + offset,
 		                    SCI0_END_OF_SONG,
 		                    self->size - offset);
 
diff --git a/engines/sci/sfx/seq/oss-adlib.cpp b/engines/sci/sfx/seq/oss-adlib.cpp
index 24f936e089..f1c7bbf1b9 100644
--- a/engines/sci/sfx/seq/oss-adlib.cpp
+++ b/engines/sci/sfx/seq/oss-adlib.cpp
@@ -23,10 +23,7 @@
  *
  */
 
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
+#include "common/scummsys.h"
 #include "../sequencer.h"
 
 #ifdef HAVE_SYS_SOUNDCARD_H