One header file for type definitions and function declarations

util.c

@@ -16,6 +16,8 @@
  * along with sxiv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "sxiv.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -23,9 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "options.h"
-#include "util.h"
-
 const char *progname;
 
 void* emalloc(size_t size)