12 files changed, 33 insertions, 10 deletions
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index db00b6e..dc30d46 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,5 +1,11 @@
 2021-05-16  Mike Frysinger  <vapier@gentoo.org>
 
+	* err.c: Include defs.h.
+	* fpu.c, gdb-if.c, load.c, main.c, mem.c, misc.c, reg.c, rx.c,
+	syscalls.c, trace.c: Replace config.h include with defs.h.
+
+2021-05-16  Mike Frysinger  <vapier@gentoo.org>
+
 	* config.in, configure: Regenerate.
 
 2021-05-14  Mike Frysinger  <vapier@gentoo.org>
diff --git a/sim/rx/err.c b/sim/rx/err.c
index e72b6d3..c9b1c3c 100644
--- a/sim/rx/err.c
+++ b/sim/rx/err.c
@@ -18,6 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/sim/rx/fpu.c b/sim/rx/fpu.c
index 6c4738c..611d912 100644
--- a/sim/rx/fpu.c
+++ b/sim/rx/fpu.c
@@ -18,7 +18,9 @@ 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/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index 4a0f070..7298631 100644
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -18,7 +18,9 @@ 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/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <signal.h>
diff --git a/sim/rx/load.c b/sim/rx/load.c
index b04826f..d144888 100644
--- a/sim/rx/load.c
+++ b/sim/rx/load.c
@@ -18,8 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sim/rx/main.c b/sim/rx/main.c
index 20a8434..5d7092b 100644
--- a/sim/rx/main.c
+++ b/sim/rx/main.c
@@ -18,8 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/sim/rx/mem.c b/sim/rx/mem.c
index 7e62bfb..f9b9cc1 100644
--- a/sim/rx/mem.c
+++ b/sim/rx/mem.c
@@ -18,6 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 /* This slows down the simulator and we get some false negatives from
    gcc, like when it uses a long-sized hole to hold a byte-sized
    variable, knowing that it doesn't care about the other bits.  But,
@@ -25,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    1.  */
 #define RDCHECK 0
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sim/rx/misc.c b/sim/rx/misc.c
index 2a4a253..e7447ac 100644
--- a/sim/rx/misc.c
+++ b/sim/rx/misc.c
@@ -18,8 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdio.h>
 
 #include "cpu.h"
diff --git a/sim/rx/reg.c b/sim/rx/reg.c
index bdf2deb..1d27c59 100644
--- a/sim/rx/reg.c
+++ b/sim/rx/reg.c
@@ -18,8 +18,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sim/rx/rx.c b/sim/rx/rx.c
index e3737a5..869dd3a 100644
--- a/sim/rx/rx.c
+++ b/sim/rx/rx.c
@@ -18,7 +18,9 @@ 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/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sim/rx/syscalls.c b/sim/rx/syscalls.c
index 73ca0f2..1981b5d 100644
--- a/sim/rx/syscalls.c
+++ b/sim/rx/syscalls.c
@@ -18,8 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/sim/rx/trace.c b/sim/rx/trace.c
index a005797..bb191db 100644
--- a/sim/rx/trace.c
+++ b/sim/rx/trace.c
@@ -18,8 +18,9 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include "config.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>