diff --git a/flight/Makefile b/flight/Makefile
index 5562a1279..2e9b27917 100644
--- a/flight/Makefile
+++ b/flight/Makefile
@@ -2,7 +2,7 @@
  # Project: OpenPilot
  #    
  # @file Makefile 
- # Makefile for OpenPilot project build PiOS and the AP.
+ # @brief Makefile for OpenPilot project build PiOS and the AP.
  #
  # @author The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2009.
  #    
diff --git a/flight/PiOS/inc/pios_config.h b/flight/PiOS/inc/pios_config.h
new file mode 100644
index 000000000..fc2dede7e
--- /dev/null
+++ b/flight/PiOS/inc/pios_config.h
@@ -0,0 +1,34 @@
+/**
+ ******************************************************************************
+ *
+ * @file       pios_config.h  
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009.   
+ * @brief      Main configuration header. 
+ *                 - Compile time configuration the project.
+ * @see        The GNU Public License (GPL) Version 3
+ *
+ *****************************************************************************/
+/* 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+ * for more details.
+ * 
+ * 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
+ */
+
+
+#ifndef PIOS_CONFIG_H
+#define PIOS_CONFIG_H
+
+
+
+
+#endif /* PIOS_CONFIG_H */
diff --git a/flight/PiOS/pios.h b/flight/PiOS/pios.h
index e257cdb57..692f9034f 100644
--- a/flight/PiOS/pios.h
+++ b/flight/PiOS/pios.h
@@ -28,6 +28,10 @@
 #ifndef PIOS_H
 #define PIOS_H
 
+
+/* PIOS Compile Time Configuration */
+#include "pios_config.h"
+
 /* C Lib Includes */
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,15 +50,15 @@
 #include <minIni.h>
 
 /* PIOS Hardware Includes (STM32F10x) */
-#include "inc/pios_board.h"
-#include "inc/pios_sys.h"
-#include "inc/pios_settings.h"
-#include "inc/pios_led.h"
-#include "inc/pios_usart.h"
-#include "inc/pios_irq.h"
+#include "pios_board.h"
+#include "pios_sys.h"
+#include "pios_settings.h"
+#include "pios_led.h"
+#include "pios_usart.h"
+#include "pios_irq.h"
 
 /* PIOS Hardware Includes (Common) */
-#include "inc/pios_com.h"
+#include "pios_com.h"
 
 /* More added here as they get written */