diff --git a/BasiliskII/src/uae_cpu/fpu/core.h b/BasiliskII/src/uae_cpu/fpu/core.h
index abadbfa7..683a56c3 100644
--- a/BasiliskII/src/uae_cpu/fpu/core.h
+++ b/BasiliskII/src/uae_cpu/fpu/core.h
@@ -217,16 +217,16 @@ extern void fpu_dump_registers(void);
 extern void fpu_dump_flags(void);
 
 /* Accessors to FPU Control Register */
-extern inline uae_u32 get_fpcr(void);
-extern inline void set_fpcr(uae_u32 new_fpcr);
+static inline uae_u32 get_fpcr(void);
+static inline void set_fpcr(uae_u32 new_fpcr);
 
 /* Accessors to FPU Status Register */
-extern inline uae_u32 get_fpsr(void);
-extern void set_fpsr(uae_u32 new_fpsr);
+static inline uae_u32 get_fpsr(void);
+static inline void set_fpsr(uae_u32 new_fpsr);
 	
 /* Accessors to FPU Instruction Address Register */
-extern inline uae_u32 get_fpiar();
-extern inline void set_fpiar(uae_u32 new_fpiar);
+static inline uae_u32 get_fpiar();
+static inline void set_fpiar(uae_u32 new_fpiar);
 
 /* Initialization / Finalization */
 extern void fpu_init(bool integral_68040);
diff --git a/BasiliskII/src/uae_cpu/fpu/exceptions.h b/BasiliskII/src/uae_cpu/fpu/exceptions.h
index 028b876e..d9758ac2 100644
--- a/BasiliskII/src/uae_cpu/fpu/exceptions.h
+++ b/BasiliskII/src/uae_cpu/fpu/exceptions.h
@@ -117,7 +117,7 @@ PRIVATE inline void FFPU set_accrued_exception(uae_u32 new_status)
 #ifdef FPU_USE_GENERIC_EXCEPTIONS
 
 /* Initialize native exception management */
-PUBLIC inline void FFPU fpu_init_native_exceptions(void)
+static inline void FFPU fpu_init_native_exceptions(void)
 	{ }
 
 /* Return m68k floating-point exception status */
diff --git a/BasiliskII/src/uae_cpu/fpu/flags.h b/BasiliskII/src/uae_cpu/fpu/flags.h
index a7b6db4a..509b0db5 100644
--- a/BasiliskII/src/uae_cpu/fpu/flags.h
+++ b/BasiliskII/src/uae_cpu/fpu/flags.h
@@ -126,7 +126,7 @@ PRIVATE inline bool FFPU fpcctrue(int condition)
 #endif /* FPU_UAE */
 
 /* Return the address of the floating-point condition codes truth table */
-PUBLIC inline uae_u8 * const FFPU address_of_fpcond_truth_table(void)
+static inline uae_u8 * const FFPU address_of_fpcond_truth_table(void)
 	{ return ((uae_u8*)&fpcond_truth_table[0][0]); }
 
 #endif /* FPU_X86_USE_NATIVE_FLAGS */
@@ -217,7 +217,7 @@ PRIVATE inline void FFPU make_fpsr(fpu_register const & r)
 /* -------------------------------------------------------------------------- */
 
 /* Return the address of the floating-point condition codes register */
-PUBLIC inline uae_u32 * const FFPU address_of_fpccr(void)
+static inline uae_u32 * const FFPU address_of_fpccr(void)
 	{ return ((uae_u32 *)& FPU fpsr.condition_codes); }
 
 #endif /* FPU_FLAGS_H */
diff --git a/BasiliskII/src/uae_cpu/fpu/impl.h b/BasiliskII/src/uae_cpu/fpu/impl.h
index c4cbf903..7a4c24a9 100644
--- a/BasiliskII/src/uae_cpu/fpu/impl.h
+++ b/BasiliskII/src/uae_cpu/fpu/impl.h
@@ -48,7 +48,7 @@
 #ifdef FPU_X86
 
 /* Return the floating-point status register in m68k format */
-PUBLIC inline uae_u32 FFPU get_fpsr(void)
+static inline uae_u32 FFPU get_fpsr(void)
 {
 	return	to_m68k_fpcond[(x86_status_word & 0x4700) >> 8]
 		|	FPU fpsr.quotient
@@ -58,7 +58,7 @@ PUBLIC inline uae_u32 FFPU get_fpsr(void)
 }
 
 /* Set the floating-point status register from an m68k format */
-PUBLIC inline void FFPU set_fpsr(uae_u32 new_fpsr)
+static inline void FFPU set_fpsr(uae_u32 new_fpsr)
 {
 	x86_status_word = to_host_fpcond[(new_fpsr & FPSR_CCB) >> 24 ]
 		| exception_mac2host[(new_fpsr & FPSR_EXCEPTION_STATUS) >> 8];
@@ -74,7 +74,7 @@ PUBLIC inline void FFPU set_fpsr(uae_u32 new_fpsr)
 #ifndef FPU_X86
 
 /* Return the floating-point status register in m68k format */
-PUBLIC inline uae_u32 FFPU get_fpsr(void)
+static inline uae_u32 FFPU get_fpsr(void)
 {
 	uae_u32 condition_codes		= get_fpccr();
 	uae_u32 exception_status	= get_exception_status();
@@ -84,7 +84,7 @@ PUBLIC inline uae_u32 FFPU get_fpsr(void)
 }
 
 /* Set the floating-point status register from an m68k format */
-PUBLIC inline void FFPU set_fpsr(uae_u32 new_fpsr)
+static inline void FFPU set_fpsr(uae_u32 new_fpsr)
 {
 	set_fpccr					( new_fpsr & FPSR_CCB				);
 	set_exception_status		( new_fpsr & FPSR_EXCEPTION_STATUS	);
@@ -99,7 +99,7 @@ PUBLIC inline void FFPU set_fpsr(uae_u32 new_fpsr)
 /* -------------------------------------------------------------------------- */
 
 /* Return the floating-point control register in m68k format */
-PUBLIC inline uae_u32 FFPU get_fpcr(void)
+static inline uae_u32 FFPU get_fpcr(void)
 {
 	uae_u32 rounding_precision	= get_rounding_precision();
 	uae_u32 rounding_mode		= get_rounding_mode();
@@ -107,7 +107,7 @@ PUBLIC inline uae_u32 FFPU get_fpcr(void)
 }
 
 /* Set the floating-point control register from an m68k format */
-PUBLIC inline void FFPU set_fpcr(uae_u32 new_fpcr)
+static inline void FFPU set_fpcr(uae_u32 new_fpcr)
 {
 	set_rounding_precision		( new_fpcr & FPCR_ROUNDING_PRECISION);
 	set_rounding_mode			( new_fpcr & FPCR_ROUNDING_MODE		);
@@ -121,7 +121,7 @@ PUBLIC inline void FFPU set_fpcr(uae_u32 new_fpcr)
 #ifdef FPU_X86
 
 /* Retrieve a floating-point register value and convert it to double precision */
-PUBLIC inline double FFPU fpu_get_register(int r)
+static inline double FFPU fpu_get_register(int r)
 {
 	double f;
 	__asm__ __volatile__("fldt %1\n\tfstpl %0" : "=m" (f) : "m" (FPU registers[r]));
@@ -137,7 +137,7 @@ PUBLIC inline double FFPU fpu_get_register(int r)
 #if defined(FPU_UAE) || defined(FPU_IEEE)
 
 /* Retrieve a floating-point register value and convert it to double precision */
-PUBLIC inline double FFPU fpu_get_register(int r)
+static inline double FFPU fpu_get_register(int r)
 {
 	return FPU registers[r];
 }
diff --git a/BasiliskII/src/uae_cpu/fpu/rounding.h b/BasiliskII/src/uae_cpu/fpu/rounding.h
index 13268fc2..eda3952f 100644
--- a/BasiliskII/src/uae_cpu/fpu/rounding.h
+++ b/BasiliskII/src/uae_cpu/fpu/rounding.h
@@ -130,11 +130,11 @@ PRIVATE inline void set_host_control_word(void)
 #if defined(FPU_USE_GENERIC_ROUNDING_MODE) || defined(FPU_USE_X86_ROUNDING_MODE)
 
 /* Return the current rounding mode in m68k format */
-PUBLIC inline uae_u32 FFPU get_rounding_mode(void)
+static inline uae_u32 FFPU get_rounding_mode(void)
 	{ return FPU fpcr.rounding_mode; }
 
 /* Convert and set to native rounding mode */
-PUBLIC inline void FFPU set_rounding_mode(uae_u32 new_rounding_mode)
+static inline void FFPU set_rounding_mode(uae_u32 new_rounding_mode)
 	{ FPU fpcr.rounding_mode = new_rounding_mode; }
 
 #endif
@@ -142,11 +142,11 @@ PUBLIC inline void FFPU set_rounding_mode(uae_u32 new_rounding_mode)
 #if defined(FPU_USE_GENERIC_ROUNDING_PRECISION) || defined(FPU_USE_X86_ROUNDING_PRECISION)
 
 /* Return the current rounding precision in m68k format */
-PUBLIC inline uae_u32 FFPU get_rounding_precision(void)
+static inline uae_u32 FFPU get_rounding_precision(void)
 	{ return FPU fpcr.rounding_precision; }
 
 /* Convert and set to native rounding precision */
-PUBLIC inline void FFPU set_rounding_precision(uae_u32 new_rounding_precision)
+static inline void FFPU set_rounding_precision(uae_u32 new_rounding_precision)
 	{ FPU fpcr.rounding_precision = new_rounding_precision; }
 
 #endif