From 51be431e8261f2e696c067f44243d94bcbd3d381 Mon Sep 17 00:00:00 2001
From: Doug Torrance <dtorrance@piedmont.edu>
Date: Mon, 14 Aug 2017 18:49:28 -0400
Subject: [PATCH] wmmoonclock: Use correct includes for each file.

---
 wmmoonclock/src/CalcEphem.c   | 4 ++--
 wmmoonclock/src/CalcEphem.h   | 3 ---
 wmmoonclock/src/MoonRise.c    | 1 -
 wmmoonclock/src/wmMoonClock.c | 5 +++--
 wmmoonclock/src/xutils.c      | 5 ++---
 wmmoonclock/src/xutils.h      | 4 +++-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/wmmoonclock/src/CalcEphem.c b/wmmoonclock/src/CalcEphem.c
index 1a8ab03..281f4a0 100644
--- a/wmmoonclock/src/CalcEphem.c
+++ b/wmmoonclock/src/CalcEphem.c
@@ -1,6 +1,6 @@
-#include <string.h>
 #include "CalcEphem.h"
-
+#include <math.h>
+#include <string.h>
 
 void CalcEphem(date, UT, c)
 long int     	 date;	/* integer containing the date (e.g. 960829) */
diff --git a/wmmoonclock/src/CalcEphem.h b/wmmoonclock/src/CalcEphem.h
index 7ed5bde..e2908ed 100644
--- a/wmmoonclock/src/CalcEphem.h
+++ b/wmmoonclock/src/CalcEphem.h
@@ -1,6 +1,3 @@
-#include <stdio.h>
-#include <math.h>
-
 #define DegPerRad       57.29577951308232087680
 #define RadPerDeg        0.01745329251994329576
 #define FALSE 0
diff --git a/wmmoonclock/src/MoonRise.c b/wmmoonclock/src/MoonRise.c
index 9fcb541..e8ff484 100644
--- a/wmmoonclock/src/MoonRise.c
+++ b/wmmoonclock/src/MoonRise.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <math.h>
 #include "MoonRise.h"
 #include "Moon.h"
diff --git a/wmmoonclock/src/wmMoonClock.c b/wmmoonclock/src/wmMoonClock.c
index d7bae22..21435d4 100644
--- a/wmmoonclock/src/wmMoonClock.c
+++ b/wmmoonclock/src/wmMoonClock.c
@@ -104,13 +104,14 @@
 /*
  *   Includes
  */
+#include <math.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/select.h>
 #include <time.h>
 #include <X11/X.h>
-#include <X11/xpm.h>
+#include <X11/Xlib.h>
 #include "CalcEphem.h"
 #include "MoonRise.h"
 #include "xutils.h"
diff --git a/wmmoonclock/src/xutils.c b/wmmoonclock/src/xutils.c
index 25d2e1f..347b46b 100644
--- a/wmmoonclock/src/xutils.c
+++ b/wmmoonclock/src/xutils.c
@@ -31,12 +31,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdarg.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/xpm.h>
 #include <X11/extensions/shape.h>
+#include <X11/extensions/shapeconst.h>
 #include "xutils.h"
 
 
diff --git a/wmmoonclock/src/xutils.h b/wmmoonclock/src/xutils.h
index 586942b..f9fc538 100644
--- a/wmmoonclock/src/xutils.h
+++ b/wmmoonclock/src/xutils.h
@@ -1,7 +1,9 @@
 #ifndef WMGENERAL_H_INCLUDED
 #define WMGENERAL_H_INCLUDED
 
-
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/xpm.h>
 
 /*
  *   Typedefs
-- 
2.11.4.GIT