Costmetic changes done , removing not needed includes from many files , usually because they already includes motion.h that has already needed files included.

alg.c

@@ -7,16 +7,7 @@
  *
  */
 #include "motion.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
-#include "video.h"
-#endif /* __freebsd__ */
-
-#include "conf.h"
 #include "alg.h"
-#include "event.h"
 
 #ifdef __MMX__
 #define HAVE_MMX

conf.c

@@ -25,14 +25,13 @@
  */
 #include "motion.h"
 
+
 #ifdef __freebsd__
 #include "video_freebsd.h"
 #else
 #include "video.h"
 #endif /* __freebsd__ */
 
-#include "conf.h"
-#include "track.h"
 
 #define stripnewline(x) {if ((x)[strlen(x)-1]=='\n') (x)[strlen(x) - 1] = 0; }
 

event.c

@@ -12,13 +12,9 @@
 #include "ffmpeg.h"           /* must be first to avoid 'shadow' warning */
 #include "motion.h"
 #include "event.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
+#ifndef __freebsd__
 #include "video.h"
-#endif /* __freebsd__ */
-
+#endif
 #include "picture.h"
 
 /*

netcam.c

@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "netcam_wget.h"
 #include "netcam_ftp.h"
 
 #define CONNECT_TIMEOUT        10   /* timeout on remote connection attempt */

netcam_ftp.c

@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#include "netcam.h"
 #include "netcam_ftp.h"
 
 /**

netcam_wget.c

@@ -27,7 +27,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netcam_wget.h"
 
 #define MINVAL(x, y) ((x) < (y) ? (x) : (y))
 

picture.c

@@ -9,7 +9,6 @@
  */
 
 #include "picture.h"
-#include "motion.h"
 #include "event.h"
 
 #include <jpeglib.h>

track.c

@@ -9,16 +9,9 @@
 #include <math.h>
 #include <termios.h>
 #include "motion.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
-#include "video.h"
-#endif /* __freebsd__ */
-
-#include "conf.h"
-#include "track.h"
-#include "alg.h"
+//#include "conf.h"
+//#include "track.h"
+//#include "alg.h"
 
 #include "pwc-ioctl.h"
 

video.c

@@ -10,7 +10,6 @@
 /* Common stuff: */
 #include "motion.h"
 #include "video.h"
-#include "conf.h"
 /* for rotation */
 #include "rotate.h"
 

video_freebsd.c

@@ -10,7 +10,6 @@
 /* Common stuff: */
 #include "motion.h"
 #include "video_freebsd.h"
-#include "conf.h"
 /* for rotation */
 #include "rotate.h"
 
@@ -572,7 +571,7 @@ static unsigned char *v4l_start(struct context *cnt, struct video_dev *viddev, i
 	void *map;
 
 	/* if we have choose the tuner is needed to setup the frequency */
-	if ( ((viddev->tuner_device != NULL)) && ( input == IN_TV ) ) {
+	if ( (viddev->tuner_device != NULL) && ( input == IN_TV ) ) {
 		if (!freq) {
 			motion_log(LOG_ERR, 1, "Not valid Frequency [%lu] for Source input [%i]", freq, input);
 			return (NULL);

webcam.c

@@ -19,8 +19,7 @@
  */
 
 #include "picture.h"
-#include "webcam.h"
-#include "motion.h"
+/* picture.h already includes motion.h and this one webcam.h */
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

webhttpd.c

@@ -16,9 +16,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include "conf.h"
-#include "webhttpd.h"
-#include "netcam_wget.h"
 
 pthread_mutex_t httpd_mutex;