diff --git a/SPI_Camera/src/ArduCAM.c b/SPI_Camera/src/ArduCAM.c
index 3dd254a..8d85ab0 100644
--- a/SPI_Camera/src/ArduCAM.c
+++ b/SPI_Camera/src/ArduCAM.c
@@ -1,3 +1,4 @@
+#define ARDUCAM_C
 #include "ArduCAM.h"
 #include "sccb_bus.h"
 #include "ov2640_regs.h"
diff --git a/SPI_Camera/src/ArduCAM.h b/SPI_Camera/src/ArduCAM.h
index 40f7c8e..cbf1cde 100644
--- a/SPI_Camera/src/ArduCAM.h
+++ b/SPI_Camera/src/ArduCAM.h
@@ -5,20 +5,28 @@
 #define CMD_BUF_SIZE    512
 
 
+#if defined(ARDUCAM_C)
 char readbuf[JPEG_BUF_SIZE];
 
-
 char* sendbuf_cam1 ;
 char* sendbuf_cam2 ;
 char* sendbuf_cam3 ;
 char* sendbuf_cam4 ;
 
+char revCmdData[CMD_BUF_SIZE];
+#else
+extern char readbuf[JPEG_BUF_SIZE];
 
+extern char* sendbuf_cam1 ;
+extern char* sendbuf_cam2 ;
+extern char* sendbuf_cam3 ;
+extern char* sendbuf_cam4 ;
 
-char revCmdData[CMD_BUF_SIZE];
+extern char revCmdData[CMD_BUF_SIZE];
+#endif
 
 //ArduCAM CS define
-#define     CAM_CS1         17
+#define     CAM_CS1         8
 #define     CAM_CS2         23
 #define     CAM_CS3         22
 #define     CAM_CS4         24
diff --git a/SPI_Camera/src/bcm283x_board_driver.c b/SPI_Camera/src/bcm283x_board_driver.c
index 9852218..fac8c6f 100644
--- a/SPI_Camera/src/bcm283x_board_driver.c
+++ b/SPI_Camera/src/bcm283x_board_driver.c
@@ -1,3 +1,4 @@
+#define DEFINE_VARS
 #include "bcm283x_board_driver.h"
 
 #include <stdlib.h>
diff --git a/SPI_Camera/src/bcm283x_board_driver.h b/SPI_Camera/src/bcm283x_board_driver.h
index 9b3ff1e..c9116c1 100644
--- a/SPI_Camera/src/bcm283x_board_driver.h
+++ b/SPI_Camera/src/bcm283x_board_driver.h
@@ -88,17 +88,22 @@
 #define SPI_CS_CS_10		0x00000002
 #define SPI_CS_CS_01		0x00000001
 
+#if defined(DEFINE_VARS)
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
 
 // Pointers that will be memory mapped when pioInit() is called
-volatile unsigned int *gpio; //pointer to base of gpio
-volatile unsigned int *spi;  //pointer to base of spi registers
-volatile unsigned int *pwm;
+EXTERN volatile unsigned int *gpio; //pointer to base of gpio
+EXTERN volatile unsigned int *spi;  //pointer to base of spi registers
+EXTERN volatile unsigned int *pwm;
 
-volatile unsigned int *sys_timer;
-volatile unsigned int *arm_timer; // pointer to base of arm timer registers
+EXTERN volatile unsigned int *sys_timer;
+EXTERN volatile unsigned int *arm_timer; // pointer to base of arm timer registers
 
-volatile unsigned int *uart;
-volatile unsigned int *cm_pwm;
+EXTERN volatile unsigned int *uart;
+EXTERN volatile unsigned int *cm_pwm;
 
 /////////////////////////////////////////////////////////////////////
 // GPIO Registers
@@ -710,4 +715,4 @@ unsigned long  get_microsecond_timestamp();
 
 
 
-#endif
\ No newline at end of file
+#endif