Add 'extern "C"' wrappers and #include guards to various header files.

svn path=/trunk/; revision=40321

1 files changed, 3 insertions, 3 deletions

diff --git a/globals.h b/globals.h
index 7e3e526ecd..5c1e0675cb 100644
--- a/globals.h
+++ b/globals.h
@@ -25,13 +25,13 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
+#include "file.h"
+#include <epan/timestamp.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include "file.h"
-#include <epan/timestamp.h>
-
 extern capture_file cfile;
 
 #ifdef __cplusplus