diff --git a/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv b/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
index ed8587e..14d690f 100644
--- a/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
+++ b/src_Core/RISCY_OOO/fpgautils/lib/XilinxIntDiv.bsv
@@ -2,7 +2,7 @@ import FIFOF::*;
 import FIFO::*;
 
 import WaitAutoReset::*;
-import NonPipelinedMath::*;
+import Divide::*;
 import ClientServer::*;
 import GetPut::*;
 
diff --git a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
index fd61e18..37e72f0 100644
--- a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
@@ -48,9 +48,8 @@ import FIFO::*;
 import FIFOF::*;
 import ClientServer::*;
 import GetPut::*;
-//import Divide::*;
-//import SquareRoot::*;
-import NonPipelinedMath :: *;
+import Divide::*;
+import SquareRoot::*;
 import FloatingPoint::*;
 import XilinxFpu::*;
 import HasSpecBits::*;