[PATCH 2/2] Cleanup some unnecessary include statements

[Jef Driesen]

Some of these header files are no longer necessary, and will be removed
from libdivecomputer in the near future.

Signed-off-by: Jef Driesen <jef at libdivecomputer.org>
---
 core/configuredivecomputer.cpp        |  1 -
 core/configuredivecomputerthreads.cpp |  3 ++-
 core/libdivecomputer.c                | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/core/configuredivecomputer.cpp b/core/configuredivecomputer.cpp
index 1e1f9fa..db2ca19 100644
--- a/core/configuredivecomputer.cpp
+++ b/core/configuredivecomputer.cpp
@@ -1,5 +1,4 @@
 #include "configuredivecomputer.h"
-#include "libdivecomputer/hw.h"
 #include <QTextStream>
 #include <QFile>
 #include <libxml/parser.h>
diff --git a/core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp
index a2b54e0..3f7c4f6 100644
--- a/core/configuredivecomputerthreads.cpp
+++ b/core/configuredivecomputerthreads.cpp
@@ -1,5 +1,6 @@
 #include "configuredivecomputerthreads.h"
-#include "libdivecomputer/hw.h"
+#include "libdivecomputer/hw_ostc.h"
+#include "libdivecomputer/hw_ostc3.h"
 #include "libdivecomputer.h"
 
 #define OSTC3_GAS1			0x10
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c
index 28fa909..1455e35 100644
--- a/core/libdivecomputer.c
+++ b/core/libdivecomputer.c
@@ -13,8 +13,6 @@
 #include "divelist.h"
 #include "display.h"
 
-#include <libdivecomputer/uwatec.h>
-#include <libdivecomputer/hw.h>
 #include <libdivecomputer/version.h>
 #include "libdivecomputer.h"
 
@@ -30,14 +28,6 @@
 #define DC_TANKINFO_CC_DILUENT	0
 #endif
 
-/* Christ. Libdivecomputer has the worst configuration system ever. */
-#ifdef HW_FROG_H
-#define NOT_FROG , 0
-#define LIBDIVECOMPUTER_SUPPORTS_FROG
-#else
-#define NOT_FROG
-#endif
-
 char *dumpfile_name;
 char *logfile_name;
 const char *progress_bar_text = "";
-- 
2.9.3