8 files changed, 59 insertions, 3 deletions
diff --git a/epan/base64.h b/epan/base64.h
index ef68eb4f63..8b18616efb 100644
--- a/epan/base64.h
+++ b/epan/base64.h
@@ -24,11 +24,12 @@
 #ifndef __BASE64_H__
 #define __BASE64_H__
 
+#include <epan/tvbuff.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <epan/tvbuff.h>
 /* In-place decoding of a base64 string. */
 size_t epan_base64_decode(char *s);
 
diff --git a/epan/epan.h b/epan/epan.h
index 0b98c584b4..834e990df3 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -24,6 +24,10 @@
 #ifndef EPAN_H
 #define EPAN_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <glib.h>
 #include "frame_data.h"
 #include "column_info.h"
@@ -183,4 +187,8 @@ epan_get_compiled_version_info(GString *str);
 void
 epan_get_runtime_version_info(GString *str);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* EPAN_H */
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 5b0f2d9345..96ea52324f 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -24,6 +24,10 @@
 #ifndef EPAN_DISSECT_H
 #define EPAN_DISSECT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "tvbuff.h"
 #include "proto.h"
 #include "packet_info.h"
@@ -40,5 +44,8 @@ struct _epan_dissect_t {
 	packet_info	pi;
 };
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* EPAN_DISSECT_H */
diff --git a/epan/ex-opt.h b/epan/ex-opt.h
index 0cfbc3aa1f..2001b2829d 100644
--- a/epan/ex-opt.h
+++ b/epan/ex-opt.h
@@ -23,12 +23,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #ifndef _EX_OPT_H
 #define _EX_OPT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* will be called by main each time a -X option is found */
 extern gboolean ex_opt_add(const gchar* optarg);
 
@@ -41,4 +45,8 @@ extern const gchar* ex_opt_get_nth(const gchar* key, guint index);
 /* extracts the next value of a given key */
 extern const gchar* ex_opt_get_next(const gchar* key);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _EX_OPT_H */
diff --git a/epan/prefs.h b/epan/prefs.h
index cec0a4af46..eae802e3d7 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -25,6 +25,10 @@
 #ifndef __PREFS_H__
 #define __PREFS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <glib.h>
 
 #include "color.h"
@@ -462,4 +466,8 @@ extern gboolean prefs_is_capture_device_hidden(const char *name);
  */
 extern gboolean prefs_capture_device_monitor_mode(const char *name);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* prefs.h */
diff --git a/epan/strutil.h b/epan/strutil.h
index 38da893a25..8c1dbcbc90 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -25,6 +25,10 @@
 #ifndef __STRUTIL_H__
 #define __STRUTIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* ... thus, config.h needs to be #included */
 
 /** @file
@@ -268,4 +272,8 @@ gchar* ws_strdup_unescape_char (const gchar *str, const gchar chr);
  */
 gchar *string_replace(const gchar* str, const gchar *old_val, const gchar *new_val);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __STRUTIL_H__ */
diff --git a/epan/timestamp.h b/epan/timestamp.h
index 9282ac5216..da41c947a2 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -25,6 +25,10 @@
 #ifndef __TIMESTAMP_H__
 #define __TIMESTAMP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
  * Type of time-stamp shown in the summary display.
  */
@@ -81,4 +85,8 @@ extern void timestamp_set_precision(int tsp);
 extern ts_seconds_type timestamp_get_seconds_type(void);
 extern void timestamp_set_seconds_type(ts_seconds_type);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* timestamp.h */
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 61b7b12c30..3f9124e5a3 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -40,6 +40,10 @@
 #include <epan/guid-utils.h>
 #include "exceptions.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /** @file
  * "testy, virtual(-izable) buffer".  They are testy in that they get mad when
  * an attempt is made to access data beyond the bounds of their array. In that
@@ -674,4 +678,8 @@ extern tvbuff_t* tvb_child_uncompress(tvbuff_t *parent, tvbuff_t *tvb, const int
 
 /************** END OF ACCESSORS ****************/
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __TVBUFF_H__ */