diff --git a/src/libmad/bit.c b/src/libmad/bit.c
index a39076e..d49c631 100644
--- a/src/libmad/bit.c
+++ b/src/libmad/bit.c
@@ -21,7 +21,7 @@
 
 #pragma GCC optimize ("O3")
 
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/libmad/frame.c b/src/libmad/frame.c
index 1facef8..19d3049 100644
--- a/src/libmad/frame.c
+++ b/src/libmad/frame.c
@@ -21,7 +21,7 @@
 
 #pragma GCC optimize ("O3")
 
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/libmad/huffman.c b/src/libmad/huffman.c
index 3387085..f6241fa 100644
--- a/src/libmad/huffman.c
+++ b/src/libmad/huffman.c
@@ -21,7 +21,7 @@
 
 #pragma GCC optimize ("O3")
 
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/libmad/layer3.c b/src/libmad/layer3.c
index 66ed7c2..95a26fe 100644
--- a/src/libmad/layer3.c
+++ b/src/libmad/layer3.c
@@ -21,7 +21,7 @@
 
 #pragma GCC optimize ("O3")
 
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/libmad/stream.c b/src/libmad/stream.c
index 837cd9e..c850367 100644
--- a/src/libmad/stream.c
+++ b/src/libmad/stream.c
@@ -21,7 +21,7 @@
 
 #pragma GCC optimize ("O3")
 
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/libmad/synth.c b/src/libmad/synth.c
index d694b5c..88ebbb0 100644
--- a/src/libmad/synth.c
+++ b/src/libmad/synth.c
@@ -22,7 +22,7 @@
 #pragma GCC optimize ("O3")
 
 #include <stddef.h>
-#include <pgmspace.h>
+#include <avr/pgmspace.h>
 #  include "config.h"
 
 # include "global.h"
diff --git a/src/mp3.h b/src/mp3.h
index de2ef2b..40681e7 100644
--- a/src/mp3.h
+++ b/src/mp3.h
@@ -4,7 +4,7 @@
 #include "Arduino.h"
 #include "libmad/config.h"
 #include "libmad/mad.h"
-#include "FS.h"
+#include "SD.h"
 #include "pcm.h"
 
 class mp3 {
diff --git a/src/wav.h b/src/wav.h
index ee4689d..342cb78 100644
--- a/src/wav.h
+++ b/src/wav.h
@@ -2,7 +2,7 @@
 #define MP3_H
 
 #include "Arduino.h"
-#include "FS.h"
+#include "SD.h"
 #include "pcm.h"
 
 class wav {