diff --git a/rbutil/ipodpatcher/ipodpatcher.h b/rbutil/ipodpatcher/ipodpatcher.h
index 0d9222268f..91a28ecea9 100644
--- a/rbutil/ipodpatcher/ipodpatcher.h
+++ b/rbutil/ipodpatcher/ipodpatcher.h
@@ -20,6 +20,10 @@
 #ifndef _IPODPATCHER_H
 #define _IPODPATCHER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "ipodio.h"
 
 /* Size of buffer for disk I/O - 8MB is large enough for any version
@@ -51,4 +55,8 @@ int read_aupd(struct ipod_t* ipod, char* filename);
 int write_aupd(struct ipod_t* ipod, char* filename);
 off_t filesize(int fd);
 
+#ifdef __cplusplus
+}
 #endif
+#endif
+
diff --git a/rbutil/rbutilqt/autodetection.h b/rbutil/rbutilqt/autodetection.h
index ed0ba99bf8..e960305ea6 100644
--- a/rbutil/rbutilqt/autodetection.h
+++ b/rbutil/rbutilqt/autodetection.h
@@ -24,11 +24,8 @@
 #include <QtCore>
 #include "rbsettings.h"
 
-extern "C" {
-    // Ipodpatcher
 #include "../ipodpatcher/ipodpatcher.h"
 #include "../sansapatcher/sansapatcher.h"
-};
 
 class Autodetection :public QObject
 {
@@ -36,9 +33,9 @@ class Autodetection :public QObject
 
 public:
     Autodetection(QObject* parent=0);
-    
+
     void setSettings(RbSettings* sett) {settings = sett;}
-        
+
     bool detect();
 
     QString getDevice() {return m_device;}
diff --git a/rbutil/rbutilqt/encoders.h b/rbutil/rbutilqt/encoders.h
index b5460de3ab..160041b4ac 100644
--- a/rbutil/rbutilqt/encoders.h
+++ b/rbutil/rbutilqt/encoders.h
@@ -24,10 +24,7 @@
  
 #include "rbsettings.h"
 
-extern "C"
-{
-    #include "rbspeex.h"
-}
+#include "rbspeex.h"
 
 
 class EncBase : public QObject
diff --git a/rbutil/rbutilqt/installbootloader.h b/rbutil/rbutilqt/installbootloader.h
index a026a35fad..727b8bfbe7 100644
--- a/rbutil/rbutilqt/installbootloader.h
+++ b/rbutil/rbutilqt/installbootloader.h
@@ -30,11 +30,8 @@
 #include "httpget.h"
 #include "irivertools/irivertools.h"
 
-extern "C" {
-    // Ipodpatcher
-    #include "../ipodpatcher/ipodpatcher.h"
-    #include "../sansapatcher/sansapatcher.h"
-};
+#include "../ipodpatcher/ipodpatcher.h"
+#include "../sansapatcher/sansapatcher.h"
 
 bool initIpodpatcher();
 bool initSansapatcher();
diff --git a/rbutil/rbutilqt/voicefile.h b/rbutil/rbutilqt/voicefile.h
index 611203a134..b5d2a27767 100644
--- a/rbutil/rbutilqt/voicefile.h
+++ b/rbutil/rbutilqt/voicefile.h
@@ -29,18 +29,15 @@
 #include "httpget.h"
 #include "rbsettings.h"
 
-extern "C"
-{
-    #include "wavtrim.h"
-    #include "voicefont.h"
-}
-    
+#include "wavtrim.h"
+#include "voicefont.h"
+
 class VoiceFileCreator :public QObject
 {
     Q_OBJECT
 public:
     VoiceFileCreator(QObject* parent=0);
-    
+
     //start creation
     bool createVoiceFile(ProgressloggerInterface* logger);
 
diff --git a/rbutil/sansapatcher/sansapatcher.h b/rbutil/sansapatcher/sansapatcher.h
index 7f113ec083..d082e6b08b 100644
--- a/rbutil/sansapatcher/sansapatcher.h
+++ b/rbutil/sansapatcher/sansapatcher.h
@@ -20,6 +20,10 @@
 #ifndef _SANSAPATCHER_H
 #define _SANSAPATCHER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sansaio.h"
 
 /* Size of buffer for disk I/O - 8MB is large enough for any version
@@ -40,4 +44,8 @@ int sansa_update_of(struct sansa_t* sansa,char* filename);
 int sansa_update_ppbl(struct sansa_t* sansa,char* filename);
 void sansa_list_images(struct sansa_t* sansa);
 
+#ifdef __cplusplus
+}
 #endif
+#endif
+
diff --git a/tools/rbspeex/rbspeex.h b/tools/rbspeex/rbspeex.h
index 00d045c74a..2c5cb297fd 100644
--- a/tools/rbspeex/rbspeex.h
+++ b/tools/rbspeex/rbspeex.h
@@ -21,6 +21,10 @@
 
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 unsigned int get_long_le(unsigned char *p);
 bool get_wave_metadata(FILE *fd, int *numchan, int *bps, int *sr, int *numsamples);
 bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
@@ -29,6 +33,8 @@ bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
 void put_ushort_le(unsigned short x, unsigned char *out);
 void put_uint_le(unsigned int x, unsigned char *out);
 
-
+#ifdef __cplusplus
+}
+#endif
 #endif
 
diff --git a/tools/voicefont.h b/tools/voicefont.h
index 9db6bcaf39..1f9c7fc326 100644
--- a/tools/voicefont.h
+++ b/tools/voicefont.h
@@ -27,7 +27,15 @@
 
 #include <stdio.h>
 #include <stdlib.h>
- 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int voicefont(FILE* voicefontids,int targetnum,char* filedir, FILE* output);
 
+#ifdef __cplusplus
+}
 #endif
+#endif
+
diff --git a/tools/wavtrim.h b/tools/wavtrim.h
index 46c8ff871b..fe78c75818 100644
--- a/tools/wavtrim.h
+++ b/tools/wavtrim.h
@@ -21,7 +21,14 @@
 
 #ifndef WAVTRIM_H
 #define WAVTRIM_H
- 
-int wavtrim(char * filename, int maxsilence ,char* errstring,int errsize);
- 
+
+#ifdef __cplusplus
+extern "C" {
 #endif
+int wavtrim(char * filename, int maxsilence ,char* errstring,int errsize);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+