diff --git a/common/include/villas/atomic.h b/common/include/villas/atomic.h
deleted file mode 100644
index 61c5fdc06..000000000
--- a/common/include/villas/atomic.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/** Workaround for differently named atomic types in C/C++
- *
- * @file
- * @author Georg Reinke <georg.reinke@rwth-aachen.de>
- * @copyright 2014-2019, Institute for Automation of Complex Power Systems, EONERC
- * @license GNU General Public License (version 3)
- *
- * VILLAScommon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************************/
-
-#pragma once
-
-#include <villas/common.h>
-
-#ifdef __cplusplus
-
-#include <atomic>
-
-typedef std::atomic_int atomic_int;
-typedef std::atomic_size_t atomic_size_t;
-typedef std::atomic<enum state> atomic_state;
-
-#else
-
-#include <stdatomic.h>
-
-typedef _Atomic enum state atomic_state;
-
-#endif /* __cplusplus */