diff --git a/Makefile b/Makefile
index 4707154..f7c5153 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,8 @@
 #
 #  Send feedback to <socketcan-users@lists.berlios.de>
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.4/can -fno-strict-aliasing
+CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
+	    -fno-strict-aliasing
 
 PROGRAMS = candump can-sniffer
 
diff --git a/can-sniffer.c b/can-sniffer.c
index d40f48c..7479ea3 100644
--- a/can-sniffer.c
+++ b/can-sniffer.c
@@ -62,9 +62,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
+
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
-#include "af_can.h"
-#include "bcm.h"
 #include "terminal.h"
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
diff --git a/candump.c b/candump.c
index aefa02a..a680d2a 100644
--- a/candump.c
+++ b/candump.c
@@ -60,9 +60,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
+
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
-#include "af_can.h"
-#include "raw.h"
 #include "terminal.h"
 
 #define USE_RECVFROM /* use read() or recvfrom() syscall */
@@ -87,7 +89,7 @@ const char anichar[MAXANI] = {'|', '/', '-', '\\', '|', '/', '-', '\\'};
 
 extern int optind, opterr, optopt;
 
-static int	running = 1;
+static volatile int running = 1;
 
 void print_usage(char *prg)
 {