diff --git a/libaf/Makefile b/libaf/Makefile
index 6191912397..f7902f64db 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -38,7 +38,7 @@ endif
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -Wall $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
+CFLAGS  = $(OPTFLAGS) -I. -I.. -Wall $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
 
 ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_
diff --git a/libaf/af_export.c b/libaf/af_export.c
index c685cb10b4..c2eff53476 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <unistd.h>
-#include "../config.h"
+#include "config.h"
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/types.h>
diff --git a/libaf/af_format.c b/libaf/af_format.c
index 7877914539..e5b7cc900e 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -14,8 +14,8 @@
 #include <limits.h>
 
 #include "af.h"
-#include "../bswap.h"
-#include "../libvo/fastmemcpy.h"
+#include "bswap.h"
+#include "libvo/fastmemcpy.h"
 
 // Integer to float conversion through lrintf()
 #ifdef HAVE_LRINTF
diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c
index f78765af4f..5480724d00 100644
--- a/libaf/af_ladspa.c
+++ b/libaf/af_ladspa.c
@@ -76,7 +76,7 @@
 /* Local Includes */
 
 #include "af.h"
-#include "../help_mp.h"
+#include "help_mp.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c
index b271be2a72..0c92385c91 100644
--- a/libaf/af_lavcresample.c
+++ b/libaf/af_lavcresample.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
 #include "af.h"
 
 #ifdef USE_LIBAVCODEC
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index cd6ec92806..f2ddd873fc 100644
--- a/libaf/af_mp.h
+++ b/libaf/af_mp.h
@@ -2,9 +2,9 @@
 #ifndef __af_mp_h__
 #define __af_mp_h__
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 /* Set the initialization type from mplayers cpudetect */
 #ifdef AF_INIT_TYPE
diff --git a/libaf/af_sweep.c b/libaf/af_sweep.c
index 619ebf7868..11cfc54d84 100644
--- a/libaf/af_sweep.c
+++ b/libaf/af_sweep.c
@@ -7,7 +7,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 #include "af.h"
 
 typedef struct af_sweep_s{