diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index e09bfb6ed2..f6de87ad6d 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -1411,8 +1411,10 @@ end;
 { Generic threadmanager }
 {$i thread.inc}
 
+{$ifndef FPC_SECTION_THREADVARS}
 { Generic threadvar support }
 {$i threadvr.inc}
+{$endif FPC_SECTION_THREADVARS}
 
 {$ifdef DISABLE_NO_THREAD_MANAGER}
 { OS Dependent implementation }
diff --git a/rtl/inc/threadh.inc b/rtl/inc/threadh.inc
index c9b60f55cb..9d991b8813 100644
--- a/rtl/inc/threadh.inc
+++ b/rtl/inc/threadh.inc
@@ -116,7 +116,9 @@ Function SetThreadManager(Const NewTM : TThreadManager) : Boolean;
 {$ifndef DISABLE_NO_THREAD_MANAGER}
 {$endif DISABLE_NO_THREAD_MANAGER}
 // Needs to be exported, so the manager can call it.
+{$ifndef FPC_SECTION_THREADVARS}
 procedure InitThreadVars(RelocProc : TRelocateThreadVarHandler);
+{$endif FPC_SECTION_THREADVARS}
 procedure InitThread(stklen:SizeUInt);
 procedure DoneThread;