diff --git a/include/villas/atomic.h b/include/villas/atomic.h
index 68ba72489..b23b5487f 100644
--- a/include/villas/atomic.h
+++ b/include/villas/atomic.h
@@ -21,15 +21,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
+#include "common.h"
+
 #ifdef __cplusplus
 
 #include <atomic>
 
 typedef std::atomic_int atomic_int;
 typedef std::atomic_size_t atomic_size_t;
+typedef std::atomic_int atomic_state;
 
 #else
 
 #include <stdatomic.h>
 
+typedef _Atomic enum state atomic_state;
+
 #endif
diff --git a/include/villas/common.h b/include/villas/common.h
index 47f09b944..e754a9c0f 100644
--- a/include/villas/common.h
+++ b/include/villas/common.h
@@ -34,13 +34,3 @@ enum state {
 	STATE_STOPPED		= 5,
 	STATE_UNLOADED		= 5 /* alias for STATE_STARTED used by plugins */
 };
-
-#ifdef __cpluscplus
-
-typedef std::atomic_int atomic_state;
-
-#else
-
-typedef _Atomic enum state atomic_state;
-
-#endif