remove unecessary utils/types.h

This cleans up this header and moves the functionality into more
useful places while reducing the include complexity but only pulling
in whats required.

2 files changed, 6 insertions, 53 deletions

diff --git a/utils/types.h b/utils/types.h
deleted file mode 100644
index 3c78124e3..000000000
--- a/utils/types.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011 Michael Drake <tlsa@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Core types.
- */
-
-#ifndef _NETSURF_UTILS_TYPES_H_
-#define _NETSURF_UTILS_TYPES_H_
-
-#include <stdbool.h>
-
-struct plotter_table;
-struct hlcache_handle;
-
-/* Rectangle coordinates */
-struct rect {
-	int x0, y0; /* Top left */
-	int x1, y1; /* Bottom right */
-};
-
-
-/* Redraw context */
-struct redraw_context {
-	/** Redraw to show interactive features, such as active selections
-	 *  etc.  Should be off for printing. */
-	bool interactive;
-
-	/** Render background images.  May want it off for printing. */
-	bool background_images;
-
-	/** Current plotters, must be assigned before use. */
-	const struct plotter_table *plot;
-};
-
-
-
-#endif
diff --git a/utils/utils.h b/utils/utils.h
index 00d150126..e2865d738 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -38,6 +38,12 @@
 
 #include "utils/errors.h"
 
+/* Rectangle coordinates */
+struct rect {
+	int x0, y0; /* Top left */
+	int x1, y1; /* Bottom right */
+};
+
 struct dirent;
 
 #ifndef NOF_ELEMENTS