Using one header file for esp8266 stuff

user/cgi.c

@@ -13,15 +13,9 @@ flash as a binary. Also handles the hit counter on the main page.
  */
 
 
-#include <string.h>
-#include <osapi.h>
-#include "user_interface.h"
-#include "mem.h"
-#include "httpd.h"
+#include <esp8266.h>
 #include "cgi.h"
 #include "io.h"
-#include <ip_addr.h>
-#include "espmissingincludes.h"
 
 
 //cause I can't be bothered to write an ioGetLed()

user/cgiflash.c

@@ -12,15 +12,8 @@ Some flash handling cgi routines. Used for reading the existing flash and updati
  */
 
 
-#include <string.h>
-#include <osapi.h>
-#include "user_interface.h"
-#include "mem.h"
-#include "httpd.h"
+#include <esp8266.h>
 #include "cgiflash.h"
-#include "io.h"
-#include <ip_addr.h>
-#include "espmissingincludes.h"
 #include "espfs.h"
 
 

user/cgiwifi.c

@@ -12,14 +12,8 @@ Cgi/template routines for the /wifi url.
  */
 
 
-#include <string.h>
-#include <osapi.h>
-#include "user_interface.h"
-#include "mem.h"
-#include "httpd.h"
-#include "cgi.h"
-#include "io.h"
-#include "espmissingincludes.h"
+#include <esp8266.h>
+#include "cgiwifi.h"
 
 //Enable this to disallow any changes in AP settings
 //#define DEMO_MODE

user/io.c

@@ -9,13 +9,7 @@
  */
 
 
-#include "c_types.h"
-#include "user_interface.h"
-#include "espconn.h"
-#include "mem.h"
-#include "osapi.h"
-#include "gpio.h"
-#include "espmissingincludes.h"
+#include <esp8266.h>
 
 #define LEDGPIO 2
 #define BTNGPIO 0
@@ -37,10 +31,10 @@ static void ICACHE_FLASH_ATTR resetBtnTimerCb(void *arg) {
 		resetCnt++;
 	} else {
 		if (resetCnt>=6) { //3 sec pressed
-			wifi_station_disconnect();
-			wifi_set_opmode(0x3); //reset to AP+STA mode
+			//wifi_station_disconnect();
+			//wifi_set_opmode(0x3); //reset to AP+STA mode
 			os_printf("Reset to AP mode. Restarting system...\n");
-			system_restart();
+			//system_restart();
 		}
 		resetCnt=0;
 	}

user/stdout.c

@@ -10,10 +10,7 @@
  */
 
 
-#include "espmissingincludes.h"
-#include "ets_sys.h"
-#include "osapi.h"
-#include "uart_hw.h"
+#include <esp8266.h>
 
 static void ICACHE_FLASH_ATTR stdoutUartTxd(char c) {
 	//Wait until there is room in the FIFO

user/user_main.c

@@ -10,9 +10,7 @@
  */
 
 
-#include "espmissingincludes.h"
-#include "ets_sys.h"
-#include "osapi.h"
+#include <esp8266.h>
 #include "httpd.h"
 #include "io.h"
 #include "httpdespfs.h"