--- PromyLOPh-pianobar-ec13167.orig/Makefile  Wed Dec 15 18:46:18 2010
+++ PromyLOPh-pianobar-ec13167/Makefile       Wed Dec 15 23:05:48 2010
@@ -1,6 +1,6 @@
 # makefile of pianobar
 
-PREFIX:=/usr/local
+PREFIX:=/usr
 BINDIR:=${PREFIX}/bin
 LIBDIR:=${PREFIX}/lib
 MANDIR:=${PREFIX}/share/man
--- PromyLOPh-pianobar-ec13167.orig/src/main.c  Wed Dec 15 18:46:18 2010
+++ PromyLOPh-pianobar-ec13167/src/main.c       Wed Dec 15 23:05:48 2010
@@ -21,9 +21,6 @@
 THE SOFTWARE.
 */

-#define _POSIX_C_SOURCE 1 /* fileno() */
-#define _BSD_SOURCE /* strdup() */
-
 /* system includes */
 #include <stdlib.h>
 #include <string.h>
--- PromyLOPh-pianobar-ec13167.orig/src/terminal.c	Thu Dec 16 02:21:08 2010
+++ PromyLOPh-pianobar-ec13167/src/terminal.c	Thu Dec 16 02:21:27 2010
@@ -21,10 +21,7 @@
 THE SOFTWARE.
 */

-#define _POSIX_C_SOURCE 1 /* fileno() */
-#define _BSD_SOURCE /* setlinebuf() */
-
-#include <termios.h>
+#include <sys/termios.h>
 #include <stdio.h>
 
 /*	en/disable echoing for stdin
--- PromyLOPh-pianobar-ec13167.orig/src/ui.c      Thu Dec 16 02:21:08 2010
+++ PromyLOPh-pianobar-ec13167/src/ui.c   Thu Dec 16 02:21:27 2010
@@ -23,9 +23,6 @@

 /* everything that interacts with the user */

-#define _POSIX_C_SOURCE 1 /* fileno() */
-#define _BSD_SOURCE /* strdup() */
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
--- PromyLOPh-pianobar-ec13167.orig/libwaitress/src/waitress.c     Thu Dec 16 02:40:51 2010
+++ PromyLOPh-pianobar-ec13167/libwaitress/src/waitress.c  Thu Dec 16 02:41:04 2010
@@ -21,9 +21,6 @@
 THE SOFTWARE.
 */

-#define _POSIX_C_SOURCE 1 /* required by getaddrinfo() */
-#define _BSD_SOURCE /* snprintf() */
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>