diff --git a/apps/plugins/pdbox/PDa/extra/bandpass.c b/apps/plugins/pdbox/PDa/extra/bandpass.c
index 09bbbac..5e4a80a 100644
--- a/apps/plugins/pdbox/PDa/extra/bandpass.c
+++ b/apps/plugins/pdbox/PDa/extra/bandpass.c
@@ -15,7 +15,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/equalizer.c b/apps/plugins/pdbox/PDa/extra/equalizer.c
index d252e02..ee88942 100644
--- a/apps/plugins/pdbox/PDa/extra/equalizer.c
+++ b/apps/plugins/pdbox/PDa/extra/equalizer.c
@@ -14,7 +14,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/filters.h b/apps/plugins/pdbox/PDa/extra/filters.h
index 2eaf2b0..cce1401 100644
--- a/apps/plugins/pdbox/PDa/extra/filters.h
+++ b/apps/plugins/pdbox/PDa/extra/filters.h
@@ -12,7 +12,7 @@
#define __GGEE_FILTERS_H__

#ifdef ROCKBOX
-#include "math.h"
+#include "../../math.h"
#else
#include <math.h>
#endif
diff --git a/apps/plugins/pdbox/PDa/extra/highpass.c b/apps/plugins/pdbox/PDa/extra/highpass.c
index 486d101..c1b5723 100644
--- a/apps/plugins/pdbox/PDa/extra/highpass.c
+++ b/apps/plugins/pdbox/PDa/extra/highpass.c
@@ -15,7 +15,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/highshelf.c b/apps/plugins/pdbox/PDa/extra/highshelf.c
index 1be763e..c252bd6 100644
--- a/apps/plugins/pdbox/PDa/extra/highshelf.c
+++ b/apps/plugins/pdbox/PDa/extra/highshelf.c
@@ -14,7 +14,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/hlshelf.c b/apps/plugins/pdbox/PDa/extra/hlshelf.c
index 61ec3a8..fd91125 100644
--- a/apps/plugins/pdbox/PDa/extra/hlshelf.c
+++ b/apps/plugins/pdbox/PDa/extra/hlshelf.c
@@ -5,7 +5,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
#include <math.h>
diff --git a/apps/plugins/pdbox/PDa/extra/lowpass.c b/apps/plugins/pdbox/PDa/extra/lowpass.c
index e88f00b..3c2bbb0 100644
--- a/apps/plugins/pdbox/PDa/extra/lowpass.c
+++ b/apps/plugins/pdbox/PDa/extra/lowpass.c
@@ -14,7 +14,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/lowshelf.c b/apps/plugins/pdbox/PDa/extra/lowshelf.c
index 3722f8c..03a0259 100644
--- a/apps/plugins/pdbox/PDa/extra/lowshelf.c
+++ b/apps/plugins/pdbox/PDa/extra/lowshelf.c
@@ -14,7 +14,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/extra/notch.c b/apps/plugins/pdbox/PDa/extra/notch.c
index 90b9ace..c2b7276 100644
--- a/apps/plugins/pdbox/PDa/extra/notch.c
+++ b/apps/plugins/pdbox/PDa/extra/notch.c
@@ -14,7 +14,7 @@
#include "plugin.h"
#include "../../pdbox.h"
#include "../src/m_pd.h"
-#include "math.h"
+#include "../../math.h"
#include "filters.h"
#else /* ROCKBOX */
#include "../src/m_pd.h"
diff --git a/apps/plugins/pdbox/PDa/src/x_acoustics.c b/apps/plugins/pdbox/PDa/src/x_acoustics.c
index 7559426..1bb62bf 100644
--- a/apps/plugins/pdbox/PDa/src/x_acoustics.c
+++ b/apps/plugins/pdbox/PDa/src/x_acoustics.c
@@ -11,7 +11,7 @@
#endif

#include "m_pd.h"
-#include <math.h>
+#include "../../math.h"
#define LOGTEN 2.302585092994

float mtof(float f)
diff --git a/apps/plugins/pdbox/PDa/src/x_arithmetic.c b/apps/plugins/pdbox/PDa/src/x_arithmetic.c
index c3930b1..3512480 100644
--- a/apps/plugins/pdbox/PDa/src/x_arithmetic.c
+++ b/apps/plugins/pdbox/PDa/src/x_arithmetic.c
@@ -12,7 +12,7 @@ inputs to int and their outputs back to float. */
#endif

#include "m_pd.h"
-#include <math.h>
+#include "../../math.h"


/* MSW and OSX don't appear to have single-precision ANSI math */
diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h
index ddc6ed2..89a67b4 100644
--- a/apps/plugins/pdbox/pdbox.h
+++ b/apps/plugins/pdbox/pdbox.h
@@ -170,7 +170,7 @@ void pd_init(void);

//#ifndef SIMULATOR
/*FIXME: is it a correct replacement??? */
-#if !(CONFIG_PLATFORM & PLATFORM_HOSTED)
+//#if !(CONFIG_PLATFORM & PLATFORM_HOSTED)
#define floor rb_floor
#define atof rb_atof
#define atol rb_atol
@@ -186,9 +186,9 @@ void pd_init(void);
#define atan2 rb_atan2
#define sinh rb_sinh
#define tan rb_tan
-#else
-#include <math.h>
-#endif
+//#else
+//#include <math.h>
+//#endif

#define ftoan rb_ftoan
#undef strtok_r