diff --git a/include/libmueb/muebtransmitter.h b/include/libmueb/muebtransmitter.h
index 0316a3bbfb4c70a80bb54b2ba7345edc539b716f..1ef53dd93fce0ea42c969ccea983bc269dbb4a96 100644
--- a/include/libmueb/muebtransmitter.h
+++ b/include/libmueb/muebtransmitter.h
@@ -2,7 +2,6 @@
 #define LIBMUEB_MUEBTRANSMITTER_H_
 
 #include <QObject>
-#include <cstdint>
 
 #include "libmueb_global.h"
 
@@ -18,9 +17,9 @@ class LIBMUEB_EXPORT MuebTransmitter final : public QObject {
 
   static MuebTransmitter& Instance();
 
-  std::int32_t width() const;
+  quint32 width() const;
 
-  std::int32_t height() const;
+  quint32 height() const;
 
   libmueb::Frame frame() const;
 
diff --git a/src/configuration.cc b/src/configuration.cc
index 868b79d4d2aeaf35f341721978aab59b795c69dc..6a31111fe8c991534301394de86bfe2f3cb0d44e 100644
--- a/src/configuration.cc
+++ b/src/configuration.cc
@@ -15,83 +15,71 @@ QImage Configuration::frame() const { return frame_; }
 
 QHostAddress Configuration::target_address() const { return target_address_; }
 
-std::uint32_t Configuration::floors() const { return floors_; }
+quint32 Configuration::floors() const { return floors_; }
 
-std::uint32_t Configuration::rooms_per_floor() const {
-  return rooms_per_floor_;
-}
+quint32 Configuration::rooms_per_floor() const { return rooms_per_floor_; }
 
-std::uint32_t Configuration::windows_per_room() const {
-  return windows_per_room_;
-}
+quint32 Configuration::windows_per_room() const { return windows_per_room_; }
 
-std::uint32_t Configuration::vertical_pixel_unit() const {
+quint32 Configuration::vertical_pixel_unit() const {
   return vertical_pixel_unit_;
 }
 
-std::uint32_t Configuration::horizontal_pixel_unit() const {
+quint32 Configuration::horizontal_pixel_unit() const {
   return horizontal_pixel_unit_;
 }
 
-std::uint32_t Configuration::pixels_per_window() const {
-  return pixels_per_window_;
-}
+quint32 Configuration::pixels_per_window() const { return pixels_per_window_; }
 
-std::uint32_t Configuration::window_per_floor() const {
-  return window_per_floor_;
-}
+quint32 Configuration::window_per_floor() const { return window_per_floor_; }
 
-std::uint32_t Configuration::windows() const { return windows_; }
+quint32 Configuration::windows() const { return windows_; }
 
-std::uint32_t Configuration::pixels() const { return pixels_; }
+quint32 Configuration::pixels() const { return pixels_; }
 
-std::int32_t Configuration::width() const { return width_; }
+qint32 Configuration::width() const { return width_; }
 
-std::int32_t Configuration::height() const { return height_; }
+qint32 Configuration::height() const { return height_; }
 
-std::uint8_t Configuration::protocol_type() const { return protocol_type_; }
+quint8 Configuration::protocol_type() const { return protocol_type_; }
 
-std::uint32_t Configuration::window_byte_size() const {
-  return window_byte_size_;
-}
+quint32 Configuration::window_byte_size() const { return window_byte_size_; }
 
-std::uint32_t Configuration::max_windows_per_datagram() const {
+quint32 Configuration::max_windows_per_datagram() const {
   return max_windows_per_datagram_;
 }
 
-std::uint32_t Configuration::packet_header_size() const {
+quint32 Configuration::packet_header_size() const {
   return packet_header_size_;
 }
 
-std::uint32_t Configuration::packet_size() const { return packet_size_; }
+quint32 Configuration::packet_size() const { return packet_size_; }
 
-std::uint32_t Configuration::packet_payload_size() const {
+quint32 Configuration::packet_payload_size() const {
   return packet_payload_size_;
 }
 
-std::uint32_t Configuration::frame_fragment_size() const {
+quint32 Configuration::frame_fragment_size() const {
   return frame_fragment_size_;
 }
 
-std::uint32_t Configuration::remainder_packet_size() const {
+quint32 Configuration::remainder_packet_size() const {
   return remainder_packet_size_;
 }
 
-std::uint16_t Configuration::unicast_animation_port() const {
+quint16 Configuration::unicast_animation_port() const {
   return unicast_animation_port_;
 }
 
-std::uint16_t Configuration::broadcast_animation_port() const {
+quint16 Configuration::broadcast_animation_port() const {
   return broadcast_animation_port_;
 }
 
-std::uint8_t Configuration::max_packet_number() const {
-  return max_packet_number_;
-}
+quint8 Configuration::max_packet_number() const { return max_packet_number_; }
 
-std::uint8_t Configuration::color_depth() const { return color_depth_; }
+quint8 Configuration::color_depth() const { return color_depth_; }
 
-std::uint8_t Configuration::factor() const { return factor_; }
+quint8 Configuration::factor() const { return factor_; }
 
 bool Configuration::debug_mode() const { return debug_mode_; }
 
@@ -149,7 +137,7 @@ void Configuration::LoadSettings() {
       packet_header_size_ + max_windows_per_datagram_ * window_byte_size_;
   packet_payload_size_ = max_windows_per_datagram_ * window_byte_size_;
   frame_fragment_size_ = max_windows_per_datagram_ * pixels_per_window_ * 3;
-  max_packet_number_ = static_cast<std::uint32_t>(
+  max_packet_number_ = static_cast<quint32>(
       std::ceil(static_cast<float>(windows_) / max_windows_per_datagram_));
   settings_.endGroup();
 
diff --git a/src/configuration.h b/src/configuration.h
index 6cd92fa0d8e379f3575d8ec91f93f78eeee74475..5bc97a29be1c18961e087839446854a8ba0f4f70 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -5,10 +5,8 @@
 #include <QImage>
 #include <QObject>
 #include <QSettings>
-#include <cstdint>
+#include <QtGlobal>
 
-// TODO check, remove unused parameters
-// TODO check, variable types
 class Configuration : public QObject {
   Q_OBJECT
 
@@ -19,53 +17,53 @@ class Configuration : public QObject {
 
   QHostAddress target_address() const;
 
-  std::uint32_t floors() const;
+  quint32 floors() const;
 
-  std::uint32_t rooms_per_floor() const;
+  quint32 rooms_per_floor() const;
 
-  std::uint32_t windows_per_room() const;
+  quint32 windows_per_room() const;
 
-  std::uint32_t vertical_pixel_unit() const;
+  quint32 vertical_pixel_unit() const;
 
-  std::uint32_t horizontal_pixel_unit() const;
+  quint32 horizontal_pixel_unit() const;
 
-  std::uint32_t pixels_per_window() const;
+  quint32 pixels_per_window() const;
 
-  std::uint32_t window_per_floor() const;
+  quint32 window_per_floor() const;
 
-  std::uint32_t windows() const;
+  quint32 windows() const;
 
-  std::uint32_t pixels() const;
+  quint32 pixels() const;
 
-  std::int32_t width() const;
+  qint32 width() const;
 
-  std::int32_t height() const;
+  qint32 height() const;
 
-  std::uint8_t protocol_type() const;
+  quint8 protocol_type() const;
 
-  std::uint32_t window_byte_size() const;
+  quint32 window_byte_size() const;
 
-  std::uint32_t max_windows_per_datagram() const;
+  quint32 max_windows_per_datagram() const;
 
-  std::uint32_t packet_header_size() const;
+  quint32 packet_header_size() const;
 
-  std::uint32_t packet_size() const;
+  quint32 packet_size() const;
 
-  std::uint32_t packet_payload_size() const;
+  quint32 packet_payload_size() const;
 
-  std::uint32_t frame_fragment_size() const;
+  quint32 frame_fragment_size() const;
 
-  std::uint32_t remainder_packet_size() const;
+  quint32 remainder_packet_size() const;
 
-  std::uint16_t unicast_animation_port() const;
+  quint16 unicast_animation_port() const;
 
-  std::uint16_t broadcast_animation_port() const;
+  quint16 broadcast_animation_port() const;
 
-  std::uint8_t max_packet_number() const;
+  quint8 max_packet_number() const;
 
-  std::uint8_t color_depth() const;
+  quint8 color_depth() const;
 
-  std::uint8_t factor() const;
+  quint8 factor() const;
 
   bool debug_mode() const;
 
@@ -73,32 +71,32 @@ class Configuration : public QObject {
   QImage frame_;
   QSettings settings_;
   QHostAddress target_address_;
-  std::uint32_t floors_;
-  std::uint32_t rooms_per_floor_;
-  std::uint32_t windows_per_room_;
-  std::uint32_t vertical_pixel_unit_;
-  std::uint32_t horizontal_pixel_unit_;
-  std::uint32_t pixels_per_window_;
-  std::uint32_t window_per_floor_;
-  std::uint32_t windows_;
-  std::uint32_t pixels_;
+  quint32 floors_;
+  quint32 rooms_per_floor_;
+  quint32 windows_per_room_;
+  quint32 vertical_pixel_unit_;
+  quint32 horizontal_pixel_unit_;
+  quint32 pixels_per_window_;
+  quint32 window_per_floor_;
+  quint32 windows_;
+  quint32 pixels_;
   // Qt width, height is signed
-  std::int32_t width_;
-  std::int32_t height_;
+  qint32 width_;
+  qint32 height_;
   //
-  std::uint8_t protocol_type_;
-  std::uint32_t window_byte_size_;
-  std::uint32_t max_windows_per_datagram_;
-  std::uint32_t packet_header_size_;
-  std::uint32_t packet_size_;
-  std::uint32_t packet_payload_size_;
-  std::uint32_t frame_fragment_size_;
-  std::uint32_t remainder_packet_size_;
-  std::uint16_t unicast_animation_port_;
-  std::uint16_t broadcast_animation_port_;
-  std::uint8_t max_packet_number_;
-  std::uint8_t color_depth_;
-  std::uint8_t factor_;
+  quint8 protocol_type_;
+  quint32 window_byte_size_;
+  quint32 max_windows_per_datagram_;
+  quint32 packet_header_size_;
+  quint32 packet_size_;
+  quint32 packet_payload_size_;
+  quint32 frame_fragment_size_;
+  quint32 remainder_packet_size_;
+  quint16 unicast_animation_port_;
+  quint16 broadcast_animation_port_;
+  quint8 max_packet_number_;
+  quint8 color_depth_;
+  quint8 factor_;
   bool debug_mode_;
 
   void LoadSettings();
diff --git a/src/muebtransmitter.cc b/src/muebtransmitter.cc
index f32719dd05e13d8bd69625b8bd70bd836844e01f..0f297c73b4ce3a24b68e2ce51da9ddefd7a8af32 100644
--- a/src/muebtransmitter.cc
+++ b/src/muebtransmitter.cc
@@ -94,13 +94,13 @@ MuebTransmitter& MuebTransmitter::Instance() {
   return instance;
 }
 
-std::int32_t MuebTransmitter::width() const {
+quint32 MuebTransmitter::width() const {
   Q_D(const MuebTransmitter);
 
   return d->configuration_.width();
 }
 
-std::int32_t MuebTransmitter::height() const {
+quint32 MuebTransmitter::height() const {
   Q_D(const MuebTransmitter);
 
   return d->configuration_.height();