diff --git a/headers/os/device/Joystick.h b/headers/os/device/Joystick.h
index c4564e252c..1c3baecddc 100644
--- a/headers/os/device/Joystick.h
+++ b/headers/os/device/Joystick.h
@@ -9,6 +9,10 @@
 #include <OS.h>
 #include <SupportDefs.h>
 
+#if DEBUG
+#include <stdio.h>
+#endif
+
 class BList;
 class BString;
 class _BJoystickTweaker;
diff --git a/headers/private/device/JoystickTweaker.h b/headers/private/device/JoystickTweaker.h
index 86fb334d46..f311c3ce89 100644
--- a/headers/private/device/JoystickTweaker.h
+++ b/headers/private/device/JoystickTweaker.h
@@ -11,6 +11,10 @@
 #include <List.h>
 #include <Entry.h>
 
+#if DEBUG
+#include <stdio.h>
+#endif
+
 #define DEVICEPATH "/dev/joystick/"
 #define JOYSTICKPATH "/boot/home/config/settings/joysticks/"
 
diff --git a/src/kits/device/JoystickTweaker.cpp b/src/kits/device/JoystickTweaker.cpp
index 76155d31f1..50bbc4e789 100644
--- a/src/kits/device/JoystickTweaker.cpp
+++ b/src/kits/device/JoystickTweaker.cpp
@@ -31,10 +31,10 @@ LOG(const char *fmt, ...)
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);
 	va_end(ap);
-	fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile);
+	fputs(buf, _BJoystickTweaker::sLogFile); fflush(_BJoystickTweaker::sLogFile);
 }
 #	define LOG_ERR(text...) LOG(text)
-FILE *BJoystick::sLogFile = NULL;
+FILE *_BJoystickTweaker::sLogFile = NULL;
 #else
 #	define LOG(text...)
 #	define LOG_ERR(text...) fprintf(stderr, text)
@@ -184,7 +184,7 @@ _BJoystickTweaker::_BuildFromJoystickDesc(char *string, _joystick_info* info)
 		str.RemoveFirst("num_sticks = ");
 		info->num_sticks = atoi(str.String());
 	} else {
-		LOG("Path = %s\n", str->String());
+		LOG("Path = %s\n", str.String());
 	}
 }