csv, compat, logic, api: open-code import.hpp

8 files changed, 44 insertions, 56 deletions

diff --git a/csv/export.hpp b/csv/export.hpp
index 506833c4..eb8d723f 100644
--- a/csv/export.hpp
+++ b/csv/export.hpp
@@ -14,5 +14,15 @@
 #   endif
 
 #else
-#   include "import.hpp"
+    #ifdef _WIN32
+    #    define OPENTRACK_CSV_LINKAGE __declspec(dllimport)
+    #else
+    #    define OPENTRACK_CSV_LINKAGE
+    #endif
+
+    #ifndef _MSC_VER
+    #    define OPENTRACK_CSV_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_CSV_LINKAGE
+    #else
+    #    define OPENTRACK_CSV_EXPORT OPENTRACK_CSV_LINKAGE
+    #endif
 #endif
diff --git a/csv/import.hpp b/csv/import.hpp
deleted file mode 100644
index 5fcfdd58..00000000
--- a/csv/import.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#    define OPENTRACK_CSV_LINKAGE __declspec(dllimport)
-#else
-#    define OPENTRACK_CSV_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-#    define OPENTRACK_CSV_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_CSV_LINKAGE
-#else
-#    define OPENTRACK_CSV_EXPORT OPENTRACK_CSV_LINKAGE
-#endif
diff --git a/opentrack-compat/export.hpp b/opentrack-compat/export.hpp
index ccf25ff9..ba10f131 100644
--- a/opentrack-compat/export.hpp
+++ b/opentrack-compat/export.hpp
@@ -13,5 +13,15 @@
 #       define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE
 #   endif
 #else
-#   include "import.hpp"
+    #ifdef _WIN32
+    #    define OPENTRACK_COMPAT_LINKAGE __declspec(dllimport)
+    #else
+    #    define OPENTRACK_COMPAT_LINKAGE
+    #endif
+
+    #ifndef _MSC_VER
+    #    define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE
+    #else
+    #    define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE
+    #endif
 #endif
diff --git a/opentrack-compat/import.hpp b/opentrack-compat/import.hpp
deleted file mode 100644
index aed266bd..00000000
--- a/opentrack-compat/import.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#    define OPENTRACK_COMPAT_LINKAGE __declspec(dllimport)
-#else
-#    define OPENTRACK_COMPAT_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-#    define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE
-#else
-#    define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE
-#endif
diff --git a/opentrack-logic/export.hpp b/opentrack-logic/export.hpp
index db4f0d86..2503f3a6 100644
--- a/opentrack-logic/export.hpp
+++ b/opentrack-logic/export.hpp
@@ -14,5 +14,15 @@
 #   endif
 
 #else
-#   include "import.hpp"
+#ifdef _WIN32
+#    define OPENTRACK_LOGIC_LINKAGE __declspec(dllimport)
+#else
+#    define OPENTRACK_LOGIC_LINKAGE
+#endif
+
+#ifndef _MSC_VER
+#    define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
+#else
+#    define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
+#endif
 #endif
diff --git a/opentrack-logic/import.hpp b/opentrack-logic/import.hpp
deleted file mode 100644
index 8a3e80c1..00000000
--- a/opentrack-logic/import.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#    define OPENTRACK_LOGIC_LINKAGE __declspec(dllimport)
-#else
-#    define OPENTRACK_LOGIC_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-#    define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
-#else
-#    define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
-#endif
diff --git a/opentrack/export.hpp b/opentrack/export.hpp
index 96daef53..a9f3521e 100644
--- a/opentrack/export.hpp
+++ b/opentrack/export.hpp
@@ -14,5 +14,15 @@
 #   endif
 
 #else
-#   include "import.hpp"
+    #ifdef _WIN32
+    #    define OPENTRACK_API_LINKAGE __declspec(dllimport)
+    #else
+    #    define OPENTRACK_API_LINKAGE
+    #endif
+
+    #ifndef _MSC_VER
+    #    define OPENTRACK_API_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_API_LINKAGE
+    #else
+    #    define OPENTRACK_API_EXPORT OPENTRACK_API_LINKAGE
+    #endif
 #endif
diff --git a/opentrack/import.hpp b/opentrack/import.hpp
deleted file mode 100644
index 7448416a..00000000
--- a/opentrack/import.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#    define OPENTRACK_API_LINKAGE __declspec(dllimport)
-#else
-#    define OPENTRACK_API_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-#    define OPENTRACK_API_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_API_LINKAGE
-#else
-#    define OPENTRACK_API_EXPORT OPENTRACK_API_LINKAGE
-#endif