diff --git a/src/add-ons/kernel/file_systems/udf/CachedBlock.h b/src/add-ons/kernel/file_systems/udf/CachedBlock.h
index 34c69e0886..a85d99c930 100644
--- a/src/add-ons/kernel/file_systems/udf/CachedBlock.h
+++ b/src/add-ons/kernel/file_systems/udf/CachedBlock.h
@@ -15,12 +15,13 @@
 	Axel Dörfler, axeld@pinc-software.de
 */
 
+#include <fsproto.h>
+
 extern "C" {
 	#ifndef _IMPEXP_KERNEL
 	#	define _IMPEXP_KERNEL
 	#endif
 	
-	#include <fsproto.h>
 	#include "lock.h"
 	#include "cache.h"
 }
diff --git a/src/add-ons/kernel/file_systems/udf/Icb.h b/src/add-ons/kernel/file_systems/udf/Icb.h
index d89e661890..7789de2a0e 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.h
+++ b/src/add-ons/kernel/file_systems/udf/Icb.h
@@ -10,13 +10,10 @@
 /*! \file Icb.h
 */
 
-extern "C" {
-	#ifndef _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
-	#endif
-	
-	#include <fsproto.h>
-}
+#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
+#endif
+#include <fsproto.h>
 
 #include "kernel_cpp.h"
 #include "UdfDebug.h"
diff --git a/src/add-ons/kernel/file_systems/udf/Utils.h b/src/add-ons/kernel/file_systems/udf/Utils.h
index 6e8c00b46b..e8679be8bd 100644
--- a/src/add-ons/kernel/file_systems/udf/Utils.h
+++ b/src/add-ons/kernel/file_systems/udf/Utils.h
@@ -12,13 +12,10 @@
 	Miscellaneous Udf utility functions.
 */
 
-extern "C" {
-	#ifndef _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
-	#endif
-	
-	#include <fsproto.h>
-}
+#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
+#endif
+#include <fsproto.h>
 
 #include "UdfStructures.h"
 
diff --git a/src/add-ons/kernel/file_systems/udf/Volume.h b/src/add-ons/kernel/file_systems/udf/Volume.h
index 5cf9c6ccd8..6efa37e4c4 100644
--- a/src/add-ons/kernel/file_systems/udf/Volume.h
+++ b/src/add-ons/kernel/file_systems/udf/Volume.h
@@ -13,13 +13,10 @@
 */
 
 #include <KernelExport.h>
-extern "C" {
-	#ifndef _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
-	#endif
-	
-	#include <fsproto.h>
-}
+#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
+#endif
+#include <fsproto.h>
 
 #include "kernel_cpp.h"
 #include "UdfDebug.h"
diff --git a/src/add-ons/kernel/file_systems/udf/udf.cpp b/src/add-ons/kernel/file_systems/udf/udf.cpp
index f1da6cd11b..67c865f867 100644
--- a/src/add-ons/kernel/file_systems/udf/udf.cpp
+++ b/src/add-ons/kernel/file_systems/udf/udf.cpp
@@ -27,9 +27,7 @@
 #	define _IMPEXP_KERNEL
 #endif
 
-extern "C" {
-	#include <fsproto.h>
-}	// end extern "C"
+#include <fsproto.h>
 
 #if !_KERNEL_MODE
 #	define dprintf printf