diff --git a/DStarGatewayConfig.h b/DStarGatewayConfig.h
index ef5a38e..2a3de4f 100644
--- a/DStarGatewayConfig.h
+++ b/DStarGatewayConfig.h
@@ -24,27 +24,6 @@
 
 using namespace libconfig;
 
-typedef struct {
-	std::string callsign;
-	std::string address;
-	unsigned int port;
-} TGateway;
-
-typedef struct {
-	std::string band;
-	std::string callsign;
-	std::string reflector;
-	std::string address;
-	unsigned int port;
-} TRepeater;
-
-typedef struct {
-	std::string hostname;
-	std::string username;
-	std::string password;
-	bool isQuadNet;
-} TircDDB;
-
 class CDStarGatewayConfig {
 public:
 	CDStarGatewayConfig(const std::string &pathname);
diff --git a/Defs.h b/Defs.h
index af03af6..5978de5 100644
--- a/Defs.h
+++ b/Defs.h
@@ -124,3 +124,24 @@ enum GATEWAY_TYPE {
 };
 
 const unsigned int TIME_PER_TIC_MS = 5U;
+
+typedef struct {
+	std::string callsign;
+	std::string address;
+	unsigned int port;
+} TGateway;
+
+typedef struct {
+	std::string band;
+	std::string callsign;
+	std::string reflector;
+	std::string address;
+	unsigned int port;
+} TRepeater;
+
+typedef struct {
+	std::string hostname;
+	std::string username;
+	std::string password;
+	bool isQuadNet;
+} TircDDB;
\ No newline at end of file