Header guards are evil

4 files changed, 8 insertions, 18 deletions

diff --git a/cue-bin-split.c b/cue-bin-split.c
index 3df2966..8616aef 100644
--- a/cue-bin-split.c
+++ b/cue-bin-split.c
@@ -25,6 +25,11 @@
  * SUCH DAMAGE.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <unistd.h>
+
 #include "cue-bin-split.h"
 #include "misc.h"
 
diff --git a/cue-bin-split.h b/cue-bin-split.h
index 604bea5..e689bbf 100644
--- a/cue-bin-split.h
+++ b/cue-bin-split.h
@@ -25,14 +25,5 @@
  * SUCH DAMAGE.
  */
 
-#ifndef CUE_BIN_SPLIT_H
-#define CUE_BIN_SPLIT_H
-
-#include <stdio.h>
-#include <limits.h>
-#include <getopt.h>
-
 #define FRAMES_PER_SEC 75
 #define BUFFER_SIZE    1024*1024 /* Meh, good enough */
-
-#endif
diff --git a/misc.c b/misc.c
index 76ddaaf..7ee275a 100644
--- a/misc.c
+++ b/misc.c
@@ -25,6 +25,9 @@
  * SUCH DAMAGE.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "misc.h"
 
 /* Grabs a 'mm:ss:ff' stamp from stdin */
diff --git a/misc.h b/misc.h
index ceb00fd..fb4a093 100644
--- a/misc.h
+++ b/misc.h
@@ -25,12 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef MISC_H
-#define MISC_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "cue-bin-split.h"
 
 /* MIN is surely defined in a standard header */
@@ -40,6 +34,3 @@
 double get_sec();
 int construct_out_name(char *buffer, size_t buffer_size, char* format, unsigned int track);
 void die_help();
-
-
-#endif