diff --git a/src/amps/amps.h b/src/amps/amps.h
index 0bfcf62..f04b3d3 100644
--- a/src/amps/amps.h
+++ b/src/amps/amps.h
@@ -2,6 +2,7 @@
 #include "../libmobile/sender.h"
 #include "../libtimer/timer.h"
 #include "../libcompandor/compandor.h"
+typedef struct amps amps_t;
 #include "sysinfo.h"
 #include "transaction.h"
 
@@ -35,7 +36,7 @@ enum fsk_rx_sync {
 
 #define FSK_MAX_BITS		1032	/* maximum number of bits to process (FVC with dotting+sync) */
 
-typedef struct amps {
+struct amps {
 	sender_t		sender;
 	compandor_t		cstate;
 	int			pre_emphasis;		/* use pre_emphasis by this instance */
@@ -159,7 +160,7 @@ typedef struct amps {
 	double			when_received;		/* time stamp of received frame start (start of dotting) */
 	double			when_transmitted[16];	/* time stamps of filler frames with different count */
 	int			when_count;		/* counter of the filler frame */
-} amps_t;
+};
 
 void amps_channel_list(void);
 int amps_channel_by_short_name(const char *short_name);
diff --git a/src/amps/transaction.h b/src/amps/transaction.h
index 5327481..8eb689f 100644
--- a/src/amps/transaction.h
+++ b/src/amps/transaction.h
@@ -1,6 +1,4 @@
 
-typedef struct amps amps_t;
-
 enum amps_trans_state {
 	TRANS_NULL = 0,
 	TRANS_REGISTER_ACK,		/* attach request received, waiting to ack */
diff --git a/src/cnetz/cnetz.h b/src/cnetz/cnetz.h
index 20d04c0..88e621f 100644
--- a/src/cnetz/cnetz.h
+++ b/src/cnetz/cnetz.h
@@ -1,8 +1,9 @@
 #include "../libcompandor/compandor.h"
 #include "../libtimer/timer.h"
 #include "../libmobile/sender.h"
-#include "fsk_demod.h"
 #include "../libscrambler/scrambler.h"
+typedef struct cnetz cnetz_t;
+#include "fsk_demod.h"
 #include "transaction.h"
 
 #define CNETZ_OGK_KANAL		131
@@ -63,7 +64,7 @@ struct clock_speed {
 };
 
 /* instance of cnetz sender */
-typedef struct cnetz {
+struct cnetz {
 	sender_t		sender;
 	enum cnetz_chan_type	chan_type;		/* channel type */
 	scrambler_t		scrambler_tx;		/* mirror what we transmit to MS */
@@ -130,7 +131,7 @@ typedef struct cnetz {
 	struct clock_speed	clock_speed;
 
 	transaction_t		*trans_list;		/* list of transactions */
-} cnetz_t;
+};
 
 double cnetz_kanal2freq(int kanal, int unterband);
 void cnetz_channel_list(void);
diff --git a/src/cnetz/fsk_demod.h b/src/cnetz/fsk_demod.h
index 5e45a8b..2d33c80 100644
--- a/src/cnetz/fsk_demod.h
+++ b/src/cnetz/fsk_demod.h
@@ -16,8 +16,6 @@ enum demod_type {
 	FSK_DEMOD_LEVEL, /* check for zero crossing (good for SDR) */
 };
 
-typedef struct cnetz cnetz_t;
-
 typedef struct fsk_fm_demod {
 	cnetz_t		*cnetz;			/* pointer back to cnetz instance */
 
diff --git a/src/nmt/dms.h b/src/nmt/dms.h
index f70c9e1..443f2e9 100644
--- a/src/nmt/dms.h
+++ b/src/nmt/dms.h
@@ -1,4 +1,3 @@
-typedef struct nmt nmt_t;
 
 struct dms_frame {
 	struct dms_frame	*next;
diff --git a/src/nmt/nmt.h b/src/nmt/nmt.h
index 31d68f6..34e668f 100644
--- a/src/nmt/nmt.h
+++ b/src/nmt/nmt.h
@@ -5,6 +5,7 @@
 #include "../libmobile/call.h"
 #include "../libfsk/fsk.h"
 #include "../libgoertzel/goertzel.h"
+typedef struct nmt nmt_t;
 #include "dms.h"
 #include "sms.h"
 
@@ -73,7 +74,7 @@ typedef struct nmt_sysinfo {
 
 const char *nmt_dir_name(enum nmt_direction dir);
 
-typedef struct nmt {
+struct nmt {
 	sender_t		sender;
 	nmt_sysinfo_t		sysinfo;
 	compandor_t		cstate;
@@ -136,7 +137,7 @@ typedef struct nmt {
 	sms_t			sms;			/* SMS states */
 	char			smsc_number[33];	/* digits to match SMSC */
 	struct timer		sms_timer;
-} nmt_t;
+};
 
 void nmt_channel_list(int nmt_system);
 int nmt_channel_by_short_name(int nmt_system, const char *short_name);