diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index e577675436..93b2e82f06 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -38,9 +38,13 @@
 
 // Conversion to application internal units defined at build time.
 #if defined( PCBNEW )
-    #include <class_board_item.h>       // for FMT_IU
+    #include <class_board_item.h>
+    #define FMT_IU     BOARD_ITEM::FormatInternalUnits
+    #define FMT_ANGLE  BOARD_ITEM::FormatAngle
 #elif defined( EESCHEMA )
-    #include <sch_item_struct.h>        // for FMT_IU
+    #include <sch_item_struct.h>
+    #define FMT_IU          SCH_ITEM::FormatInternalUnits
+    #define FMT_ANGLE       SCH_ITEM::FormatAngle
 #elif defined( GERBVIEW )
 #elif defined( PL_EDITOR )
     #include <base_units.h>
diff --git a/eeschema/sch_item_struct.h b/eeschema/sch_item_struct.h
index 112b39c422..a532561e80 100644
--- a/eeschema/sch_item_struct.h
+++ b/eeschema/sch_item_struct.h
@@ -51,8 +51,6 @@ typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
 typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
 
 
-#define FMT_IU          SCH_ITEM::FormatInternalUnits
-#define FMT_ANGLE       SCH_ITEM::FormatAngle
 
 
 /**
diff --git a/include/class_board_item.h b/include/class_board_item.h
index 2921a59b30..9c2c541251 100644
--- a/include/class_board_item.h
+++ b/include/class_board_item.h
@@ -35,9 +35,6 @@
 #include <gr_basic.h>
 #include <layers_id_colors_and_visibility.h>
 
-/// Abbrevation for fomatting internal units to a string.
-#define FMT_IU     BOARD_ITEM::FormatInternalUnits
-#define FMT_ANGLE  BOARD_ITEM::FormatAngle
 
 class BOARD;
 class BOARD_ITEM_CONTAINER;
diff --git a/pcbnew/class_netclass.cpp b/pcbnew/class_netclass.cpp
index 37532adbf7..bd5b6f6ceb 100644
--- a/pcbnew/class_netclass.cpp
+++ b/pcbnew/class_netclass.cpp
@@ -33,6 +33,10 @@
 #include <class_board.h>
 #include <class_netclass.h>
 
+/// Abbrevation for fomatting internal units to a string.
+#define FMT_IU     BOARD_ITEM::FormatInternalUnits
+#define FMT_ANGLE  BOARD_ITEM::FormatAngle
+
 
 // This will get mapped to "kicad_default" in the specctra_export.
 const char NETCLASS::Default[] = "Default";